diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/manual/builtins.xml | 2 | ||||
| -rw-r--r-- | doc/manual/conf-file.xml | 14 | ||||
| -rw-r--r-- | doc/manual/env-common.xml | 2 | ||||
| -rw-r--r-- | doc/manual/nix-env.xml | 6 | ||||
| -rw-r--r-- | doc/manual/nix-store.xml | 2 | ||||
| -rw-r--r-- | doc/manual/opt-common.xml | 2 | ||||
| -rw-r--r-- | doc/manual/package-management.xml | 2 | ||||
| -rw-r--r-- | doc/manual/release-notes.xml | 8 | ||||
| -rw-r--r-- | doc/manual/troubleshooting.xml | 4 | ||||
| -rw-r--r-- | doc/manual/writing-nix-expressions.xml | 6 |
10 files changed, 24 insertions, 24 deletions
diff --git a/doc/manual/builtins.xml b/doc/manual/builtins.xml index b75f58e21f1b..465c062b6445 100644 --- a/doc/manual/builtins.xml +++ b/doc/manual/builtins.xml @@ -434,7 +434,7 @@ x: x + 456</programlisting> <replaceable>e</replaceable></term> <listitem><para>Return <literal>true</literal> if - <replaceable>e</replaceable> evaluates to a int, and + <replaceable>e</replaceable> evaluates to an int, and <literal>false</literal> otherwise.</para></listitem> </varlistentry> diff --git a/doc/manual/conf-file.xml b/doc/manual/conf-file.xml index 754c4d02967b..c37a2da47413 100644 --- a/doc/manual/conf-file.xml +++ b/doc/manual/conf-file.xml @@ -101,8 +101,8 @@ flag, e.g. <literal>--option gc-keep-outputs false</literal>.</para> <listitem><para>This option defines the maximum number of jobs that Nix will try to build in parallel. The default is <literal>1</literal>. You should generally set it to the number - of CPUs in your system (e.g., <literal>2</literal> on a Athlon 64 - X2). It can be overriden using the <option + of CPUs in your system (e.g., <literal>2</literal> on an Athlon 64 + X2). It can be overridden using the <option linkend='opt-max-jobs'>--max-jobs</option> (<option>-j</option>) command line switch.</para></listitem> @@ -119,7 +119,7 @@ flag, e.g. <literal>--option gc-keep-outputs false</literal>.</para> <varname>enableParallelBuilding</varname> is set to <literal>true</literal>, the builder passes the <option>-j<replaceable>N</replaceable></option> flag to GNU Make. - It can be overriden using the <option + It can be overridden using the <option linkend='opt-cores'>--cores</option> command line switch and defaults to <literal>1</literal>. The value <literal>0</literal> means that the builder should use all available CPU cores in the @@ -134,10 +134,10 @@ flag, e.g. <literal>--option gc-keep-outputs false</literal>.</para> <para>This option defines the maximum number of seconds that a builder can go without producing any data on standard output or - standard error. This is useful (for instance in a automated + standard error. This is useful (for instance in an automated build system) to catch builds that are stuck in an infinite loop, or to catch remote builds that are hanging due to network - problems. It can be overriden using the <option + problems. It can be overridden using the <option linkend="opt-max-silent-time">--max-silent-time</option> command line switch.</para> @@ -153,10 +153,10 @@ flag, e.g. <literal>--option gc-keep-outputs false</literal>.</para> <listitem> <para>This option defines the maximum number of seconds that a - builder can run. This is useful (for instance in a automated + builder can run. This is useful (for instance in an automated build system) to catch builds that are stuck in an infinite loop but keep writing to their standard output or standard error. It - can be overriden using the <option + can be overridden using the <option linkend="opt-timeout">--timeout</option> command line switch.</para> diff --git a/doc/manual/env-common.xml b/doc/manual/env-common.xml index bc10bc069f50..e6a358931848 100644 --- a/doc/manual/env-common.xml +++ b/doc/manual/env-common.xml @@ -293,7 +293,7 @@ $ mount -o bind /mnt/otherdisk/nix /nix</screen> <varlistentry xml:id="envar-other-stores"><term><envar>NIX_OTHER_STORES</envar></term> <listitem><para>This variable contains the paths of remote Nix - installations from whichs paths can be copied, separated by colons. + installations from which packages can be copied, separated by colons. <phrase condition="manual">See <xref linkend="sec-sharing-packages" /> for details.</phrase> Each path should be the <filename>/nix</filename> directory of a remote Nix installation diff --git a/doc/manual/nix-env.xml b/doc/manual/nix-env.xml index ff9f9c16a2cb..84c875dad219 100644 --- a/doc/manual/nix-env.xml +++ b/doc/manual/nix-env.xml @@ -272,7 +272,7 @@ number of possible ways: linkend="ss-functions">functions</link> that are called with the active Nix expression as their single argument. The derivations returned by those function calls are installed. This allows - derivations to be specified in a unambiguous way, which is necessary + derivations to be specified in an unambiguous way, which is necessary if there are multiple derivations with the same name.</para></listitem> @@ -692,7 +692,7 @@ firefox-2.0.0.9 <lineannotation>(the current one)</lineannotation> $ nix-env --preserve-installed -i firefox-2.0.0.11 installing `firefox-2.0.0.11' building path(s) `/nix/store/myy0y59q3ig70dgq37jqwg1j0rsapzsl-user-environment' -Collission between `/nix/store/<replaceable>...</replaceable>-firefox-2.0.0.11/bin/firefox' +collision between `/nix/store/<replaceable>...</replaceable>-firefox-2.0.0.11/bin/firefox' and `/nix/store/<replaceable>...</replaceable>-firefox-2.0.0.9/bin/firefox'. <lineannotation>(i.e., can’t have two active at the same time)</lineannotation> @@ -1244,7 +1244,7 @@ wrapper around <option>--list-generations</option> and $ nix-env --rollback switching from generation 92 to 91 -$ nix-env --rolback +$ nix-env --rollback error: no generation older than the current (91) exists</screen> </refsection> diff --git a/doc/manual/nix-store.xml b/doc/manual/nix-store.xml index c8146c9076b3..63ddef28e1b9 100644 --- a/doc/manual/nix-store.xml +++ b/doc/manual/nix-store.xml @@ -164,7 +164,7 @@ the specified store paths. Realisation is a somewhat overloaded term: exist in the file system). If the path is already valid, we are done immediately. Otherwise, the path and any missing paths in its closure may be produced through substitutes. If there are no - (succesful) subsitutes, realisation fails.</para></listitem> + (successful) subsitutes, realisation fails.</para></listitem> </itemizedlist> diff --git a/doc/manual/opt-common.xml b/doc/manual/opt-common.xml index f900d0a782f2..a877b536a5c7 100644 --- a/doc/manual/opt-common.xml +++ b/doc/manual/opt-common.xml @@ -236,7 +236,7 @@ interpreted by the <command>nix-log2xml</command> tool in the Nix source distribution. The resulting XML file can be fed into the <command>log2html.xsl</command> stylesheet to create an HTML - file that can be browsed interactively, using Javascript to + file that can be browsed interactively, using JavaScript to expand and collapse parts of the output.</para></listitem> </varlistentry> diff --git a/doc/manual/package-management.xml b/doc/manual/package-management.xml index a0ada63e5513..202d6554f36c 100644 --- a/doc/manual/package-management.xml +++ b/doc/manual/package-management.xml @@ -129,7 +129,7 @@ downloading binaries from <systemitem class='fqdomainname'>nixos.org</systemitem>, instead of building them from source. This might still take a while since all dependencies must be downloaded, but on a reasonably fast connection -such as an DSL line it’s on the order of a few minutes.</para> +such as a DSL line it’s on the order of a few minutes.</para> <para>Naturally, packages can also be uninstalled: diff --git a/doc/manual/release-notes.xml b/doc/manual/release-notes.xml index a1132b978ead..e44cea2f1113 100644 --- a/doc/manual/release-notes.xml +++ b/doc/manual/release-notes.xml @@ -1358,7 +1358,7 @@ irreversible.</para></warning> </para></listitem> - <listitem><para>You can now unambigously specify which derivation to + <listitem><para>You can now unambiguously specify which derivation to build or install in <command>nix-env</command>, <command>nix-instantiate</command> and <command>nix-build</command> using the <option>--attr</option> / <option>-A</option> flags, which @@ -1498,7 +1498,7 @@ irreversible.</para></warning> <itemizedlist> <listitem><para>Make sure that the garbage collector can run - succesfully when the disk is full + successfully when the disk is full (<literal>NIX-18</literal>).</para></listitem> <listitem><para><command>nix-env</command> now locks the profile @@ -1853,7 +1853,7 @@ $ nix-env -f .../i686-linux.nix -i -E 'x: x.firefoxWrapper'</screen> </itemizedlist></para></listitem> <listitem><para>A hash of the contents of a store path is now stored - in the database after a succesful build. This allows you to check + in the database after a successful build. This allows you to check whether store paths have been tampered with: <command>nix-store --verify --check-contents</command>.</para></listitem> @@ -2017,7 +2017,7 @@ $ nix-env -f .../i686-linux.nix -i -E 'x: x.firefoxWrapper'</screen> <itemizedlist> <listitem><para>Derivations for other platforms are filtered out - (which can be overriden using + (which can be overridden using <option>--system-filter</option>).</para></listitem> <listitem><para><option>--install</option> by default now diff --git a/doc/manual/troubleshooting.xml b/doc/manual/troubleshooting.xml index 7403200e0326..ec8c4c924fc7 100644 --- a/doc/manual/troubleshooting.xml +++ b/doc/manual/troubleshooting.xml @@ -17,7 +17,7 @@ bug tracker</link> for a list of currently known issues.</para> $ nix-env -i docbook-xml ... adding /nix/store/s5hyxgm62gk2...-docbook-xml-4.2 -collission between `/nix/store/s5hyxgm62gk2...-docbook-xml-4.2/xml/dtd/docbook/calstblx.dtd' +collision between `/nix/store/s5hyxgm62gk2...-docbook-xml-4.2/xml/dtd/docbook/calstblx.dtd' and `/nix/store/06h377hr4b33...-docbook-xml-4.3/xml/dtd/docbook/calstblx.dtd' at /nix/store/...-builder.pl line 62.</screen> @@ -68,7 +68,7 @@ in <filename>/nix/store</filename>, as can be seen using <command>ls $ ls -l /nix/store drwxrwxrwt 32000 nix nix 4620288 Sep 8 15:08 store</screen> -The <literal>ext2</literal> file system is limited to a inode link +The <literal>ext2</literal> file system is limited to an inode link count of 32,000 (each subdirectory increasing the count by one). Furthermore, the <literal>st_nlink</literal> field of the <function>stat</function> system call is a 16-bit value.</para> diff --git a/doc/manual/writing-nix-expressions.xml b/doc/manual/writing-nix-expressions.xml index 80e7fd03748a..76007fe28feb 100644 --- a/doc/manual/writing-nix-expressions.xml +++ b/doc/manual/writing-nix-expressions.xml @@ -617,7 +617,7 @@ Laziness means that arguments to functions are evaluated only when they are needed. Functional means that functions are <quote>normal</quote> values that can be passed around and manipulated in interesting ways. The language is not a full-featured, general -purpose language. It's main job is to describe packages, +purpose language. Its main job is to describe packages, compositions of packages, and the variability within packages.</para> @@ -723,7 +723,7 @@ configureFlags = " <literal>''</literal>, i.e., <literal>''${</literal>. <literal>''</literal> can be escaped by prefixing it with <literal>'</literal>, i.e., <literal>'''</literal>. Finally, - linefeed, carriage-return and tab characters can be writted as + linefeed, carriage-return and tab characters can be written as <literal>''\n</literal>, <literal>''\r</literal>, <literal>''\t</literal>.</para> @@ -775,7 +775,7 @@ stdenv.mkDerivation { absolute at parse time relative to the directory of the Nix expression that contained it. For instance, if a Nix expression in <filename>/foo/bar/bla.nix</filename> refers to - <filename>../xyzzy/fnord.nix</filename>, the absolutised path is + <filename>../xyzzy/fnord.nix</filename>, the absolute path is <filename>/foo/xyzzy/fnord.nix</filename>.</para></listitem> <listitem><para><emphasis>Booleans</emphasis> with values |