about summary refs log tree commit diff
path: root/doc/manual/command-ref/conf-file.xml
diff options
context:
space:
mode:
authorDaiderd Jordan <daiderd@gmail.com>2016-12-16T09·59+0100
committerDaiderd Jordan <daiderd@gmail.com>2016-12-16T09·59+0100
commit36b3e159534e2a7c871ad50111446f687db452fa (patch)
tree48770434d8756eb3621e8abeda92fd40c4f756a1 /doc/manual/command-ref/conf-file.xml
parentec7d498b72b0e283814c27cbc6c064496f95445d (diff)
manual: add NIX_CONF_DIR to conf-file section
Diffstat (limited to 'doc/manual/command-ref/conf-file.xml')
-rw-r--r--doc/manual/command-ref/conf-file.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/manual/command-ref/conf-file.xml b/doc/manual/command-ref/conf-file.xml
index d2c9145e0505..6c0af39ecda9 100644
--- a/doc/manual/command-ref/conf-file.xml
+++ b/doc/manual/command-ref/conf-file.xml
@@ -18,7 +18,8 @@
 <refsection><title>Description</title>
 
 <para>A number of persistent settings of Nix are stored in the file
-<filename><replaceable>sysconfdir</replaceable>/nix/nix.conf</filename>.
+<filename><replaceable>sysconfdir</replaceable>/nix/nix.conf</filename> or
+<filename>$NIX_CONF_DIR/nix.conf</filename> if <envar>NIX_CONF_DIR</envar> is set.
 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.  Here is an example