jaiden/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Merge pull request #3126 from PyroLagus/fix-typos

Browse source 
Fix typos in the Nix Manual.
This commit is contained in:
Eelco Dolstra 2019-10-08 20:40:24 +02:00 committed by GitHub
commit a7e9286359
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/manual/command-ref/conf-file.xml
View file

@ -433,7 +433,7 @@ builtins.fetchurl {
<varlistentry xml:id="conf-keep-env-derivations"><term><literal>keep-env-derivations</literal></term> <varlistentry xml:id="conf-keep-env-derivations"><term><literal>keep-env-derivations</literal></term>
<listitem><para>If <literal>false</literal> (default), derivations <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> any build-time-only dependencies may be garbage-collected.</para>
<para>If <literal>true</literal>, when you add a Nix derivation to <para>If <literal>true</literal>, when you add a Nix derivation to

2
doc/manual/command-ref/nix-env.xml
View file

@ -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 <literal>gcc-3.3.1</literal> are split into two parts: the package
name (<literal>gcc</literal>), and the version name (<literal>gcc</literal>), and the version
(<literal>3.3.1</literal>). The version part starts after the first (<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 upgrade of <varname>y</varname> if their package names match, and the
version of <varname>y</varname> is higher that that of version of <varname>y</varname> is higher that that of
<varname>x</varname>.</para> <varname>x</varname>.</para>

2
doc/manual/command-ref/nix-prefetch-url.xml
View file

@ -53,7 +53,7 @@ avoided.</para>
<para>If <replaceable>hash</replaceable> is specified, then a download <para>If <replaceable>hash</replaceable> is specified, then a download
is not performed if the Nix store already contains a file with the 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 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> specified hash.</para>
<para>This command prints the hash on standard output. Additionally, <para>This command prints the hash on standard output. Additionally,

4
doc/manual/expressions/builtins.xml
View file

@ -289,7 +289,7 @@ if builtins ? getEnv then builtins.getEnv "PATH" else ""</programlisting>
<listitem><para>Return element <replaceable>n</replaceable> from <listitem><para>Return element <replaceable>n</replaceable> from
the list <replaceable>xs</replaceable>. Elements are counted 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> bounds.</para></listitem>
</varlistentry> </varlistentry>
@ -1466,7 +1466,7 @@ in foo</programlisting>
<listitem><para>A set containing <literal>{ __toString = self: ...; }</literal>.</para></listitem> <listitem><para>A set containing <literal>{ __toString = self: ...; }</literal>.</para></listitem>
<listitem><para>An integer.</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 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> <listitem><para><literal>null</literal>, which yields the empty string.</para></listitem>
</itemizedlist> </itemizedlist>
</listitem> </listitem>

2
doc/manual/expressions/simple-building-testing.xml
View file

@ -43,7 +43,7 @@ use <command>nix-build</command>’s <option
linkend='opt-out-link'>-o</option> switch to give the symlink another linkend='opt-out-link'>-o</option> switch to give the symlink another
name.</para> 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 successfully, Nix makes a note of this in its database: it registers
that the path denoted by <envar>out</envar> is now that the path denoted by <envar>out</envar> is now
<quote>valid</quote>. If you try to build the derivation again, Nix <quote>valid</quote>. If you try to build the derivation again, Nix