Merge branch 'feature/upstream' into develop

1 files changed, 10 insertions, 6 deletions

diff --git a/doc/man/scons.xml b/doc/man/scons.xml
index 2f5eb32..dd9fbdd 100644
--- a/doc/man/scons.xml
+++ b/doc/man/scons.xml
@@ -75,8 +75,8 @@
 <refmeta>
 <refentrytitle>SCONS</refentrytitle>
 <manvolnum>1</manvolnum>
-<refmiscinfo class='source'>SCons 3.0.5</refmiscinfo>
-<refmiscinfo class='manual'>SCons 3.0.5</refmiscinfo>
+<refmiscinfo class='source'>SCons 3.1.0</refmiscinfo>
+<refmiscinfo class='manual'>SCons 3.1.0</refmiscinfo>
 </refmeta>
 <refnamediv id='name'>
 <refname>scons</refname>
@@ -2043,7 +2043,7 @@ env['BAR'] = 'bar'
 construction variables may also be set or modified by the
 <emphasis>parse_flags</emphasis>
 keyword argument, which applies the
-<emphasis role="bold">ParseFlags</emphasis>
+&f-link-env-MergeFlags;
 method (described below) to the argument value
 after all other processing is completed.
 This is useful either if the exact content of the flags is unknown
@@ -2051,7 +2051,7 @@ This is useful either if the exact content of the flags is unknown
 or if the flags are distributed to a number of construction variables.</para>
 
 <literallayout class="monospaced">
-env = Environment(parse_flags = '-Iinclude -DEBUG -lm')
+env = Environment(parse_flags='-Iinclude -DEBUG -lm')
 </literallayout>
 
 <para>This example adds 'include' to
@@ -2439,10 +2439,14 @@ see the descriptions of these variables, below, for more information.)</para>
 
 <para>It is also possible to use the
 <emphasis>parse_flags</emphasis>
-keyword argument in an override:</para>
+keyword argument in an override,
+to merge command-line style arguments
+into the appropriate construction variables
+(see &f-link-env-MergeFlags;).
+</para>
 
 <literallayout class="monospaced">
-env = Program('hello', 'hello.c', parse_flags = '-Iinclude -DEBUG -lm')
+env = Program('hello', 'hello.c', parse_flags='-Iinclude -DEBUG -lm')
 </literallayout>
 
 <para>This example adds 'include' to