From d1da5658a64eae7b22d87b8ac928310a59ab3196 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 2 Dec 2021 18:45:04 +0100 Subject: [PATCH] nixos/doc/manual/release-notes/rl-2111: move highlights introduction --- .../doc/manual/from_md/release-notes/rl-2111.section.xml | 8 ++++---- nixos/doc/manual/release-notes/rl-2111.section.md | 4 ++-- 2 files changed, 6 insertions(+), 6 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 fb98b6a4b01c0..4776d2bfad190 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,9 +1,5 @@
Release 21.11 (“Porcupine”, 2021/11/30) - - In addition to numerous new and upgraded packages, this release has - the following highlights: - @@ -14,6 +10,10 @@
Highlights + + In addition to numerous new and upgraded packages, this release + has the following highlights: + diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 5abfa6beb1061..6ac1acf674945 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -1,11 +1,11 @@ # Release 21.11 (“Porcupine”, 2021/11/30) {#sec-release-21.11} -In addition to numerous new and upgraded packages, this release has the following highlights: - - Support is planned until the end of June 2022, handing over to 22.05. ## Highlights {#sec-release-21.11-highlights} +In addition to numerous new and upgraded packages, this release has the following 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.