summary refs log tree commit diff
path: root/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
diff options
context:
space:
mode:
authorTimothy DeHerrera <tim.deh@pm.me>2021-11-29 19:12:44 -0700
committerGitHub <noreply@github.com>2021-11-29 19:12:44 -0700
commit2f0f91fe692b040d79bc0fc8d9af7f166385b752 (patch)
tree309fb476a595ce2801528e36d60ecfcab831c084 /nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
parentf88c8b7bfb06d4563ffa638f30467a91721183e3 (diff)
parentb1faa37cdf91a5c06b3eccd2611dc8faa7e6e6ec (diff)
downloadnixpkgs-2f0f91fe692b040d79bc0fc8d9af7f166385b752.tar
nixpkgs-2f0f91fe692b040d79bc0fc8d9af7f166385b752.tar.gz
nixpkgs-2f0f91fe692b040d79bc0fc8d9af7f166385b752.tar.bz2
nixpkgs-2f0f91fe692b040d79bc0fc8d9af7f166385b752.tar.lz
nixpkgs-2f0f91fe692b040d79bc0fc8d9af7f166385b752.tar.xz
nixpkgs-2f0f91fe692b040d79bc0fc8d9af7f166385b752.tar.zst
nixpkgs-2f0f91fe692b040d79bc0fc8d9af7f166385b752.zip
Merge pull request #147898 from tomberek/release_bump
nixos/rl-21.11: bump
Diffstat (limited to 'nixos/doc/manual/from_md/release-notes/rl-2111.section.xml')
-rw-r--r--nixos/doc/manual/from_md/release-notes/rl-2111.section.xml18
1 files changed, 9 insertions, 9 deletions
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
index b0ebcb426ed..fb98b6a4b01 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
@@ -1,5 +1,5 @@
 <section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-release-21.11">
-  <title>Release 21.11 (“Porcupine”, 2021.11/??)</title>
+  <title>Release 21.11 (“Porcupine”, 2021/11/30)</title>
   <para>
     In addition to numerous new and upgraded packages, this release has
     the following highlights:
@@ -37,7 +37,7 @@
       </listitem>
       <listitem>
         <para>
-          kOps now defaults to 1.21.1, which uses containerd as the
+          kops now defaults to 1.21.1, which uses containerd as the
           default runtime.
         </para>
       </listitem>
@@ -84,13 +84,13 @@
       </listitem>
       <listitem>
         <para>
-          Activation scripts can now opt int to be run when running
-          <literal>nixos-rebuild dry-activate</literal> and detect the
-          dry activation by reading <literal>$NIXOS_ACTION</literal>.
-          This allows activation scripts to output what they would
-          change if the activation was really run. The users/modules
-          activation script supports this and outputs some of is
-          actions.
+          Activation scripts can now, optionally, be run during a
+          <literal>nixos-rebuild dry-activate</literal> and can detect
+          the dry activation by reading
+          <literal>$NIXOS_ACTION</literal>. This allows activation
+          scripts to output what they would change if the activation was
+          really run. The users/modules activation script supports this
+          and outputs some of is actions.
         </para>
       </listitem>
       <listitem>