diff options
Diffstat (limited to 'doc/manual/conf-file.xml')
| -rw-r--r-- | doc/manual/conf-file.xml | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/doc/manual/conf-file.xml b/doc/manual/conf-file.xml index 4629e8eae0c1..932c339ebb61 100644 --- a/doc/manual/conf-file.xml +++ b/doc/manual/conf-file.xml @@ -350,13 +350,25 @@ flag, e.g. <literal>--option gc-keep-outputs false</literal>.</para> whitespace. These are not used by default, but can be enabled by users of the Nix daemon by specifying <literal>--option binary-caches <replaceable>urls</replaceable></literal> on the - command line. Daemon users are only allowed to pass a subset of - the URLs listed in <literal>binary-caches</literal> and + command line. Unprivileged users are only allowed to pass a + subset of the URLs listed in <literal>binary-caches</literal> and <literal>trusted-binary-caches</literal>.</para></listitem> </varlistentry> + <varlistentry><term><literal>extra-binary-caches</literal></term> + + <listitem><para>Additional binary caches appended to those + specified in <option>binary-caches</option> and + <option>binary-caches-files</option>. When used by unprivileged + users, untrusted binary caches (i.e. those not listed in + <option>trusted-binary-caches</option>) are silently + ignored.</para></listitem> + + </varlistentry> + + <varlistentry><term><literal>binary-caches-parallel-connections</literal></term> <listitem><para>The maximum number of parallel HTTP connections |