summary refs log tree commit diff
path: root/nixos/doc/manual/from_md/release-notes
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2021-07-18 00:01:24 +0000
committerGitHub <noreply@github.com>2021-07-18 00:01:24 +0000
commit382fdc7ad3184c7d47f54feb535a970fe64a0f35 (patch)
treee6488db2914676e85250ee12633c8ddf45b7f67b /nixos/doc/manual/from_md/release-notes
parentc2d4ce2808616d558b6cef8a6d270c4930b06c18 (diff)
parent688b4cb03efd8bd6bd0796297a8738f8f91a5ff6 (diff)
downloadnixpkgs-382fdc7ad3184c7d47f54feb535a970fe64a0f35.tar
nixpkgs-382fdc7ad3184c7d47f54feb535a970fe64a0f35.tar.gz
nixpkgs-382fdc7ad3184c7d47f54feb535a970fe64a0f35.tar.bz2
nixpkgs-382fdc7ad3184c7d47f54feb535a970fe64a0f35.tar.lz
nixpkgs-382fdc7ad3184c7d47f54feb535a970fe64a0f35.tar.xz
nixpkgs-382fdc7ad3184c7d47f54feb535a970fe64a0f35.tar.zst
nixpkgs-382fdc7ad3184c7d47f54feb535a970fe64a0f35.zip
Merge master into staging-next
Diffstat (limited to 'nixos/doc/manual/from_md/release-notes')
-rw-r--r--nixos/doc/manual/from_md/release-notes/rl-2111.section.xml7
1 files changed, 7 insertions, 0 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 dd58934c82e..3c4708cd412 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
@@ -55,6 +55,13 @@
       </listitem>
       <listitem>
         <para>
+          <link xlink:href="https://www.isc.org/kea/">Kea</link>, ISCs
+          2nd generation DHCP and DDNS server suite. Available at
+          <link xlink:href="options.html#opt-services.kea">services.kea</link>.
+        </para>
+      </listitem>
+      <listitem>
+        <para>
           <link xlink:href="https://sr.ht">sourcehut</link>, a
           collection of tools useful for software development. Available
           as