diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2017-08-31T12·28+0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2017-08-31T12·28+0200 |
| commit | c2154d4c8422ddc1c201d503bb52edff854af2ad (patch) | |
| tree | 46b01c4081ef1ba5c16bf3b739218cbdbee1ebd6 /doc/manual/command-ref/opt-common.xml | |
| parent | 7d4a7136dba7ceb3d5b080b092eb76d23e2bb549 (diff) | |
Rename a few configuration options
In particular, drop the "build-" and "gc-" prefixes which are pointless. So now you can say nix build --no-sandbox instead of nix build --no-build-use-sandbox
Diffstat (limited to 'doc/manual/command-ref/opt-common.xml')
| -rw-r--r-- | doc/manual/command-ref/opt-common.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/manual/command-ref/opt-common.xml b/doc/manual/command-ref/opt-common.xml index a930b4a0d781..32d53c753a22 100644 --- a/doc/manual/command-ref/opt-common.xml +++ b/doc/manual/command-ref/opt-common.xml @@ -94,7 +94,7 @@ perform in parallel to the specified number. Specify <literal>auto</literal> to use the number of CPUs in the system. The default is specified by the <link - linkend='conf-build-max-jobs'><literal>build-max-jobs</literal></link> + linkend='conf-max-jobs'><literal>max-jobs</literal></link> configuration setting, which itself defaults to <literal>1</literal>. A higher value is useful on SMP systems or to exploit I/O latency.</para></listitem> @@ -112,7 +112,7 @@ <literal>true</literal>, the builder passes the <option>-j<replaceable>N</replaceable></option> flag to GNU Make. It defaults to the value of the <link - linkend='conf-build-cores'><literal>build-cores</literal></link> + linkend='conf-cores'><literal>cores</literal></link> configuration setting, if set, or <literal>1</literal> otherwise. The value <literal>0</literal> means that the builder should use all available CPU cores in the system.</para></listitem> @@ -125,7 +125,7 @@ <listitem><para>Sets the maximum number of seconds that a builder can go without producing any data on standard output or standard error. The default is specified by the <link - linkend='conf-build-max-silent-time'><literal>build-max-silent-time</literal></link> + linkend='conf-max-silent-time'><literal>max-silent-time</literal></link> configuration setting. <literal>0</literal> means no time-out.</para></listitem> @@ -135,7 +135,7 @@ <listitem><para>Sets the maximum number of seconds that a builder can run. The default is specified by the <link - linkend='conf-build-timeout'><literal>build-timeout</literal></link> + linkend='conf-timeout'><literal>timeout</literal></link> configuration setting. <literal>0</literal> means no timeout.</para></listitem> |