diff options
Diffstat (limited to 'doc/manual')
| -rw-r--r-- | doc/manual/command-ref/conf-file.xml | 2 | ||||
| -rw-r--r-- | doc/manual/command-ref/nix-env.xml | 2 | ||||
| -rw-r--r-- | doc/manual/command-ref/nix-prefetch-url.xml | 2 | ||||
| -rw-r--r-- | doc/manual/expressions/builtins.xml | 4 | ||||
| -rw-r--r-- | doc/manual/expressions/simple-building-testing.xml | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/doc/manual/command-ref/conf-file.xml b/doc/manual/command-ref/conf-file.xml index 320e15339d9e..48dce7c950d9 100644 --- a/doc/manual/command-ref/conf-file.xml +++ b/doc/manual/command-ref/conf-file.xml @@ -433,7 +433,7 @@ builtins.fetchurl { <varlistentry xml:id="conf-keep-env-derivations"><term><literal>keep-env-derivations</literal></term> <listitem><para>If <literal>false</literal> (default), derivations - are not stored in Nix user environments. That is, the derivation + are not stored in Nix user environments. That is, the derivations of any build-time-only dependencies may be garbage-collected.</para> <para>If <literal>true</literal>, when you add a Nix derivation to diff --git a/doc/manual/command-ref/nix-env.xml b/doc/manual/command-ref/nix-env.xml index c8c01f9a44fa..d257a5e49c70 100644 --- a/doc/manual/command-ref/nix-env.xml +++ b/doc/manual/command-ref/nix-env.xml @@ -659,7 +659,7 @@ upgrading `mozilla-1.2' to `mozilla-1.4'</screen> <literal>gcc-3.3.1</literal> are split into two parts: the package name (<literal>gcc</literal>), and the version (<literal>3.3.1</literal>). The version part starts after the first -dash not following by a letter. <varname>x</varname> is considered an +dash not followed by a letter. <varname>x</varname> is considered an upgrade of <varname>y</varname> if their package names match, and the version of <varname>y</varname> is higher that that of <varname>x</varname>.</para> diff --git a/doc/manual/command-ref/nix-prefetch-url.xml b/doc/manual/command-ref/nix-prefetch-url.xml index 8ef748c74be3..621ded72ec26 100644 --- a/doc/manual/command-ref/nix-prefetch-url.xml +++ b/doc/manual/command-ref/nix-prefetch-url.xml @@ -53,7 +53,7 @@ avoided.</para> <para>If <replaceable>hash</replaceable> is specified, then a download is not performed if the Nix store already contains a file with the same hash and base name. Otherwise, the file is downloaded, and an -error if signaled if the actual hash of the file does not match the +error is signaled if the actual hash of the file does not match the specified hash.</para> <para>This command prints the hash on standard output. Additionally, diff --git a/doc/manual/expressions/builtins.xml b/doc/manual/expressions/builtins.xml index 4c1d618e951c..b1ad544c04b6 100644 --- a/doc/manual/expressions/builtins.xml +++ b/doc/manual/expressions/builtins.xml @@ -301,7 +301,7 @@ if builtins ? getEnv then builtins.getEnv "PATH" else ""</programlisting> <listitem><para>Return element <replaceable>n</replaceable> from the list <replaceable>xs</replaceable>. Elements are counted - starting from 0. A fatal error occurs in the index is out of + starting from 0. A fatal error occurs if the index is out of bounds.</para></listitem> </varlistentry> @@ -1468,7 +1468,7 @@ in foo</programlisting> <listitem><para>A set containing <literal>{ __toString = self: ...; }</literal>.</para></listitem> <listitem><para>An integer.</para></listitem> <listitem><para>A list, in which case the string representations of its elements are joined with spaces.</para></listitem> - <listitem><para>A Boolean (<literal>false</literal> yields <literal>""</literal>, <literal>true</literal> yields <literal>"1"</literal>.</para></listitem> + <listitem><para>A Boolean (<literal>false</literal> yields <literal>""</literal>, <literal>true</literal> yields <literal>"1"</literal>).</para></listitem> <listitem><para><literal>null</literal>, which yields the empty string.</para></listitem> </itemizedlist> </listitem> diff --git a/doc/manual/expressions/simple-building-testing.xml b/doc/manual/expressions/simple-building-testing.xml index 0348c082b205..7326a3e76ad5 100644 --- a/doc/manual/expressions/simple-building-testing.xml +++ b/doc/manual/expressions/simple-building-testing.xml @@ -43,7 +43,7 @@ use <command>nix-build</command>’s <option linkend='opt-out-link'>-o</option> switch to give the symlink another name.</para> -<para>Nix has a transactional semantics. Once a build finishes +<para>Nix has transactional semantics. Once a build finishes successfully, Nix makes a note of this in its database: it registers that the path denoted by <envar>out</envar> is now <quote>valid</quote>. If you try to build the derivation again, Nix |