From 4dd09210d7d32980ffbfc392dd7f8a42185dd9a3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Sun, 2 Sep 2018 21:47:10 +0200
Subject: [PATCH] Release notes tweaks
---
doc/manual/release-notes/rl-2.1.xml | 48 ++++++++++++++---------------
1 file changed, 24 insertions(+), 24 deletions(-)
diff --git a/doc/manual/release-notes/rl-2.1.xml b/doc/manual/release-notes/rl-2.1.xml
index 3cace13f1..16c243fc1 100644
--- a/doc/manual/release-notes/rl-2.1.xml
+++ b/doc/manual/release-notes/rl-2.1.xml
@@ -4,7 +4,7 @@
version="5.0"
xml:id="ssec-relnotes-2.1">
-<title>Release 2.1 (2018-08-31)</title>
+<title>Release 2.1 (2018-09-02)</title>
<para>This is primarily a bug fix release. It also reduces memory
consumption in certain situations. In addition, it has the following
@@ -12,6 +12,29 @@ new features:</para>
<itemizedlist>
+ <listitem>
+ <para>The Nix installer will no longer default to the Multi-User
+ installation for macOS. You can still <link
+ linkend="sect-multi-user-installation">instruct the installer to
+ run in multi-user mode</link>.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>The Nix installer now supports performing a Multi-User
+ installation for Linux computers which are running systemd. You
+ can <link
+ linkend="sect-multi-user-installation">select a Multi-User installation</link> by passing the
+ <option>--daemon</option> flag to the installer: <command>sh <(curl
+ https://nixos.org/nix/install) --daemon</command>.
+ </para>
+
+ <para>The multi-user installer cannot handle systems with SELinux.
+ If your system has SELinux enabled, you can <link
+ linkend="sect-single-user-installation">force the installer to run
+ in single-user mode</link>.</para>
+ </listitem>
+
<listitem>
<para>New builtin functions:
<literal>builtins.bitAnd</literal>,
@@ -49,29 +72,6 @@ new features:</para>
<varname>nix-support/propagated-user-env-packages</varname>.</para>
</listitem>
- <listitem>
- <para>The Nix installer will no longer default to the Multi-User
- installation for macOS. You can still <link
- linkend="sect-multi-user-installation">instruct the installer to
- run in multi-user mode</link>.
- </para>
- </listitem>
-
- <listitem>
- <para>The Nix installer now supports performing a Multi-User
- installation for Linux computers which are running systemd. You
- can <link
- linkend="sect-multi-user-installation">select a Multi-User installation</link> by passing the
- <option>--daemon</option> flag to the installer: <command>sh <(curl
- https://nixos.org/nix/install) --daemon</command>.
- </para>
-
- <para>The multi-user installer cannot handle systems with SELinux.
- If your system has SELinux enabled, you can <link
- linkend="sect-single-user-installation">force the installer to run
- in single-user mode</link>.</para>
- </listitem>
-
</itemizedlist>
<para>This release has contributions from
--
GitLab