From d1da5658a64eae7b22d87b8ac928310a59ab3196 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 2 Dec 2021 18:45:04 +0100 Subject: [PATCH 1/2] 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 fb98b6a4b01c..4776d2bfad19 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 5abfa6beb106..6ac1acf67494 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. From 34d4676e9d9d8778523235e52b9e9c5bd1f8d6d9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 2 Dec 2021 18:57:18 +0100 Subject: [PATCH 2/2] nixos/doc/manual/release-notes/rl-2111: fix multiple option links --- nixos/doc/manual/from_md/release-notes/rl-2111.section.xml | 6 +++--- nixos/doc/manual/release-notes/rl-2111.section.md | 6 +++--- 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 4776d2bfad19..ed5ffe352323 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 @@ -255,14 +255,14 @@ Kea, ISCs 2nd generation DHCP and DDNS server suite. Available at - services.kea. + services.kea. owncast, self-hosted video live streaming solution. Available at - services.owncast. + services.owncast. @@ -270,7 +270,7 @@ PeerTube, developed by Framasoft, is the free and decentralized alternative to video platforms. Available at - services.peertube. + services.peertube. diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 6ac1acf67494..61bcd745a356 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -68,11 +68,11 @@ In addition to numerous new and upgraded packages, this release has the followin - [Jibri](https://github.com/jitsi/jibri), a service for recording or streaming a Jitsi Meet conference. Available as [services.jibri](options.html#opt-services.jibri.enable). -- [Kea](https://www.isc.org/kea/), ISCs 2nd generation DHCP and DDNS server suite. Available at [services.kea](options.html#opt-services.kea). +- [Kea](https://www.isc.org/kea/), ISCs 2nd generation DHCP and DDNS server suite. Available at [services.kea](options.html#opt-services.kea.dhcp4). -- [owncast](https://owncast.online/), self-hosted video live streaming solution. Available at [services.owncast](options.html#opt-services.owncast). +- [owncast](https://owncast.online/), self-hosted video live streaming solution. Available at [services.owncast](options.html#opt-services.owncast.enable). -- [PeerTube](https://joinpeertube.org/), developed by Framasoft, is the free and decentralized alternative to video platforms. Available at [services.peertube](options.html#opt-services.peertube). +- [PeerTube](https://joinpeertube.org/), developed by Framasoft, is the free and decentralized alternative to video platforms. Available at [services.peertube](options.html#opt-services.peertube.enable). - [sourcehut](https://sr.ht), a collection of tools useful for software development. Available as [services.sourcehut](options.html#opt-services.sourcehut.enable).