aboutsummaryrefslogtreecommitdiff
path: root/doc/manual
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2017-03-09 13:36:56 +0100
committerEelco Dolstra <edolstra@gmail.com>2017-03-09 13:36:56 +0100
commit19643a781ea3baaeb19d321093d99cb74b3ffc7e (patch)
tree08ede624088fa19bac84352c4c27d73152696125 /doc/manual
parent86227390c59cd0f55d0bea77b86338e017c2498a (diff)
nix -> Nix
Diffstat (limited to 'doc/manual')
-rw-r--r--doc/manual/command-ref/conf-file.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/manual/command-ref/conf-file.xml b/doc/manual/command-ref/conf-file.xml
index b1b604100..36b70f0c4 100644
--- a/doc/manual/command-ref/conf-file.xml
+++ b/doc/manual/command-ref/conf-file.xml
@@ -646,8 +646,8 @@ password <replaceable>my-password</replaceable>
<varlistentry xml:id="conf-allow-import-from-derivation"><term><literal>allow-import-from-derivation</literal></term>
- <listitem><para>By default, nix allows you to <function>import</function> from a derivation,
- allowing building at evaluation time. With this option set to false, nix will throw an error
+ <listitem><para>By default, Nix allows you to <function>import</function> from a derivation,
+ allowing building at evaluation time. With this option set to false, Nix will throw an error
when evaluating an expression that uses this feature, allowing users to ensure their evaluation
will not require any builds to take place.</para></listitem>