diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2018-02-13 17:33:07 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-13 17:33:07 +0100 |
commit | 52c777a79318c85c8fbd8c02174a03511de278db (patch) | |
tree | 7fd76a9e21c127346ff664c9618f4f62273230af /doc/manual | |
parent | 7253113fd240baea7bafe30fdb2734098ce35fc4 (diff) | |
parent | 6eb1040e909ab83fbc03983724d9c6ec223c4495 (diff) |
Merge pull request #1863 from shlevy/conf-includes
Allow includes from nix.conf
Diffstat (limited to 'doc/manual')
-rw-r--r-- | doc/manual/command-ref/conf-file.xml | 7 |
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 2b7a69a0c..42906ddff 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> |