summary refs log tree commit diff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2013-01-16 12:23:51 +0100
committerLudovic Courtès <ludo@gnu.org>2013-01-16 23:09:53 +0100
commit1da983b9f083c643831db2a0381db9110e830d47 (patch)
treee9ba17b895d966acb7c60ec0244755293223c81b
parentb28168c125873738fa2afc376e58b5591d87dee1 (diff)
downloadguix-1da983b9f083c643831db2a0381db9110e830d47.tar.gz
doc: Fix typos, and improve daemon documentation.
* doc/guix.texi: Fix typos.
  (Invoking guix-daemon): Add details about `--disable-log-compression'
  and `--disable-store-optimization'.
  Reported by Nikita Karetnikov <nikita@karetnikov.org>.
-rw-r--r--doc/guix.texi16
1 files changed, 13 insertions, 3 deletions
diff --git a/doc/guix.texi b/doc/guix.texi
index ce501188c8..29e12456ea 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -139,7 +139,7 @@ This section describes the software requirements of Guix, as well as how
 to install it and get ready to use it.
 
 The build procedure for Guix is the same as for other GNU software, and
-are not covered here.  Please see the files @file{README} and
+is not covered here.  Please see the files @file{README} and
 @file{INSTALL} in the Guix source tree for additional details.
 
 @menu
@@ -233,7 +233,7 @@ The @code{guix-daemon} program may then be run as @code{root} with:
 @end example
 
 Guix may also be used in a single-user setup, with @command{guix-daemon}
-running as a unprivileged user.  However, to maximize non-interference
+running as an unprivileged user.  However, to maximize non-interference
 of build processes, the daemon still needs to perform certain operations
 that are restricted to @code{root} on GNU/Linux: it should be able to
 run build processes in a chroot, and to run them under different UIDs.
@@ -330,9 +330,19 @@ processes to gain access to undeclared dependencies.
 @item --disable-log-compression
 Disable compression of the build logs.
 
+Unless @code{--lose-logs} is used, all the build logs are kept in the
+@var{localstatedir}.  To save space, the daemon automatically compresses
+them with bzip2 by default.  This option disables that.
+
 @item --disable-store-optimization
 Disable automatic file ``deduplication'' in the store.
 
+By default, files added to the store are automatically ``deduplicated'':
+if a newly added file is identical as another one found in the store,
+the daemon makes the new file a hard link to the other file.  This
+slightly increases the input/output load at the end of a build process.
+This option disables this.
+
 @item --impersonate-linux-2.6
 On Linux-based systems, impersonate Linux 2.6.  This means that the
 kernel's @code{uname} system call will report 2.6 as the release number.
@@ -545,7 +555,7 @@ deleted.  The set of garbage collector roots includes default user
 profiles, and may be augmented with @command{guix-build --root}, for
 example (@pxref{Invoking guix-build}).
 
-The @command{guix-gc} command has three modes of operations: it can be
+The @command{guix-gc} command has three modes of operation: it can be
 used to garbage-collect any dead files (the default), to delete specific
 files (the @code{--delete} option), or to print garbage-collector
 information.  The available options are listed below: