summary refs log tree commit diff
path: root/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2021-10-25 06:01:29 +0000
committerGitHub <noreply@github.com>2021-10-25 06:01:29 +0000
commit0386c2619025ee873a609c07d52e808427aa1af4 (patch)
tree238d5c86c1183ca54af8a7e46da70f2e4082577a /nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
parent24cfffaa7a6971830eeffc989fd3746f6a239912 (diff)
parent38d21595b8fb0a744aa31c5794013bf42cf98fa9 (diff)
downloadnixpkgs-0386c2619025ee873a609c07d52e808427aa1af4.tar
nixpkgs-0386c2619025ee873a609c07d52e808427aa1af4.tar.gz
nixpkgs-0386c2619025ee873a609c07d52e808427aa1af4.tar.bz2
nixpkgs-0386c2619025ee873a609c07d52e808427aa1af4.tar.lz
nixpkgs-0386c2619025ee873a609c07d52e808427aa1af4.tar.xz
nixpkgs-0386c2619025ee873a609c07d52e808427aa1af4.tar.zst
nixpkgs-0386c2619025ee873a609c07d52e808427aa1af4.zip
Merge master into staging-next
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.xml8
1 files changed, 8 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 a139278d9b6..ce399e14162 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
@@ -152,6 +152,14 @@
       </listitem>
       <listitem>
         <para>
+          <link xlink:href="https://joinpeertube.org/">PeerTube</link>,
+          developed by Framasoft, is the free and decentralized
+          alternative to video platforms. Available at
+          <link xlink:href="options.html#opt-services.peertube">services.peertube</link>.
+        </para>
+      </listitem>
+      <listitem>
+        <para>
           <link xlink:href="https://sr.ht">sourcehut</link>, a
           collection of tools useful for software development. Available
           as