about summary refs log tree commit diff
path: root/doc
diff options
context:
space:
mode:
authorShea Levy <shea@shealevy.com>2018-02-13T13·16-0500
committerShea Levy <shea@shealevy.com>2018-02-13T13·16-0500
commit6eb1040e909ab83fbc03983724d9c6ec223c4495 (patch)
tree979e10a32a8d7c82afce42abd9286e1efba53688 /doc
parentf471aacff213047390951620f5f9799dc745f167 (diff)
Allow includes from nix.conf
Diffstat (limited to 'doc')
-rw-r--r--doc/manual/command-ref/conf-file.xml7
1 files changed, 6 insertions, 1 deletions
diff --git a/doc/manual/command-ref/conf-file.xml b/doc/manual/command-ref/conf-file.xml
index 5c4561f66d86..8ed614963a4b 100644
--- a/doc/manual/command-ref/conf-file.xml
+++ b/doc/manual/command-ref/conf-file.xml
@@ -40,7 +40,12 @@
 
 <para>The configuration files consist of
 <literal><replaceable>name</replaceable> =
-<replaceable>value</replaceable></literal> pairs, one per line.
+<replaceable>value</replaceable></literal> pairs, one per line. Other
+files can be included with a line like <literal>include
+<replaceable>path</replaceable></literal>, where
+<replaceable>path</replaceable> is interpreted relative to the current
+conf file and a missing file is an error unless
+<literal>!include</literal> is used instead.
 Comments start with a <literal>#</literal> character.  Here is an
 example configuration file:</para>