summary refs log tree commit diff
path: root/nixos/doc/manual
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2022-02-01 18:05:39 +0000
committerGitHub <noreply@github.com>2022-02-01 18:05:39 +0000
commite977885cbaf33a9a22d736a3eaf145069f2b2f8e (patch)
tree42d5604447aaa5f512740480a82ecf392aaac907 /nixos/doc/manual
parentfebc3690c055af974070c8f096ed107dc96ae3c6 (diff)
parentf5bdd2b8f89b3c08c810bef9825fd9cc1678706f (diff)
downloadnixpkgs-e977885cbaf33a9a22d736a3eaf145069f2b2f8e.tar
nixpkgs-e977885cbaf33a9a22d736a3eaf145069f2b2f8e.tar.gz
nixpkgs-e977885cbaf33a9a22d736a3eaf145069f2b2f8e.tar.bz2
nixpkgs-e977885cbaf33a9a22d736a3eaf145069f2b2f8e.tar.lz
nixpkgs-e977885cbaf33a9a22d736a3eaf145069f2b2f8e.tar.xz
nixpkgs-e977885cbaf33a9a22d736a3eaf145069f2b2f8e.tar.zst
nixpkgs-e977885cbaf33a9a22d736a3eaf145069f2b2f8e.zip
Merge staging-next into staging
Diffstat (limited to 'nixos/doc/manual')
-rw-r--r--nixos/doc/manual/from_md/release-notes/rl-2205.section.xml6
-rw-r--r--nixos/doc/manual/release-notes/rl-2205.section.md2
2 files changed, 8 insertions, 0 deletions
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
index badd210e7e5..372a7371105 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
@@ -81,6 +81,12 @@
       </listitem>
       <listitem>
         <para>
+          <link xlink:href="https://github.com/linux-apfs/linux-apfs-rw">apfs</link>,
+          a kernel module for mounting the Apple File System (APFS).
+        </para>
+      </listitem>
+      <listitem>
+        <para>
           <link xlink:href="https://frrouting.org/">FRRouting</link>, a
           popular suite of Internet routing protocol daemons (BGP, BFD,
           OSPF, IS-IS, VVRP and others). Available as
diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md
index 62273db70dc..4f249186704 100644
--- a/nixos/doc/manual/release-notes/rl-2205.section.md
+++ b/nixos/doc/manual/release-notes/rl-2205.section.md
@@ -27,6 +27,8 @@ In addition to numerous new and upgraded packages, this release has the followin
 
 - [filebeat](https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-overview.html), a lightweight shipper for forwarding and centralizing log data. Available as [services.filebeat](#opt-services.filebeat.enable).
 
+- [apfs](https://github.com/linux-apfs/linux-apfs-rw), a kernel module for mounting the Apple File System (APFS).
+
 - [FRRouting](https://frrouting.org/), a popular suite of Internet routing protocol daemons (BGP, BFD, OSPF, IS-IS, VVRP and others). Available as [services.frr](#opt-services.ffr.babel.enable)
 
 - [heisenbridge](https://github.com/hifi/heisenbridge), a bouncer-style Matrix IRC bridge. Available as [services.heisenbridge](options.html#opt-services.heisenbridge.enable).