From fd567ad54ad706f0b636984224b46a5ddb8de81c Mon Sep 17 00:00:00 2001
From: Janne Heß <janne@hess.ooo>
Date: Tue, 9 Nov 2021 10:58:04 +0100
Subject: nixos/changelog: Mention OpenSSH upgrade

---
 .../from_md/release-notes/rl-2111.section.xml       | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'nixos/doc/manual/from_md/release-notes/rl-2111.section.xml')

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 d7dfcb5381c..ea752f8b799 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
@@ -142,6 +142,27 @@
           </listitem>
         </itemizedlist>
       </listitem>
+      <listitem>
+        <para>
+          OpenSSH was updated to version 8.8p1
+        </para>
+        <itemizedlist spacing="compact">
+          <listitem>
+            <para>
+              This breaks connections to old SSH daemons as ssh-rsa host
+              keys and ssh-rsa public keys that were signed with SHA-1
+              are disabled by default now
+            </para>
+          </listitem>
+          <listitem>
+            <para>
+              These can be re-enabled, see the
+              <link xlink:href="https://www.openssh.com/txt/release-8.8">OpenSSH
+              changelog</link> for details
+            </para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
     </itemizedlist>
   </section>
   <section xml:id="sec-release-21.11-new-services">
-- 
cgit 1.4.1


From 8aa7ae22b8ca565d7dffbf64a9d47e17eb0d1cd1 Mon Sep 17 00:00:00 2001
From: Bernardo Meurer <bernardo@meurer.org>
Date: Mon, 1 Nov 2021 23:58:59 -0700
Subject: nixos/doc/manual/release-notes/rl-2111: Nix 2.4

---
 nixos/doc/manual/from_md/release-notes/rl-2111.section.xml | 9 +++++++++
 nixos/doc/manual/release-notes/rl-2111.section.md          | 2 ++
 2 files changed, 11 insertions(+)

(limited to 'nixos/doc/manual/from_md/release-notes/rl-2111.section.xml')

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 d7dfcb5381c..d0521f2db4d 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
@@ -15,6 +15,15 @@
   <section xml:id="sec-release-21.11-highlights">
     <title>Highlights</title>
     <itemizedlist>
+      <listitem>
+        <para>
+          Nix has been updated to version 2.4, reference its
+          <link xlink:href="https://discourse.nixos.org/t/nix-2-4-released/15822">release
+          notes</link> for more information on what has changed. The
+          previous version of Nix, 2.3.16, remains available for the
+          time being in the <literal>nix_2_3</literal> package.
+        </para>
+      </listitem>
       <listitem>
         <para>
           <literal>iptables</literal> now uses
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md
index 1c737542e7d..d957cf4ac0e 100644
--- a/nixos/doc/manual/release-notes/rl-2111.section.md
+++ b/nixos/doc/manual/release-notes/rl-2111.section.md
@@ -6,6 +6,8 @@ In addition to numerous new and upgraded packages, this release has the followin
 
 ## Highlights {#sec-release-21.11-highlights}
 
+- Nix has been updated to version 2.4, reference its [release notes](https://discourse.nixos.org/t/nix-2-4-released/15822) for more information on what has changed. The previous version of Nix, 2.3.16, remains available for the time being in the `nix_2_3` package.
+
 - `iptables` now uses `nf_tables` backend.
 
 - PHP now defaults to PHP 8.0, updated from 7.4.
-- 
cgit 1.4.1