From 325b5a8aee89a12c30fbfcf74503f5105be0b230 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed, 2 Nov 2011 19:14:54 +0000
Subject: * Fix permission on /nix/store in the manual for multi-user installs 
  (reported by Silvio Frischknecht).

---
 doc/manual/installation.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/manual/installation.xml b/doc/manual/installation.xml
index bed96cd885ab..9e73fb69a2a3 100644
--- a/doc/manual/installation.xml
+++ b/doc/manual/installation.xml
@@ -314,7 +314,7 @@ bit turned on (like <filename>/tmp</filename>):
 
 <screen>
 $ chgrp nixbld /nix/store
-$ chmod 1777 /nix/store
+$ chmod 1775 /nix/store
 </screen>
 
 </para>
-- 
cgit 1.4.1


From d7b87bebe3ac8f47e387c79e03ceb5915e71d249 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu, 3 Nov 2011 18:47:10 +0000
Subject: * The Nix configuration file is usually /etc/nix/nix.conf.

---
 doc/manual/installation.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/manual/installation.xml b/doc/manual/installation.xml
index 9e73fb69a2a3..755f539070cc 100644
--- a/doc/manual/installation.xml
+++ b/doc/manual/installation.xml
@@ -323,7 +323,7 @@ $ chmod 1775 /nix/store
 specifying the build users group in the <link
 linkend="conf-build-users-group"><literal>build-users-group</literal>
 option</link> in the <link linkend="sec-conf-file">Nix configuration
-file</link> (<literal>/nix/etc/nix/nix.conf</literal>):
+file</link> (usually <literal>/etc/nix/nix.conf</literal>):
 
 <programlisting>
 build-users-group = nixbld
-- 
cgit 1.4.1


From daed9aeac557af4ec8d3d8f00b4f3f2b8f90408a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu, 3 Nov 2011 19:22:24 +0000
Subject:

---
 doc/manual/conf-file.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/manual/conf-file.xml b/doc/manual/conf-file.xml
index 8fb3ff99deb5..10e6d08cde76 100644
--- a/doc/manual/conf-file.xml
+++ b/doc/manual/conf-file.xml
@@ -6,7 +6,7 @@
 
 
 <para>A number of persistent settings of Nix are stored in the file
-<filename><replaceable>prefix</replaceable>/etc/nix/nix.conf</filename>.
+<filename><replaceable>sysconfdir</replaceable>/nix/nix.conf</filename>.
 This file is a list of <literal><replaceable>name</replaceable> =
 <replaceable>value</replaceable></literal> pairs, one per line.
 Comments start with a <literal>#</literal> character.  An example
-- 
cgit 1.4.1