diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/manual/command-ref/nix-channel.xml | 3 | ||||
| -rw-r--r-- | doc/manual/packages/channels.xml | 3 | ||||
| -rw-r--r-- | doc/manual/release-notes/rl-2.3.xml | 15 |
3 files changed, 13 insertions, 8 deletions
diff --git a/doc/manual/command-ref/nix-channel.xml b/doc/manual/command-ref/nix-channel.xml index 9fea59167..ebcf56aff 100644 --- a/doc/manual/command-ref/nix-channel.xml +++ b/doc/manual/command-ref/nix-channel.xml @@ -36,6 +36,9 @@ stay up-to-date with a set of pre-built Nix expressions. A Nix channel is just a URL that points to a place containing a set of Nix expressions. <phrase condition="manual">See also <xref linkend="sec-channels" />.</phrase></para> + +<para>To see the list of official NixOS channels, visit <link +xlink:href="https://nixos.org/channels" />.</para> <para>This command has the following operations: diff --git a/doc/manual/packages/channels.xml b/doc/manual/packages/channels.xml index 15c119fcb..1ed2bba52 100644 --- a/doc/manual/packages/channels.xml +++ b/doc/manual/packages/channels.xml @@ -17,6 +17,9 @@ a set of Nix expressions and a manifest. Using the command <link linkend="sec-nix-channel"><command>nix-channel</command></link> you can automatically stay up to date with whatever is available at that URL.</para> + +<para>To see the list of official NixOS channels, visit <link +xlink:href="https://nixos.org/channels" />.</para> <para>You can “subscribe” to a channel using <command>nix-channel --add</command>, e.g., diff --git a/doc/manual/release-notes/rl-2.3.xml b/doc/manual/release-notes/rl-2.3.xml index 80fbd6396..0ad7d641f 100644 --- a/doc/manual/release-notes/rl-2.3.xml +++ b/doc/manual/release-notes/rl-2.3.xml @@ -33,9 +33,13 @@ incompatible changes:</para> </listitem> <listitem> - <para>The installer now enables sandboxing by default on - Linux. The <literal>max-jobs</literal> setting now defaults to - 1.</para> + <para>The installer now enables sandboxing by default on Linux when the + system has the necessary kernel support. + </para> + </listitem> + + <listitem> + <para>The <literal>max-jobs</literal> setting now defaults to 1.</para> </listitem> <listitem> @@ -82,11 +86,6 @@ incompatible changes:</para> the duration of Nix function calls to stderr.</para> </listitem> - <listitem> - <para>On Linux, sandboxing is now disabled by default on systems - that don’t have the necessary kernel support.</para> - </listitem> - </itemizedlist> </section> |