summary refs log tree commit diff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2016-02-24 23:20:17 +0100
committerLudovic Courtès <ludo@gnu.org>2016-02-24 23:24:33 +0100
commitbf98aea9b2a5efedf0bc1fdb0b5e617488bfc31b (patch)
tree66940e89f8b60c71217786d4676de5731f85f6c8
parentcb05108a5d69341da9d0478c5d1609e263cc38d6 (diff)
downloadguix-bf98aea9b2a5efedf0bc1fdb0b5e617488bfc31b.tar.gz
doc: Improve recent changes in "Binary Installation".
This amends part of c8e2688.

* doc/guix.texi (Binary Installation): Improve wording of some parts.
Fix Upstart example.  Remove incorrect paragraph about locales.
Reinstate bit about reproducing the binary tarball.
-rw-r--r--doc/guix.texi26
1 files changed, 14 insertions, 12 deletions
diff --git a/doc/guix.texi b/doc/guix.texi
index 1052f0846d..b48f988a0d 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -377,9 +377,10 @@ Create the group and user accounts for build users as explained below
 (@pxref{Build Environment Setup}).
 
 @item
-Run and set the Guix daemon to automatically start on boot.
+Run the daemon, and set it to automatically start on boot.
 
-If your host distro uses the systemd init system:
+If your host distro uses the systemd init system, this can be achieved
+with these commands:
 
 @example
 # cp ~root/.guix-profile/lib/systemd/system/guix-daemon.service \
@@ -390,8 +391,8 @@ If your host distro uses the systemd init system:
 If your host distro uses the Upstart init system:
 
 @example
-# ~root/.guix-profile/bin/guix-daemon --build-users-group=guixbuild
 # cp ~root/.guix-profile/lib/upstart/system/guix-daemon.conf /etc/init/
+# start guix-daemon
 @end example
 
 Otherwise, you can still start the daemon manually with:
@@ -400,7 +401,6 @@ Otherwise, you can still start the daemon manually with:
 # ~root/.guix-profile/bin/guix-daemon --build-users-group=guixbuild
 @end example
 
-
 @item
 Make the @command{guix} command available to other users on the machine,
 for instance with:
@@ -435,7 +435,7 @@ authorize them:
 @end example
 @end enumerate
 
-This completes root-level install of Guix. Each user will need to
+This completes root-level install of Guix.  Each user will need to
 perform additional steps to make their Guix envionment ready for use,
 @pxref{Application Setup}.
 
@@ -446,16 +446,18 @@ the root profile:
 # guix package -i hello
 @end example
 
-If your host distro uses @code{locales} that are incompatible with the
-@code{glibc} that Guix uses, you will see @code{warning: failed to
-install locale: Invalid argument}.  This may be ignored, or remedied by
-installing Locales as root, @pxref{Application Setup}.
-
 The @code{guix} package must remain available in @code{root}'s profile,
 or it would become subject to garbage collection---in which case you
 would find yourself badly handicapped by the lack of the @command{guix}
-command. In other words, don't remove @code{guix} by running @code{guix
-package -r guix}.
+command.  In other words, do not remove @code{guix} by running
+@code{guix package -r guix}.
+
+The binary installation tarball can be (re)produced and verified simply
+by running the following command in the Guix source tree:
+
+@example
+make guix-binary.@var{system}.tar.xz
+@end example
 
 
 @node Requirements