diff options
author | Mats Wichmann <mats@linux.com> | 2019-05-08 10:32:44 -0600 |
---|---|---|
committer | Mats Wichmann <mats@linux.com> | 2019-05-14 10:48:07 -0600 |
commit | 2792dbd6420f59b26d105c7375e016231a2bd88c (patch) | |
tree | 5b2d30cd414ca653fcb769cdaa860ddef0fb0b30 /doc/generated/variables.gen | |
parent | b47b5c7e6e293d353e944ebdce24345c51a88111 (diff) | |
download | scons-git-2792dbd6420f59b26d105c7375e016231a2bd88c.tar.gz |
Update docs for parse_flags keywords
The somewhat poorly named parse_flags keyword args actually work like
the MergeFlags method - don't just split like the ParseFlags method,
but do the merging as well. Tweak the docs and add a reference to
env.MergeFlags.
Signed-off-by: Mats Wichmann <mats@linux.com>
Diffstat (limited to 'doc/generated/variables.gen')
-rw-r--r-- | doc/generated/variables.gen | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/generated/variables.gen b/doc/generated/variables.gen index 1c2d2f5f1..ad64b7033 100644 --- a/doc/generated/variables.gen +++ b/doc/generated/variables.gen @@ -3298,7 +3298,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"> @@ -3308,7 +3308,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"> |