diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-12-13T22·16+0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-12-13T22·16+0100 |
| commit | 3b88d037145c8d0f26b0797f8269e65c4c6df4ff (patch) | |
| tree | 42cec75ef79f98e6ab823dee7c843eee9ca3ad1c /doc/manual/installation | |
| parent | e5a51fab24e01d59927f1a6e3a9e2adaaf7f951e (diff) | |
Document channel format and excise most mentions of manifests and nix-pull
Diffstat (limited to 'doc/manual/installation')
| -rw-r--r-- | doc/manual/installation/multi-user.xml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/manual/installation/multi-user.xml b/doc/manual/installation/multi-user.xml index 312f596645..69ae1ef270 100644 --- a/doc/manual/installation/multi-user.xml +++ b/doc/manual/installation/multi-user.xml @@ -23,11 +23,11 @@ daemon</emphasis> running under the owner of the Nix store/database that performs the operation.</para> <note><para>Multi-user mode has one important limitation: only -<systemitem class="username">root</systemitem> can run <command -linkend="sec-nix-pull">nix-pull</command> to register the availability -of pre-built binaries. However, those registrations are shared by all -users, so they still get the benefit from <command>nix-pull</command>s -done by <systemitem class="username">root</systemitem>.</para></note> +<systemitem class="username">root</systemitem> and a set of trusted +users specified in <filename>nix.conf</filename> can specify arbitrary +binary caches. So while unprivileged users may install packages from +arbitrary Nix expressions, they may not get pre-built +binaries.</para></note> <simplesect> |