Rename nix-worker to nix-daemon

6 files changed, 20 insertions, 15 deletions

diff --git a/doc/manual/Makefile.am b/doc/manual/Makefile.am
index 42da3c8b0c09..eedc992a3851 100644
--- a/doc/manual/Makefile.am
+++ b/doc/manual/Makefile.am
@@ -23,7 +23,7 @@ man1_MANS = nix-env.1 nix-build.1 nix-store.1 nix-instantiate.1 \
 
 man5_MANS = nix.conf.5
 
-man8_MANS = nix-worker.8
+man8_MANS = nix-daemon.8
 
 FIGURES = figures/user-environments.png
 
diff --git a/doc/manual/env-common.xml b/doc/manual/env-common.xml
index c4c0f9d2df63..fcdd2c268399 100644
--- a/doc/manual/env-common.xml
+++ b/doc/manual/env-common.xml
@@ -304,9 +304,9 @@ $ mount -o bind /mnt/otherdisk/nix /nix</screen>
   <literal>/var/run/nix/remote-stores</literal>.</para>
 
   <para>Note that if you’re building through the <link
-  linkend="sec-nix-worker">Nix daemon</link>, the only setting for
+  linkend="sec-nix-daemon">Nix daemon</link>, the only setting for
   this variable that matters is the one that the
-  <command>nix-worker</command> process uses.  So if you want to
+  <command>nix-daemon</command> process uses.  So if you want to
   change it, you have to restart the daemon.</para></listitem>
 
 </varlistentry>
diff --git a/doc/manual/installation.xml b/doc/manual/installation.xml
index bbcc057f1d04..fdab71fc0f37 100644
--- a/doc/manual/installation.xml
+++ b/doc/manual/installation.xml
@@ -412,11 +412,11 @@ $ chown -R root /nix/store /nix/var/nix</screen>
 
 </para>
 
-<para>The <link linkend="sec-nix-worker">Nix daemon</link> should be
+<para>The <link linkend="sec-nix-daemon">Nix daemon</link> should be
 started as follows (as <literal>root</literal>):
 
 <screen>
-$ nix-worker --daemon</screen>
+$ nix-daemon</screen>
 
 You’ll want to put that line somewhere in your system’s boot
 scripts.</para>
@@ -450,11 +450,11 @@ named anything.  It should own the Nix store and database:
 <screen>
 $ chown -R nix /nix/store /nix/var/nix</screen>
 
-and of course <command>nix-worker --daemon</command> should be started
-under that user, e.g.,
+and of course <command>nix-daemon</command> should be started under
+that user, e.g.,
 
 <screen>
-$ su - nix -c "exec /nix/bin/nix-worker --daemon"</screen>
+$ su - nix -c "exec /nix/bin/nix-daemon"</screen>
 
 </para>
 
diff --git a/doc/manual/manual.xml b/doc/manual/manual.xml
index ccff9423cf17..aa461d7081bf 100644
--- a/doc/manual/manual.xml
+++ b/doc/manual/manual.xml
@@ -59,7 +59,7 @@
       <xi:include href="nix-prefetch-url.xml" />
       <xi:include href="nix-pull.xml" />
       <xi:include href="nix-push.xml" />
-      <xi:include href="nix-worker.xml" />
+      <xi:include href="nix-daemon.xml" />
     </section>
 
     <section>
diff --git a/doc/manual/nix-worker.xml b/doc/manual/nix-daemon.xml
index 5ae9d59bddc7..c68605fd6566 100644
--- a/doc/manual/nix-worker.xml
+++ b/doc/manual/nix-daemon.xml
@@ -1,24 +1,23 @@
 <refentry xmlns="http://docbook.org/ns/docbook"
           xmlns:xlink="http://www.w3.org/1999/xlink"
           xmlns:xi="http://www.w3.org/2001/XInclude"
-          xml:id="sec-nix-worker">
+          xml:id="sec-nix-daemon">
 
 <refmeta>
-  <refentrytitle>nix-worker</refentrytitle>
+  <refentrytitle>nix-daemon</refentrytitle>
   <manvolnum>8</manvolnum>
   <refmiscinfo class="source">Nix</refmiscinfo>
   <refmiscinfo class="version"><xi:include href="version.txt" parse="text"/></refmiscinfo>
 </refmeta>
 
 <refnamediv>
-  <refname>nix-worker</refname>
+  <refname>nix-daemon</refname>
   <refpurpose>Nix multi-user support daemon</refpurpose>
 </refnamediv>
 
 <refsynopsisdiv>
   <cmdsynopsis>
-    <command>nix-worker</command>
-    <arg choice="plain"><option>--daemon</option></arg>
+    <command>nix-daemon</command>
   </cmdsynopsis>
 </refsynopsisdiv>
 
diff --git a/doc/manual/release-notes.xml b/doc/manual/release-notes.xml
index 43d5080afabd..8d0840d06e5f 100644
--- a/doc/manual/release-notes.xml
+++ b/doc/manual/release-notes.xml
@@ -10,7 +10,7 @@
 
 <section xml:id="ssec-relnotes-1.2"><title>Release 1.2 (TBA)</title>
 
-<para>This release has the following improvements:</para>
+<para>This release has the following improvements and changes:</para>
 
 <itemizedlist>
 
@@ -47,6 +47,12 @@ $ mount -o remount,ro,bind /nix/store
     modifications.</para>
   </listitem>
 
+  <listitem>
+    <para>The command <command>nix-worker</command> has been renamed
+    to <command>nix-daemon</command>.  Support for running the Nix
+    worker in “slave” mode has been removed.</para>
+  </listitem>
+
 </itemizedlist>
 
 </section>