about 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>2021-03-25 06:05:58 +0000
committerGitHub <noreply@github.com>2021-03-25 06:05:58 +0000
commit8cebf1dc19f2d75289a9932fcc826dde400e8a76 (patch)
tree4fc239c02a40e80f64d0951d4c76e6da8651d6f0 /nixos/doc/manual
parenteb499aa20e5fd100e24b4cb1d81f9ec3b0be979c (diff)
parent77cf1c3445481e1563b9da5498356dcf7d8bf1cf (diff)
downloadnixlib-8cebf1dc19f2d75289a9932fcc826dde400e8a76.tar
nixlib-8cebf1dc19f2d75289a9932fcc826dde400e8a76.tar.gz
nixlib-8cebf1dc19f2d75289a9932fcc826dde400e8a76.tar.bz2
nixlib-8cebf1dc19f2d75289a9932fcc826dde400e8a76.tar.lz
nixlib-8cebf1dc19f2d75289a9932fcc826dde400e8a76.tar.xz
nixlib-8cebf1dc19f2d75289a9932fcc826dde400e8a76.tar.zst
nixlib-8cebf1dc19f2d75289a9932fcc826dde400e8a76.zip
Merge master into staging-next
Diffstat (limited to 'nixos/doc/manual')
-rw-r--r--nixos/doc/manual/release-notes/rl-2105.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/doc/manual/release-notes/rl-2105.xml b/nixos/doc/manual/release-notes/rl-2105.xml
index 5d9d91053e75..ab17879ba0b8 100644
--- a/nixos/doc/manual/release-notes/rl-2105.xml
+++ b/nixos/doc/manual/release-notes/rl-2105.xml
@@ -731,8 +731,8 @@ environment.systemPackages = [
     </para>
 
     <para>
-     Aditionally to the much stricter runtime environmet the
-     <literal>/dev/urandom</literal> mount lines we previously had in the code (that would
+     Additionally to the much stricter runtime environment the
+     <literal>/dev/urandom</literal> mount lines we previously had in the code (that
      randomly failed during the stop-phase) have been removed as systemd will take care of those for us.
     </para>
 
@@ -820,7 +820,7 @@ environment.systemPackages = [
    <listitem>
     <para>
      Platforms, like <varname>stdenv.hostPlatform</varname>, no longer have a <varname>platform</varname> attribute.
-     It has been (mostly) flattoned away:
+     It has been (mostly) flattened away:
     </para>
     <itemizedlist>
      <listitem><para><varname>platform.gcc</varname> is now <varname>gcc</varname></para></listitem>