diff options
| author | William Deegan <bill@baddogconsulting.com> | 2017-08-21 23:12:03 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2017-08-21 23:12:03 (GMT) |
| commit | 0fb6edeeb568f47d6d5d769d6b65c0720d063b89 (patch) | |
| tree | 579883acdd0cfc5c37fc75118023cb60fb917973 /doc | |
| parent | 4057431ac3b09bf0b57cfd878d51b8c2bf53d11b (diff) | |
| parent | 939963642474e9f9b01adc6b42e5fda15de3fa89 (diff) | |
| download | SCons-0fb6edeeb568f47d6d5d769d6b65c0720d063b89.zip SCons-0fb6edeeb568f47d6d5d769d6b65c0720d063b89.tar.gz SCons-0fb6edeeb568f47d6d5d769d6b65c0720d063b89.tar.bz2 | |
merge
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/generated/functions.gen | 8 | ||||
| -rw-r--r-- | doc/generated/variables.gen | 4 | ||||
| -rw-r--r-- | doc/user/build-install.xml | 2 |
3 files changed, 11 insertions, 3 deletions
diff --git a/doc/generated/functions.gen b/doc/generated/functions.gen index e72740a..79a83c6 100644 --- a/doc/generated/functions.gen +++ b/doc/generated/functions.gen @@ -3998,6 +3998,14 @@ which corresponds to --random; and </listitem> </varlistentry> <varlistentry> +<term><literal>silent</literal></term> +<listitem> +<para> +which corresponds to --silent. +</para> +</listitem> +</varlistentry> +<varlistentry> <term><literal>stack_size</literal></term> <listitem> <para> diff --git a/doc/generated/variables.gen b/doc/generated/variables.gen index 3941137..ab70d73 100644 --- a/doc/generated/variables.gen +++ b/doc/generated/variables.gen @@ -3046,7 +3046,7 @@ The command line used to call the Java archive tool. <para xmlns="http://www.scons.org/dbxsd/v1.0"> The string displayed when the Java archive tool is called -If this is not set, then <envar xmlns="http://www.scons.org/dbxsd/v1.0">$JARCOM</envar> (the command line) is displayed. +If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-JARCOM"><envar>$JARCOM</envar></link> (the command line) is displayed. </para> <example_commands xmlns="http://www.scons.org/dbxsd/v1.0"> @@ -3056,7 +3056,7 @@ env = Environment(JARCOMSTR = "JARchiving $SOURCES into $TARGET") <para xmlns="http://www.scons.org/dbxsd/v1.0"> The string displayed when the Java archive tool is called -If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-JARCOM"><envar>$JARCOM</envar></link> (the command line) is displayed. +If this is not set, then <envar xmlns="http://www.scons.org/dbxsd/v1.0">$JARCOM</envar> (the command line) is displayed. </para> <example_commands xmlns="http://www.scons.org/dbxsd/v1.0"> diff --git a/doc/user/build-install.xml b/doc/user/build-install.xml index 3e66172..b3814e7 100644 --- a/doc/user/build-install.xml +++ b/doc/user/build-install.xml @@ -289,7 +289,7 @@ Python 2.5.1 that makes installation extremely easy. Download the <filename>scons-&buildversion;.win32.exe</filename> file from the &SCons; download page at - <ulink url="http://www.scons.org/download.php">http://www.scons.org/download.php</ulink>. + <ulink url="http://scons.org/pages/download.html">http://scons.org/pages/download.html</ulink>. Then all you need to do is execute the file (usually by clicking on its icon in Windows Explorer). These will take you through a small |