diff options
| author | Shea Levy <shea@shealevy.com> | 2017-07-10 08:43:19 -0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2017-07-10 08:43:19 -0400 |
| commit | 62a8fe6388a1ee8f9376b8e65b0cb9a02c313e9f (patch) | |
| tree | 93f7ea62c280a5272f75d9890fc7d0654cd7d7ed /doc/manual/command-ref/opt-common.xml | |
| parent | 1762b9616cf8786270b2efb55800a8036574ed21 (diff) | |
| parent | 30117fb35bde6ba27d7de5037272ea23c8dcebf9 (diff) | |
Merge branch 'man2' of git://github.com/robx/nix
Diffstat (limited to 'doc/manual/command-ref/opt-common.xml')
| -rw-r--r-- | doc/manual/command-ref/opt-common.xml | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/doc/manual/command-ref/opt-common.xml b/doc/manual/command-ref/opt-common.xml index 2aa41c4d4..a930b4a0d 100644 --- a/doc/manual/command-ref/opt-common.xml +++ b/doc/manual/command-ref/opt-common.xml @@ -22,8 +22,7 @@ </varlistentry> -<varlistentry><term><option>--verbose</option></term> - <term><option>-v</option></term> +<varlistentry><term><option>--verbose</option> / <option>-v</option></term> <listitem> @@ -76,8 +75,7 @@ </varlistentry> -<varlistentry><term><option>--no-build-output</option></term> - <term><option>-Q</option></term> +<varlistentry><term><option>--no-build-output</option> / <option>-Q</option></term> <listitem><para>By default, output written by builders to standard output and standard error is echoed to the Nix command's standard @@ -89,8 +87,8 @@ </varlistentry> -<varlistentry xml:id="opt-max-jobs"><term><option>--max-jobs</option></term> - <term><option>-j</option></term> +<varlistentry xml:id="opt-max-jobs"><term><option>--max-jobs</option> / <option>-j</option> +<replaceable>number</replaceable></term> <listitem><para>Sets the maximum number of build jobs that Nix will perform in parallel to the specified number. Specify @@ -143,8 +141,7 @@ </varlistentry> -<varlistentry><term><option>--keep-going</option></term> - <term><option>-k</option></term> +<varlistentry><term><option>--keep-going</option> / <option>-k</option></term> <listitem><para>Keep going in case of failed builds, to the greatest extent possible. That is, if building an input of some @@ -156,8 +153,7 @@ </varlistentry> -<varlistentry><term><option>--keep-failed</option></term> - <term><option>-K</option></term> +<varlistentry><term><option>--keep-failed</option> / <option>-K</option></term> <listitem><para>Specifies that in case of a build failure, the temporary directory (usually in <filename>/tmp</filename>) in which |