diff options
| author | Danny Bautista <pyrolagus@nerdpol.ch> | 2019-10-08T18·02-0400 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2019-10-09T14·23+0200 |
| commit | 3c5788d09444b48c5ad82e8677d4ac5a58b94a3a (patch) | |
| tree | 03b97898dcf964787991eb2ae093bd7c5d0c3cb5 /doc/manual/command-ref | |
| parent | 9f698c4530f893141850fad4f99d7e377a372bb0 (diff) | |
Fix typos in the Nix Manual.
(cherry picked from commit 00a567588e43b51944a9b91c1e890bda27773aed)
Diffstat (limited to 'doc/manual/command-ref')
| -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 |
3 files changed, 3 insertions, 3 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, |