summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2021-09-11 08:16:31 +0000
committerAlyssa Ross <hi@alyssa.is>2021-09-11 08:16:31 +0000
commit2f9ec5838eb8f1fcfbb5808a482b08b403bfbbdd (patch)
treeaf1cc28801e655782eeb67ea548bce9bd07bad6e
parentded7b6cb1bf3d6d03328b3f592069f2c4956a97f (diff)
downloadnixpkgs-2f9ec5838eb8f1fcfbb5808a482b08b403bfbbdd.tar
nixpkgs-2f9ec5838eb8f1fcfbb5808a482b08b403bfbbdd.tar.gz
nixpkgs-2f9ec5838eb8f1fcfbb5808a482b08b403bfbbdd.tar.bz2
nixpkgs-2f9ec5838eb8f1fcfbb5808a482b08b403bfbbdd.tar.lz
nixpkgs-2f9ec5838eb8f1fcfbb5808a482b08b403bfbbdd.tar.xz
nixpkgs-2f9ec5838eb8f1fcfbb5808a482b08b403bfbbdd.tar.zst
nixpkgs-2f9ec5838eb8f1fcfbb5808a482b08b403bfbbdd.zip
nixos/doc: fix merged items in 20.09 rel notes
These items (notmuch and device tree) are completely different topics,
so were obviously merged into a single bullet by mistake.
-rw-r--r--nixos/doc/manual/from_md/release-notes/rl-2009.section.xml10
-rw-r--r--nixos/doc/manual/release-notes/rl-2009.section.md4
2 files changed, 10 insertions, 4 deletions
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2009.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2009.section.xml
index c74d850b2c6..edebd92b327 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2009.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2009.section.xml
@@ -1684,13 +1684,17 @@ CREATE ROLE postgres LOGIN SUPERUSER;
       </listitem>
       <listitem>
         <para>
-          The notmuch package move its emacs-related binaries and emacs
+          The notmuch package moves its emacs-related binaries and emacs
           lisp files to a separate output. They're not part of the
           default <literal>out</literal> output anymore - if you relied
           on the <literal>notmuch-emacs-mua</literal> binary or the
           emacs lisp files, access them via the
-          <literal>notmuch.emacs</literal> output. Device tree overlay
-          support was improved in
+          <literal>notmuch.emacs</literal> output.
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Device tree overlay support was improved in
           <link xlink:href="https://github.com/NixOS/nixpkgs/pull/79370">#79370</link>
           and now uses
           <link xlink:href="options.html#opt-hardware.deviceTree.kernelPackage">hardware.deviceTree.kernelPackage</link>
diff --git a/nixos/doc/manual/release-notes/rl-2009.section.md b/nixos/doc/manual/release-notes/rl-2009.section.md
index 48059ab07f5..79be2a56a54 100644
--- a/nixos/doc/manual/release-notes/rl-2009.section.md
+++ b/nixos/doc/manual/release-notes/rl-2009.section.md
@@ -578,7 +578,9 @@ When upgrading from a previous release, please be aware of the following incompa
 
 - `services.journald.rateLimitBurst` was updated from `1000` to `10000` to follow the new upstream systemd default.
 
-- The notmuch package move its emacs-related binaries and emacs lisp files to a separate output. They\'re not part of the default `out` output anymore - if you relied on the `notmuch-emacs-mua` binary or the emacs lisp files, access them via the `notmuch.emacs` output. Device tree overlay support was improved in [\#79370](https://github.com/NixOS/nixpkgs/pull/79370) and now uses [hardware.deviceTree.kernelPackage](options.html#opt-hardware.deviceTree.kernelPackage) instead of `hardware.deviceTree.base`. [hardware.deviceTree.overlays](options.html#opt-hardware.deviceTree.overlays) configuration was extended to support `.dts` files with symbols. Device trees can now be filtered by setting [hardware.deviceTree.filter](options.html#opt-hardware.deviceTree.filter) option.
+- The notmuch package moves its emacs-related binaries and emacs lisp files to a separate output. They\'re not part of the default `out` output anymore - if you relied on the `notmuch-emacs-mua` binary or the emacs lisp files, access them via the `notmuch.emacs` output.
+
+- Device tree overlay support was improved in [\#79370](https://github.com/NixOS/nixpkgs/pull/79370) and now uses [hardware.deviceTree.kernelPackage](options.html#opt-hardware.deviceTree.kernelPackage) instead of `hardware.deviceTree.base`. [hardware.deviceTree.overlays](options.html#opt-hardware.deviceTree.overlays) configuration was extended to support `.dts` files with symbols. Device trees can now be filtered by setting [hardware.deviceTree.filter](options.html#opt-hardware.deviceTree.filter) option.
 
 - The default output of `buildGoPackage` is now `$out` instead of `$bin`.