Fix Bug #2486 - Allow SetOption('silent',True) - Previously this option could not...

diff --git a/doc/generated/functions.gen b/doc/generated/functions.gen
index e72740a2932ed3f5fe0c0a41b565197e5098f69e..79a83c62f97a73f9e744fee12adb4c2fd56474ea 100644 (file)
--- 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 0ad4c96dcc3375eb4315f56fffae8822d75d38ea..5bf39b846229b291463b9292263bc7aa7bd27718 100644 (file)
--- 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/src/engine/SCons/Script/Main.xml b/src/engine/SCons/Script/Main.xml
index 98db5bf36354ff989ad26267888ca77ae39fa90b..e95afbca2ce32581122d73ee3eb2be3efc5924b5 100644 (file)
--- a/src/engine/SCons/Script/Main.xml
+++ b/src/engine/SCons/Script/Main.xml
@@ -781,6 +781,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>