Merge branch 'feature/upstream' into develop

26 files changed, 1323 insertions, 870 deletions

diff --git a/doc/generated/builders.gen b/doc/generated/builders.gen
index d851c93..dc05443 100644
--- a/doc/generated/builders.gen
+++ b/doc/generated/builders.gen
@@ -572,75 +572,77 @@ env.Jar(target = 'bar.jar',
       <function>env.Java()</function>
     </term>
     <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-Builds one or more Java class files.
-The sources may be any combination of explicit
-<filename>.java</filename> files,
-or directory trees which will be scanned
-for <filename>.java</filename> files.
-</para>
-
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-SCons will parse each source <filename>.java</filename> file
-to find the classes
-(including inner classes)
-defined within that file,
-and from that figure out the
-target <filename>.class</filename> files that will be created.
-The class files will be placed underneath
-the specified target directory.
-</para>
-
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-SCons will also search each Java file
-for the Java package name,
-which it assumes can be found on a line
-beginning with the string
-<literal>package</literal>
-in the first column;
-the resulting <filename>.class</filename> files
-will be placed in a directory reflecting
-the specified package name.
-For example,
-the file
-<filename>Foo.java</filename>
-defining a single public
-<classname>Foo</classname>
-class and
-containing a package name of
-<classname>sub.dir</classname>
-will generate a corresponding
-<filename>sub/dir/Foo.class</filename>
-class file.
-</para>
-
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-Examples:
-</para>
-
-<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
-env.Java(target = 'classes', source = 'src')
-env.Java(target = 'classes', source = ['src1', 'src2'])
-env.Java(target = 'classes', source = ['File1.java', 'File2.java'])
-</example_commands>
-
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-Java source files can use the native encoding for the underlying OS.
-Since SCons compiles in simple ASCII mode by default,
-the compiler will generate warnings about unmappable characters,
-which may lead to errors as the file is processed further.
-In this case, the user must specify the <literal>LANG</literal>
-environment variable to tell the compiler what encoding is used.
-For portibility, it's best if the encoding is hard-coded
-so that the compile will work if it is done on a system
-with a different encoding.
-</para>
-
-<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
-env = Environment()
-env['ENV']['LANG'] = 'en_GB.UTF-8'
-</example_commands>
-</listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                Builds one or more Java class files.
+                The sources may be any combination of explicit
+                <filename>.java</filename>
+                files,
+                or directory trees which will be scanned
+                for <filename>.java</filename> files.
+            </para>
+
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                SCons will parse each source <filename>.java</filename> file
+                to find the classes
+                (including inner classes)
+                defined within that file,
+                and from that figure out the
+                target <filename>.class</filename> files that will be created.
+                The class files will be placed underneath
+                the specified target directory.
+            </para>
+
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                SCons will also search each Java file
+                for the Java package name,
+                which it assumes can be found on a line
+                beginning with the string
+                <literal>package</literal>
+                in the first column;
+                the resulting <filename>.class</filename> files
+                will be placed in a directory reflecting
+                the specified package name.
+                For example,
+                the file
+                <filename>Foo.java</filename>
+                defining a single public
+                <classname>Foo</classname>
+                class and
+                containing a package name of
+                <classname>sub.dir</classname>
+                will generate a corresponding
+                <filename>sub/dir/Foo.class</filename>
+                class file.
+            </para>
+
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                Examples:
+            </para>
+
+            <example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
+                env.Java(target = 'classes', source = 'src')
+                env.Java(target = 'classes', source = ['src1', 'src2'])
+                env.Java(target = 'classes', source = ['File1.java', 'File2.java'])
+            </example_commands>
+
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                Java source files can use the native encoding for the underlying OS.
+                Since SCons compiles in simple ASCII mode by default,
+                the compiler will generate warnings about unmappable characters,
+                which may lead to errors as the file is processed further.
+                In this case, the user must specify the
+                <literal>LANG</literal>
+                environment variable to tell the compiler what encoding is used.
+                For portibility, it's best if the encoding is hard-coded
+                so that the compile will work if it is done on a system
+                with a different encoding.
+            </para>
+
+            <example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
+                env = Environment()
+                env['ENV']['LANG'] = 'en_GB.UTF-8'
+            </example_commands>
+        </listitem>
   </varlistentry>
   <varlistentry id="b-JavaH">
     <term>
@@ -836,148 +838,192 @@ Compile files for languages defined in <filename>LINGUAS</filename> file
     <term>
       <function>env.MSVSProject()</function>
     </term>
-    <listitem> <para xmlns="http://www.scons.org/dbxsd/v1.0"> Builds a Microsoft Visual Studio project
-file, and by default builds a solution file as well. </para> <para xmlns="http://www.scons.org/dbxsd/v1.0"> This
-builds a Visual Studio project file, based on the version of Visual Studio
-that is configured (either the latest installed version, or the version
-specified by <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-MSVS_VERSION"><envar>$MSVS_VERSION</envar></link> in the Environment constructor). For
-Visual Studio 6, it will generate a <filename>.dsp</filename> file. For Visual
-Studio 7 (.NET) and later versions, it will generate a
-<filename>.vcproj</filename> file. </para> <para xmlns="http://www.scons.org/dbxsd/v1.0"> By default, this also
-generates a solution file for the specified project, a
-<filename>.dsw</filename> file for Visual Studio 6 or a
-<filename>.sln</filename> file for Visual Studio 7 (.NET). This behavior may
-be disabled by specifying <literal>auto_build_solution=0</literal> when you
-call <function xmlns="http://www.scons.org/dbxsd/v1.0">MSVSProject</function>, in which case you presumably want to build the solution
-file(s) by calling the <function xmlns="http://www.scons.org/dbxsd/v1.0">MSVSSolution</function> Builder (see below). </para> <para xmlns="http://www.scons.org/dbxsd/v1.0">
-The <function xmlns="http://www.scons.org/dbxsd/v1.0">MSVSProject</function> builder takes several lists of filenames to be placed into
-the project file. These are currently limited to <literal>srcs</literal>,
-<literal>incs</literal>, <literal>localincs</literal>,
-<literal>resources</literal>, and <literal>misc</literal>. These are pretty
-self-explanatory, but it should be noted that these lists are added to the
-<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SOURCES"><envar>$SOURCES</envar></link> construction variable as strings, NOT as SCons File Nodes.
-This is because they represent file names to be added to the project file, not
-the source files used to build the project file. </para> <para xmlns="http://www.scons.org/dbxsd/v1.0"> The above
-filename lists are all optional, although at least one must be specified for
-the resulting project file to be non-empty. </para> <para xmlns="http://www.scons.org/dbxsd/v1.0"> In addition to the
-above lists of values, the following values may be specified:
-</para><variablelist xmlns="http://www.scons.org/dbxsd/v1.0">
-    <varlistentry>
-      <term>target</term>
-
-      <listitem>
-        <para>The name of the target <filename>.dsp</filename> or
-        <filename>.vcproj</filename> file. The correct suffix for the version
-        of Visual Studio must be used, but the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-MSVSPROJECTSUFFIX"><envar>$MSVSPROJECTSUFFIX</envar></link>
-        construction variable will be defined to the correct value (see
-        example below).</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>variant</term>
-
-      <listitem>
-        <para>The name of this particular variant. For Visual Studio 7
-        projects, this can also be a list of variant names. These are
-        typically things like "Debug" or "Release", but really can be anything
-        you want. For Visual Studio 7 projects, they may also specify a target
-        platform separated from the variant name by a <literal>|</literal>
-        (vertical pipe) character: <literal>Debug|Xbox</literal>. The default
-        target platform is Win32. Multiple calls to <function xmlns="http://www.scons.org/dbxsd/v1.0">MSVSProject</function> with
-        different variants are allowed; all variants will be added to the
-        project file with their appropriate build targets and
-        sources.</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>cmdargs</term>
-
-      <listitem>
-        <para>Additional command line arguments for the different
-        variants. The number of <literal>cmdargs</literal> entries must match
-        the number of <literal>variant</literal> entries, or be empty (not
-        specified). If you give only one, it will automatically be propagated
-        to all variants.</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>buildtarget</term>
-
-      <listitem>
-        <para>An optional string, node, or list of strings or nodes (one
-        per build variant), to tell the Visual Studio debugger what output
-        target to use in what build variant. The number of
-        <literal>buildtarget</literal> entries must match the number of
-        <literal>variant</literal> entries.</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>runfile</term>
-
-      <listitem>
-        <para>The name of the file that Visual Studio 7 and later will
-        run and debug. This appears as the value of the
-        <literal>Output</literal> field in the resulting Visual Studio project
-        file. If this is not specified, the default is the same as the
-        specified <literal>buildtarget</literal> value.</para>
-      </listitem>
-    </varlistentry>
-  </variablelist><para xmlns="http://www.scons.org/dbxsd/v1.0"> Note that because <application xmlns="http://www.scons.org/dbxsd/v1.0">SCons</application> always executes its build
-commands from the directory in which the <filename xmlns="http://www.scons.org/dbxsd/v1.0">SConstruct</filename> file is located, if you
-generate a project file in a different directory than the <filename xmlns="http://www.scons.org/dbxsd/v1.0">SConstruct</filename>
-directory, users will not be able to double-click on the file name in
-compilation error messages displayed in the Visual Studio console output
-window. This can be remedied by adding the Visual C/C++ <literal>/FC</literal>
-compiler option to the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-CCFLAGS"><envar>$CCFLAGS</envar></link> variable so that the compiler will
-print the full path name of any files that cause compilation errors. </para>
-<para xmlns="http://www.scons.org/dbxsd/v1.0"> Example usage: </para>
-    <example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
+    <listitem>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">
+        Builds a Microsoft Visual Studio project file, and by default
+        builds a solution file as well.
+      </para>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">
+        This builds a Visual Studio project file, based on the
+        version of Visual Studio that is configured (either the
+        latest installed version, or the version specified by
+        <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-MSVS_VERSION"><envar>$MSVS_VERSION</envar></link> in the Environment constructor). For
+        Visual Studio 6, it will generate a <filename>.dsp</filename>
+        file. For Visual Studio 7 (.NET) and later versions, it will
+        generate a <filename>.vcproj</filename> file.
+      </para>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">
+        By default, this also generates a solution file for the
+        specified project, a <filename>.dsw</filename> file for
+        Visual Studio 6 or a <filename>.sln</filename> file for
+        Visual Studio 7 (.NET). This behavior may be disabled by
+        specifying <literal>auto_build_solution=0</literal> when you
+        call <function xmlns="http://www.scons.org/dbxsd/v1.0">MSVSProject</function>, in which case you presumably want to
+        build the solution file(s) by calling the <function xmlns="http://www.scons.org/dbxsd/v1.0">MSVSSolution</function>
+        Builder (see below).
+      </para>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">
+        The <function xmlns="http://www.scons.org/dbxsd/v1.0">MSVSProject</function> builder takes several lists of filenames
+        to be placed into the project file. These are currently
+        limited to <literal>srcs</literal>, <literal>incs</literal>,
+        <literal>localincs</literal>, <literal>resources</literal>, and
+        <literal>misc</literal>. These are pretty self-explanatory,
+        but it should be noted that these lists are added to the
+        <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SOURCES"><envar>$SOURCES</envar></link> construction variable as strings, NOT as
+        SCons File Nodes.  This is because they represent file names
+        to be added to the project file, not the source files used
+        to build the project file.
+      </para>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">
+        The above filename lists are all optional, although at least
+        one must be specified for the resulting project file to
+        be non-empty.
+      </para>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">
+        In addition to the above lists of values, the following values
+        may be specified:
+      </para>
+      <variablelist xmlns="http://www.scons.org/dbxsd/v1.0">
+        <varlistentry>
+          <term>target</term>
+          <listitem>
+            <para>
+              The name of the target <filename>.dsp</filename>
+              or <filename>.vcproj</filename> file.
+              The correct suffix for the version of Visual Studio
+              must be used, but the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-MSVSPROJECTSUFFIX"><envar>$MSVSPROJECTSUFFIX</envar></link>
+              construction variable will be defined to the correct
+              value (see example below).
+            </para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>variant</term>
+          <listitem>
+            <para>
+              The name of this particular variant. For Visual Studio 7
+              projects, this can also be a list of variant names. These
+              are typically things like "Debug" or "Release", but
+              really can be anything you want. For Visual Studio
+              7 projects, they may also specify a target platform
+              separated from the variant name by a <literal>|</literal>
+              (vertical pipe) character: <literal>Debug|Xbox</literal>.
+              The default target platform is Win32. Multiple calls
+              to <function xmlns="http://www.scons.org/dbxsd/v1.0">MSVSProject</function> with different variants are allowed;
+              all variants will be added to the project file with
+              their appropriate build targets and sources.
+            </para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>cmdargs</term>
+          <listitem>
+            <para>
+              Additional command line arguments
+              for the different variants. The number of
+              <literal>cmdargs</literal> entries must match the number
+              of <literal>variant</literal> entries, or be empty (not
+              specified). If you give only one, it will automatically
+              be propagated to all variants.
+            </para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>buildtarget</term>
+          <listitem>
+            <para>
+              An optional string, node, or list of strings
+              or nodes (one per build variant), to tell
+              the Visual Studio debugger what output target
+              to use in what build variant. The number of
+              <literal>buildtarget</literal> entries must match the
+              number of <literal>variant</literal> entries.
+            </para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>runfile</term>
+          <listitem>
+            <para>
+              The name of the file that Visual Studio 7 and
+              later will run and debug. This appears as the
+              value of the <literal>Output</literal> field in the
+              resulting Visual Studio project file. If this is not
+              specified, the default is the same as the specified
+              <literal>buildtarget</literal> value.
+            </para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">
+        Note that because <application xmlns="http://www.scons.org/dbxsd/v1.0">SCons</application> always executes its build commands
+        from the directory in which the <filename xmlns="http://www.scons.org/dbxsd/v1.0">SConstruct</filename> file is located,
+        if you generate a project file in a different directory
+        than the <filename xmlns="http://www.scons.org/dbxsd/v1.0">SConstruct</filename> directory, users will not be able to
+        double-click on the file name in compilation error messages
+        displayed in the Visual Studio console output window. This can
+        be remedied by adding the Visual C/C++ <literal>/FC</literal>
+        compiler option to the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-CCFLAGS"><envar>$CCFLAGS</envar></link> variable so that
+        the compiler will print the full path name of any files that
+        cause compilation errors.
+      </para>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">Example usage:</para>
+      <example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 barsrcs = ['bar.cpp']
 barincs = ['bar.h']
 barlocalincs = ['StdAfx.h']
 barresources = ['bar.rc','resource.h']
 barmisc = ['bar_readme.txt']
 
-dll = env.SharedLibrary(target = 'bar.dll',
-                        source = barsrcs)
+dll = env.SharedLibrary(target='bar.dll',
+                        source=barsrcs)
 buildtarget = [s for s in dll if str(s).endswith('dll')]
-env.MSVSProject(target = 'Bar' + env['MSVSPROJECTSUFFIX'],
-                srcs = barsrcs,
-                incs = barincs,
-                localincs = barlocalincs,
-                resources = barresources,
-                misc = barmisc,
-                buildtarget = buildtarget,
-                variant = 'Release')
-</example_commands>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">Starting with version 2.4 of
-SCons it's also possible to specify the optional argument
-<parameter>DebugSettings</parameter>, which creates files for debugging under
-Visual Studio:</para><variablelist xmlns="http://www.scons.org/dbxsd/v1.0">
-    <varlistentry>
-      <term>DebugSettings</term>
-
-      <listitem>
-        <para>A dictionary of debug settings that get written to the
-        <filename>.vcproj.user</filename> or the
-        <filename>.vcxproj.user</filename> file, depending on the version
-        installed. As it is done for cmdargs (see above), you can specify a
-        <parameter>DebugSettings</parameter> dictionary per variant. If you
-        give only one, it will be propagated to all variants.</para>
-      </listitem>
-    </varlistentry>
-  </variablelist><para xmlns="http://www.scons.org/dbxsd/v1.0">Currently, only Visual Studio v9.0 and Visual Studio
-version v11 are implemented, for other versions no file is generated. To
-generate the user file, you just need to add a
-<parameter>DebugSettings</parameter> dictionary to the environment with the
-right parameters for your MSVS version. If the dictionary is empty, or does
-not contain any good value, no file will be generated.</para><para xmlns="http://www.scons.org/dbxsd/v1.0">Following
-is a more contrived example, involving the setup of a project for variants and
-DebugSettings:</para><example_commands xmlns="http://www.scons.org/dbxsd/v1.0"># Assuming you store your defaults in a file
+env.MSVSProject(target='Bar' + env['MSVSPROJECTSUFFIX'],
+                srcs=barsrcs,
+                incs=barincs,
+                localincs=barlocalincs,
+                resources=barresources,
+                misc=barmisc,
+                buildtarget=buildtarget,
+                variant='Release')
+      </example_commands>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">
+        Starting with version 2.4 of SCons it is
+        also possible to specify the optional argument
+        <parameter>DebugSettings</parameter>, which creates files
+        for debugging under Visual Studio:
+      </para>
+      <variablelist xmlns="http://www.scons.org/dbxsd/v1.0">
+        <varlistentry>
+          <term>DebugSettings</term>
+          <listitem>
+            <para>
+              A dictionary of debug settings that get written
+              to the <filename>.vcproj.user</filename> or the
+              <filename>.vcxproj.user</filename> file, depending on the
+              version installed. As it is done for cmdargs (see above),
+              you can specify a <parameter>DebugSettings</parameter>
+              dictionary per variant. If you give only one, it will
+              be propagated to all variants.
+            </para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">
+        Currently, only Visual Studio v9.0 and Visual Studio
+        version v11 are implemented, for other versions no file
+        is generated. To generate the user file, you just need to
+        add a <parameter>DebugSettings</parameter> dictionary to the
+        environment with the right parameters for your MSVS version. If
+        the dictionary is empty, or does not contain any good value,
+        no file will be generated.
+      </para>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">
+        Following is a more contrived example, involving the setup
+        of a project for variants and DebugSettings:
+      </para>
+      <example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
+# Assuming you store your defaults in a file
 vars = Variables('variables.py')
 msvcver = vars.args.get('vc', '9')
 
@@ -986,7 +1032,7 @@ if msvcver == '9' or msvcver == '11':
   env = Environment(MSVC_VERSION=msvcver+'.0', MSVC_BATCH=False)
 else:
   env = Environment()
-    
+
 AddOption('--userfile', action='store_true', dest='userfile', default=False,
           help="Create Visual Studio Project user file")
 
@@ -1021,10 +1067,10 @@ V9DebugSettings = {
 }
 
 #
-# 2. Because there are a lot of different options depending on the Microsoft 
-# Visual Studio version, if you use more than one version you have to 
-# define a dictionary per version, for instance if you want to create a user 
-# file to launch a specific application for testing your dll with Microsoft 
+# 2. Because there are a lot of different options depending on the Microsoft
+# Visual Studio version, if you use more than one version you have to
+# define a dictionary per version, for instance if you want to create a user
+# file to launch a specific application for testing your dll with Microsoft
 # Visual Studio 2012 (v11):
 #
 V10DebugSettings = {
@@ -1056,7 +1102,7 @@ V10DebugSettings = {
 }
 
 #
-# 3. Select the dictionary you want depending on the version of visual Studio 
+# 3. Select the dictionary you want depending on the version of visual Studio
 # Files you want to generate.
 #
 if not env.GetOption('userfile'):
@@ -1065,7 +1111,7 @@ elif env.get('MSVC_VERSION', None) == '9.0':
     dbgSettings = V9DebugSettings
 elif env.get('MSVC_VERSION', None) == '11.0':
     dbgSettings = V10DebugSettings
-else:    
+else:
     dbgSettings = None
 
 #
@@ -1077,20 +1123,21 @@ barlocalincs = ['StdAfx.h']
 barresources = ['bar.rc','resource.h']
 barmisc = ['ReadMe.txt']
 
-dll = env.SharedLibrary(target = 'bar.dll',
-                        source = barsrcs)
-
-env.MSVSProject(target = 'Bar' + env['MSVSPROJECTSUFFIX'],
-                srcs = barsrcs,
-                incs = barincs,
-                localincs = barlocalincs,
-                resources = barresources,
-                misc = barmisc,
-                buildtarget = [dll[0]] * 2,
-                variant = ('Debug|Win32', 'Release|Win32'),
-                cmdargs = 'vc=%s' %  msvcver,
-                DebugSettings = (dbgSettings, {}))
-</example_commands> </listitem>
+dll = env.SharedLibrary(target='bar.dll',
+                        source=barsrcs)
+
+env.MSVSProject(target='Bar' + env['MSVSPROJECTSUFFIX'],
+                srcs=barsrcs,
+                incs=barincs,
+                localincs=barlocalincs,
+                resources=barresources,
+                misc=barmisc,
+                buildtarget=[dll[0]] * 2,
+                variant=('Debug|Win32', 'Release|Win32'),
+                cmdargs='vc=%s' %  msvcver,
+                DebugSettings=(dbgSettings, {}))
+      </example_commands>
+    </listitem>
   </varlistentry>
   <varlistentry id="b-MSVSSolution">
     <term>
@@ -1099,54 +1146,60 @@ env.MSVSProject(target = 'Bar' + env['MSVSPROJECTSUFFIX'],
     <term>
       <function>env.MSVSSolution()</function>
     </term>
-    <listitem> <para xmlns="http://www.scons.org/dbxsd/v1.0">Builds a Microsoft Visual Studio solution
-file. </para> <para xmlns="http://www.scons.org/dbxsd/v1.0">This builds a Visual Studio solution file, based on the
-version of Visual Studio that is configured (either the latest installed
-version, or the version specified by <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-MSVS_VERSION"><envar>$MSVS_VERSION</envar></link> in the
-construction environment). For Visual Studio 6, it will generate a
-<filename>.dsw</filename> file. For Visual Studio 7 (.NET), it will generate a
-<filename>.sln</filename> file. </para> <para xmlns="http://www.scons.org/dbxsd/v1.0"> The following values must be
-specified: </para><variablelist xmlns="http://www.scons.org/dbxsd/v1.0">
-    <varlistentry>
-      <term>target</term>
-
-      <listitem>
-        <para>The name of the target .dsw or .sln file. The correct
-        suffix for the version of Visual Studio must be used, but the value
-        <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-MSVSSOLUTIONSUFFIX"><envar>$MSVSSOLUTIONSUFFIX</envar></link> will be defined to the correct value (see
-        example below).</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>variant</term>
-
-      <listitem>
-        <para>The name of this particular variant, or a list of variant
-        names (the latter is only supported for MSVS 7 solutions). These are
-        typically things like "Debug" or "Release", but really can be anything
-        you want. For MSVS 7 they may also specify target platform, like this
-        "Debug|Xbox". Default platform is Win32.</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>projects</term>
-
-      <listitem>
-        <para>A list of project file names, or Project nodes returned by
-        calls to the <function xmlns="http://www.scons.org/dbxsd/v1.0">MSVSProject</function> Builder, to be placed into the solution
-        file. It should be noted that these file names are NOT added to the
-        $SOURCES environment variable in form of files, but rather as strings.
-        This is because they represent file names to be added to the solution
-        file, not the source files used to build the solution
-        file.</para>
-      </listitem>
-    </varlistentry>
-  </variablelist> <para xmlns="http://www.scons.org/dbxsd/v1.0"> Example Usage: </para> <example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
-env.MSVSSolution(target = 'Bar' + env['MSVSSOLUTIONSUFFIX'], projects = ['bar'
-+ env['MSVSPROJECTSUFFIX']], variant = 'Release')
-</example_commands></listitem>
+    <listitem>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">Builds a Microsoft Visual Studio solution file.</para>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">
+        This builds a Visual Studio solution file, based on the
+        version of Visual Studio that is configured (either the
+        latest installed version, or the version specified by
+        <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-MSVS_VERSION"><envar>$MSVS_VERSION</envar></link> in the construction environment). For
+        Visual Studio 6, it will generate a <filename>.dsw</filename>
+        file. For Visual Studio 7 (.NET), it will generate a
+        <filename>.sln</filename> file.
+      </para>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">The following values must be specified:</para>
+      <variablelist xmlns="http://www.scons.org/dbxsd/v1.0">
+        <varlistentry>
+          <term>target</term>
+          <listitem>
+            <para>
+              The name of the target .dsw or .sln file. The correct
+              suffix for the version of Visual Studio must be used,
+              but the value <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-MSVSSOLUTIONSUFFIX"><envar>$MSVSSOLUTIONSUFFIX</envar></link> will be
+              defined to the correct value (see example below).
+            </para>
+          </listitem>
+        </varlistentry> <varlistentry>
+          <term>variant</term> <listitem>
+            <para>
+              The name of this particular variant, or a list of
+              variant names (the latter is only supported for MSVS
+              7 solutions). These are typically things like "Debug"
+              or "Release", but really can be anything you want. For
+              MSVS 7 they may also specify target platform, like this
+              "Debug|Xbox". Default platform is Win32.
+            </para>
+          </listitem>
+        </varlistentry> <varlistentry>
+          <term>projects</term> <listitem>
+            <para>
+              A list of project file names, or Project nodes returned
+              by calls to the <function xmlns="http://www.scons.org/dbxsd/v1.0">MSVSProject</function> Builder, to be placed
+              into the solution file. It should be noted that these
+              file names are NOT added to the $SOURCES environment
+              variable in form of files, but rather as strings.
+              This is because they represent file names to be added
+              to the solution file, not the source files used to
+              build the solution file.
+            </para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">Example Usage:</para>
+      <example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
+env.MSVSSolution(target='Bar' + env['MSVSSOLUTIONSUFFIX'], projects=['bar' + env['MSVSPROJECTSUFFIX']], variant='Release')
+      </example_commands>
+    </listitem>
   </varlistentry>
   <varlistentry id="b-Object">
     <term>
@@ -1206,13 +1259,15 @@ the following packagers available:
 
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
  * msi - Microsoft Installer
- * rpm - Redhat Package Manger
+ * rpm - RPM Package Manger
  * ipkg - Itsy Package Management System
- * tarbz2 - compressed tar
- * targz - compressed tar
+ * tarbz2 - bzip2 compressed tar
+ * targz - gzip compressed tar
+ * tarxz - xz compressed tar
  * zip - zip file
- * src_tarbz2 - compressed tar source
- * src_targz - compressed tar source
+ * src_tarbz2 - bzip2 compressed tar source
+ * src_targz - gzip compressed tar source
+ * src_tarxz - xz compressed tar source
  * src_zip - zip file source
 </para>
 
@@ -2322,7 +2377,7 @@ and the result replaces the key.
 </para>
 
 <example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
-env = Environment(tools = ['default', 'textfile'])
+env = Environment(tools=['default'])
 
 env['prefix'] = '/usr/bin'
 script_dict = {'@prefix@': '/bin', '@exec_prefix@': '$prefix'}
@@ -2349,7 +2404,7 @@ env.Substfile('bar.in', SUBST_DICT = good_bar)
 
 # the SUBST_DICT may be in common (and not an override)
 substutions = {}
-subst = Environment(tools = ['textfile'], SUBST_DICT = substitutions)
+subst = Environment(tools=['textfile'], SUBST_DICT=substitutions)
 substitutions['@foo@'] = 'foo'
 subst['SUBST_DICT']['@bar@'] = 'bar'
 subst.Substfile('pgm1.c', [Value('#include "@foo@.h"'),
diff --git a/doc/generated/examples/addmethod_ex2_2.xml b/doc/generated/examples/addmethod_ex2_2.xml
index 15ae6e0..734da63 100644
--- a/doc/generated/examples/addmethod_ex2_2.xml
+++ b/doc/generated/examples/addmethod_ex2_2.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <screen xmlns="http://www.scons.org/dbxsd/v1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">C:\&gt;<userinput>scons -Q</userinput>
-rc /fores.res res.rc
+rc /nologo /fores.res res.rc
 cl /Fotest_stuff.obj /c test_stuff.c /nologo
 link /nologo /OUT:tests\test_stuff.exe test_stuff.obj res.res
 embedManifestExeCheck(target, source, env)
diff --git a/doc/generated/examples/builderswriting_MY_EMITTER_1.xml b/doc/generated/examples/builderswriting_MY_EMITTER_1.xml
index 440b105..0c17d0e 100644
--- a/doc/generated/examples/builderswriting_MY_EMITTER_1.xml
+++ b/doc/generated/examples/builderswriting_MY_EMITTER_1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <screen xmlns="http://www.scons.org/dbxsd/v1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
-my_command file1.input modify1.in &gt; file1.foo
-my_command file2.input modify2.in &gt; file2.foo
+./my_command file1.input modify1.in &gt; file1.foo
+./my_command file2.input modify2.in &gt; file2.foo
 </screen>
diff --git a/doc/generated/examples/caching_ex-random_1.xml b/doc/generated/examples/caching_ex-random_1.xml
index 6f64f8f..0a432e9 100644
--- a/doc/generated/examples/caching_ex-random_1.xml
+++ b/doc/generated/examples/caching_ex-random_1.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <screen xmlns="http://www.scons.org/dbxsd/v1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
-cc -o f2.o -c f2.c
-cc -o f4.o -c f4.c
-cc -o f3.o -c f3.c
 cc -o f5.o -c f5.c
+cc -o f3.o -c f3.c
+cc -o f2.o -c f2.c
 cc -o f1.o -c f1.c
+cc -o f4.o -c f4.c
 cc -o prog f1.o f2.o f3.o f4.o f5.o
 </screen>
diff --git a/doc/generated/examples/environments_ex3_1.xml b/doc/generated/examples/environments_ex3_1.xml
index 5071c6e..3262302 100644
--- a/doc/generated/examples/environments_ex3_1.xml
+++ b/doc/generated/examples/environments_ex3_1.xml
@@ -1,22 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <screen xmlns="http://www.scons.org/dbxsd/v1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
-UnicodeDecodeError: 'utf8' codec can't decode byte 0xc2 in position 547: invalid continuation byte:
-  File "/home/my/project/SConstruct", line 6:
-    dbg.Program('foo', 'foo.c')
-  File "bootstrap/src/engine/SCons/Environment.py", line 260:
-    return MethodWrapper.__call__(self, target, source, *args, **kw)
-  File "bootstrap/src/engine/SCons/Environment.py", line 224:
-    return self.method(*nargs, **kwargs)
-  File "bootstrap/src/engine/SCons/Builder.py", line 635:
-    return self._execute(env, target, source, OverrideWarner(kw), ekw)
-  File "bootstrap/src/engine/SCons/Builder.py", line 541:
-    source = self.src_builder_sources(env, source, overwarn)
-  File "bootstrap/src/engine/SCons/Builder.py", line 748:
-    tlist = bld._execute(env, None, [s], overwarn)
-  File "bootstrap/src/engine/SCons/Builder.py", line 557:
-    _node_errors(self, env, tlist, slist)
-  File "bootstrap/src/engine/SCons/Builder.py", line 303:
-    msg = "Two environments with different actions were specified for the same target: %s\n(action 1: %s)\n(action 2: %s)" % (t,t_contents.decode('utf-8'),contents.decode('utf-8'))
-  File "/usr/lib/python2.7/encodings/utf_8.py", line 16:
-    return codecs.utf_8_decode(input, errors, True)
+
+scons: *** Two environments with different actions were specified for the same target: foo.o
+File "/home/my/project/SConstruct", line 6, in &lt;module&gt;
 </screen>
diff --git a/doc/generated/examples/java_jar1_1.xml b/doc/generated/examples/java_jar1_1.xml
index daa3d1a..de93227 100644
--- a/doc/generated/examples/java_jar1_1.xml
+++ b/doc/generated/examples/java_jar1_1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <screen xmlns="http://www.scons.org/dbxsd/v1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 javac -d classes -sourcepath src src/Example1.java src/Example2.java src/Example3.java
-scons: *** [test.jar] Source `classes.class' not found, needed by target `test.jar'.
+jar cf test.jar classes
 </screen>
diff --git a/doc/generated/examples/mergeflags_MergeFlags1_1.xml b/doc/generated/examples/mergeflags_MergeFlags1_1.xml
index 8a0c336..8f18fd8 100644
--- a/doc/generated/examples/mergeflags_MergeFlags1_1.xml
+++ b/doc/generated/examples/mergeflags_MergeFlags1_1.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <screen xmlns="http://www.scons.org/dbxsd/v1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
-  File "/home/my/project/SConstruct", line 5
-
-    print env['CCFLAGS']
-
-            ^
-
-SyntaxError: invalid syntax
+['-option', '-O1', '-whatever', '-O3']
+scons: `.' is up to date.
 </screen>
diff --git a/doc/generated/examples/mergeflags_MergeFlags2_1.xml b/doc/generated/examples/mergeflags_MergeFlags2_1.xml
index 1312c47..8cae827 100644
--- a/doc/generated/examples/mergeflags_MergeFlags2_1.xml
+++ b/doc/generated/examples/mergeflags_MergeFlags2_1.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <screen xmlns="http://www.scons.org/dbxsd/v1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
-  File "/home/my/project/SConstruct", line 5
-
-    print env['CPPPATH']
-
-            ^
-
-SyntaxError: invalid syntax
+['/include', '/usr/local/include', '/usr/include', '/usr/opt/include']
+scons: `.' is up to date.
 </screen>
diff --git a/doc/generated/examples/mergeflags_MergeFlags3_1.xml b/doc/generated/examples/mergeflags_MergeFlags3_1.xml
index 8a0c336..d4f23d4 100644
--- a/doc/generated/examples/mergeflags_MergeFlags3_1.xml
+++ b/doc/generated/examples/mergeflags_MergeFlags3_1.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <screen xmlns="http://www.scons.org/dbxsd/v1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
-  File "/home/my/project/SConstruct", line 5
-
-    print env['CCFLAGS']
-
-            ^
-
-SyntaxError: invalid syntax
+['-option', '-O1', '-whatever', '-O3']
+['/include', '/usr/local/include', '/usr/include', '/usr/opt/include']
+scons: `.' is up to date.
 </screen>
diff --git a/doc/generated/examples/misc_FindFile1b_1.xml b/doc/generated/examples/misc_FindFile1b_1.xml
index 894b483..4b194ce 100644
--- a/doc/generated/examples/misc_FindFile1b_1.xml
+++ b/doc/generated/examples/misc_FindFile1b_1.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <screen xmlns="http://www.scons.org/dbxsd/v1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
-nonesuch.h:  None
-config.h:    config.h
-private.h:   src/include/private.h
-dist.h:      include/dist.h
+nonesuch.h  : None
+config.h    : config.h
+private.h   : src/include/private.h
+dist.h      : include/dist.h
 scons: `.' is up to date.
 </screen>
diff --git a/doc/generated/examples/parseflags_ex1_1.xml b/doc/generated/examples/parseflags_ex1_1.xml
index 79cdad6..d6e4d96 100644
--- a/doc/generated/examples/parseflags_ex1_1.xml
+++ b/doc/generated/examples/parseflags_ex1_1.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <screen xmlns="http://www.scons.org/dbxsd/v1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
-  File "/home/my/project/SConstruct", line 5
-
-    print k, v
-
-          ^
-
-SyntaxError: invalid syntax
+CPPPATH ['/opt/include']
+LIBPATH ['/opt/lib']
+LIBS ['foo']
+cc -o f1.o -c -I/opt/include f1.c
+cc -o f1 f1.o -L/opt/lib -lfoo
 </screen>
diff --git a/doc/generated/examples/parseflags_ex1_2.xml b/doc/generated/examples/parseflags_ex1_2.xml
index b9c9cd2..4c115d0 100644
--- a/doc/generated/examples/parseflags_ex1_2.xml
+++ b/doc/generated/examples/parseflags_ex1_2.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <screen xmlns="http://www.scons.org/dbxsd/v1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">C:\&gt;<userinput>scons -Q</userinput>
-  File "/home/my/project/SConstruct", line 5
-
-    print k, v
-
-          ^
-
-SyntaxError: invalid syntax
+CPPPATH ['/opt/include']
+LIBPATH ['/opt/lib']
+LIBS ['foo']
+cl /Fof1.obj /c f1.c /nologo /I\opt\include
+link /nologo /OUT:f1.exe /LIBPATH:\opt\lib foo.lib f1.obj
+embedManifestExeCheck(target, source, env)
 </screen>
diff --git a/doc/generated/examples/parseflags_ex2_1.xml b/doc/generated/examples/parseflags_ex2_1.xml
index 79cdad6..da84ee3 100644
--- a/doc/generated/examples/parseflags_ex2_1.xml
+++ b/doc/generated/examples/parseflags_ex2_1.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <screen xmlns="http://www.scons.org/dbxsd/v1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
-  File "/home/my/project/SConstruct", line 5
-
-    print k, v
-
-          ^
-
-SyntaxError: invalid syntax
+CCFLAGS -whatever
+cc -o f1.o -c -whatever f1.c
+cc -o f1 f1.o
 </screen>
diff --git a/doc/generated/examples/parseflags_ex3_1.xml b/doc/generated/examples/parseflags_ex3_1.xml
index 79cdad6..d6e4d96 100644
--- a/doc/generated/examples/parseflags_ex3_1.xml
+++ b/doc/generated/examples/parseflags_ex3_1.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <screen xmlns="http://www.scons.org/dbxsd/v1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
-  File "/home/my/project/SConstruct", line 5
-
-    print k, v
-
-          ^
-
-SyntaxError: invalid syntax
+CPPPATH ['/opt/include']
+LIBPATH ['/opt/lib']
+LIBS ['foo']
+cc -o f1.o -c -I/opt/include f1.c
+cc -o f1 f1.o -L/opt/lib -lfoo
 </screen>
diff --git a/doc/generated/examples/parseflags_ex4_1.xml b/doc/generated/examples/parseflags_ex4_1.xml
index 79cdad6..d6e4d96 100644
--- a/doc/generated/examples/parseflags_ex4_1.xml
+++ b/doc/generated/examples/parseflags_ex4_1.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <screen xmlns="http://www.scons.org/dbxsd/v1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
-  File "/home/my/project/SConstruct", line 5
-
-    print k, v
-
-          ^
-
-SyntaxError: invalid syntax
+CPPPATH ['/opt/include']
+LIBPATH ['/opt/lib']
+LIBS ['foo']
+cc -o f1.o -c -I/opt/include f1.c
+cc -o f1 f1.o -L/opt/lib -lfoo
 </screen>
diff --git a/doc/generated/examples/troubleshoot_Dump_1.xml b/doc/generated/examples/troubleshoot_Dump_1.xml
index 281fed7..99d1399 100644
--- a/doc/generated/examples/troubleshoot_Dump_1.xml
+++ b/doc/generated/examples/troubleshoot_Dump_1.xml
@@ -1,11 +1,79 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <screen xmlns="http://www.scons.org/dbxsd/v1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons</userinput>
 scons: Reading SConscript files ...
-  File "/home/my/project/SConstruct", line 2
-
-    print env.Dump()
-
-            ^
-
-SyntaxError: invalid syntax
+{ 'BUILDERS': {'_InternalInstall': &lt;function InstallBuilderWrapper at 0x700000&amp;gt;, '_InternalInstallVersionedLib': &lt;function InstallVersionedBuilderWrapper at 0x700000&amp;gt;, '_InternalInstallAs': &lt;function InstallAsBuilderWrapper at 0x700000&amp;gt;},
+  'CONFIGUREDIR': '#/.sconf_temp',
+  'CONFIGURELOG': '#/config.log',
+  'CPPSUFFIXES': [ '.c',
+                   '.C',
+                   '.cxx',
+                   '.cpp',
+                   '.c++',
+                   '.cc',
+                   '.h',
+                   '.H',
+                   '.hxx',
+                   '.hpp',
+                   '.hh',
+                   '.F',
+                   '.fpp',
+                   '.FPP',
+                   '.m',
+                   '.mm',
+                   '.S',
+                   '.spp',
+                   '.SPP',
+                   '.sx'],
+  'DSUFFIXES': ['.d'],
+  'Dir': &lt;SCons.Defaults.Variable_Method_Caller object at 0x700000&amp;gt;,
+  'Dirs': &lt;SCons.Defaults.Variable_Method_Caller object at 0x700000&amp;gt;,
+  'ENV': { 'PATH': '/usr/local/bin:/opt/bin:/bin:/usr/bin'},
+  'ESCAPE': &lt;function escape at 0x700000&amp;gt;,
+  'File': &lt;SCons.Defaults.Variable_Method_Caller object at 0x700000&amp;gt;,
+  'HOST_ARCH': None,
+  'HOST_OS': None,
+  'IDLSUFFIXES': ['.idl', '.IDL'],
+  'INSTALL': &lt;function copyFunc at 0x700000&amp;gt;,
+  'INSTALLVERSIONEDLIB': &lt;function copyFuncVersionedLib at 0x700000&amp;gt;,
+  'LIBPREFIX': 'lib',
+  'LIBPREFIXES': ['$LIBPREFIX'],
+  'LIBSUFFIX': '.a',
+  'LIBSUFFIXES': ['$LIBSUFFIX', '$SHLIBSUFFIX'],
+  'MAXLINELENGTH': 128072,
+  'OBJPREFIX': '',
+  'OBJSUFFIX': '.o',
+  'PLATFORM': 'posix',
+  'PROGPREFIX': '',
+  'PROGSUFFIX': '',
+  'PSPAWN': &lt;function piped_env_spawn at 0x700000&amp;gt;,
+  'RDirs': &lt;SCons.Defaults.Variable_Method_Caller object at 0x700000&amp;gt;,
+  'SCANNERS': [&lt;SCons.Scanner.Base object at 0x700000&amp;gt;],
+  'SHELL': 'sh',
+  'SHLIBPREFIX': '$LIBPREFIX',
+  'SHLIBSUFFIX': '.so',
+  'SHOBJPREFIX': '$OBJPREFIX',
+  'SHOBJSUFFIX': '$OBJSUFFIX',
+  'SPAWN': &lt;function subprocess_spawn at 0x700000&amp;gt;,
+  'TARGET_ARCH': None,
+  'TARGET_OS': None,
+  'TEMPFILE': &lt;class 'SCons.Platform.TempFileMunge'&gt;,
+  'TEMPFILEPREFIX': '@',
+  'TOOLS': ['install', 'install'],
+  '_CPPDEFFLAGS': '${_defines(CPPDEFPREFIX, CPPDEFINES, CPPDEFSUFFIX, __env__)}',
+  '_CPPINCFLAGS': '$( ${_concat(INCPREFIX, CPPPATH, INCSUFFIX, __env__, RDirs, TARGET, SOURCE)} $)',
+  '_LIBDIRFLAGS': '$( ${_concat(LIBDIRPREFIX, LIBPATH, LIBDIRSUFFIX, __env__, RDirs, TARGET, SOURCE)} $)',
+  '_LIBFLAGS': '${_concat(LIBLINKPREFIX, LIBS, LIBLINKSUFFIX, __env__)}',
+  '__DRPATH': '$_DRPATH',
+  '__DSHLIBVERSIONFLAGS': '${__libversionflags(__env__,"DSHLIBVERSION","_DSHLIBVERSIONFLAGS")}',
+  '__LDMODULEVERSIONFLAGS': '${__libversionflags(__env__,"LDMODULEVERSION","_LDMODULEVERSIONFLAGS")}',
+  '__RPATH': '$_RPATH',
+  '__SHLIBVERSIONFLAGS': '${__libversionflags(__env__,"SHLIBVERSION","_SHLIBVERSIONFLAGS")}',
+  '__libversionflags': &lt;function __libversionflags at 0x700000&amp;gt;,
+  '_concat': &lt;function _concat at 0x700000&amp;gt;,
+  '_defines': &lt;function _defines at 0x700000&amp;gt;,
+  '_stripixes': &lt;function _stripixes at 0x700000&amp;gt;}
+scons: done reading SConscript files.
+scons: Building targets ...
+scons: `.' is up to date.
+scons: done building targets.
 </screen>
diff --git a/doc/generated/examples/troubleshoot_Dump_2.xml b/doc/generated/examples/troubleshoot_Dump_2.xml
index 78cd84b..e8e0960 100644
--- a/doc/generated/examples/troubleshoot_Dump_2.xml
+++ b/doc/generated/examples/troubleshoot_Dump_2.xml
@@ -1,11 +1,112 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <screen xmlns="http://www.scons.org/dbxsd/v1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">C:\&gt;<userinput>scons</userinput>
 scons: Reading SConscript files ...
-  File "/home/my/project/SConstruct", line 2
-
-    print env.Dump()
-
-            ^
-
-SyntaxError: invalid syntax
+{ 'BUILDERS': {'_InternalInstallVersionedLib': &lt;function InstallVersionedBuilderWrapper at 0x700000&amp;gt;, '_InternalInstall': &lt;function InstallBuilderWrapper at 0x700000&amp;gt;, 'Object': &lt;SCons.Builder.CompositeBuilder object at 0x700000&amp;gt;, 'PCH': &lt;SCons.Builder.BuilderBase object at 0x700000&amp;gt;, 'RES': &lt;SCons.Builder.BuilderBase object at 0x700000&amp;gt;, 'SharedObject': &lt;SCons.Builder.CompositeBuilder object at 0x700000&amp;gt;, 'StaticObject': &lt;SCons.Builder.CompositeBuilder object at 0x700000&amp;gt;, '_InternalInstallAs': &lt;function InstallAsBuilderWrapper at 0x700000&amp;gt;},
+  'CC': 'cl',
+  'CCCOM': &lt;SCons.Action.FunctionAction object at 0x700000&amp;gt;,
+  'CCFLAGS': ['/nologo'],
+  'CCPCHFLAGS': ['${(PCH and "/Yu%s \\"/Fp%s\\""%(PCHSTOP or "",File(PCH))) or ""}'],
+  'CCPDBFLAGS': ['${(PDB and "/Z7") or ""}'],
+  'CFILESUFFIX': '.c',
+  'CFLAGS': [],
+  'CONFIGUREDIR': '#/.sconf_temp',
+  'CONFIGURELOG': '#/config.log',
+  'CPPDEFPREFIX': '/D',
+  'CPPDEFSUFFIX': '',
+  'CPPSUFFIXES': [ '.c',
+                   '.C',
+                   '.cxx',
+                   '.cpp',
+                   '.c++',
+                   '.cc',
+                   '.h',
+                   '.H',
+                   '.hxx',
+                   '.hpp',
+                   '.hh',
+                   '.F',
+                   '.fpp',
+                   '.FPP',
+                   '.m',
+                   '.mm',
+                   '.S',
+                   '.spp',
+                   '.SPP',
+                   '.sx'],
+  'CXX': '$CC',
+  'CXXCOM': '${TEMPFILE("$CXX $_MSVC_OUTPUT_FLAG /c $CHANGED_SOURCES $CXXFLAGS $CCFLAGS $_CCCOMCOM","$CXXCOMSTR")}',
+  'CXXFILESUFFIX': '.cc',
+  'CXXFLAGS': ['$(', '/TP', '$)'],
+  'DSUFFIXES': ['.d'],
+  'Dir': &lt;SCons.Defaults.Variable_Method_Caller object at 0x700000&amp;gt;,
+  'Dirs': &lt;SCons.Defaults.Variable_Method_Caller object at 0x700000&amp;gt;,
+  'ENV': { 'PATH': 'C:\\WINDOWS\\System32',
+           'PATHEXT': '.COM;.EXE;.BAT;.CMD',
+           'SystemRoot': 'C:\\WINDOWS'},
+  'ESCAPE': &lt;function escape at 0x700000&amp;gt;,
+  'File': &lt;SCons.Defaults.Variable_Method_Caller object at 0x700000&amp;gt;,
+  'HOST_ARCH': '',
+  'HOST_OS': 'win32',
+  'IDLSUFFIXES': ['.idl', '.IDL'],
+  'INCPREFIX': '/I',
+  'INCSUFFIX': '',
+  'INSTALL': &lt;function copyFunc at 0x700000&amp;gt;,
+  'INSTALLVERSIONEDLIB': &lt;function copyFuncVersionedLib at 0x700000&amp;gt;,
+  'LEXUNISTD': ['--nounistd'],
+  'LIBPREFIX': '',
+  'LIBPREFIXES': ['$LIBPREFIX'],
+  'LIBSUFFIX': '.lib',
+  'LIBSUFFIXES': ['$LIBSUFFIX'],
+  'MAXLINELENGTH': 2048,
+  'MSVC_SETUP_RUN': True,
+  'OBJPREFIX': '',
+  'OBJSUFFIX': '.obj',
+  'PCHCOM': '$CXX /Fo${TARGETS[1]} $CXXFLAGS $CCFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS /c $SOURCES /Yc$PCHSTOP /Fp${TARGETS[0]} $CCPDBFLAGS $PCHPDBFLAGS',
+  'PCHPDBFLAGS': ['${(PDB and "/Yd") or ""}'],
+  'PLATFORM': 'win32',
+  'PROGPREFIX': '',
+  'PROGSUFFIX': '.exe',
+  'PSPAWN': &lt;function piped_spawn at 0x700000&amp;gt;,
+  'RC': 'rc',
+  'RCCOM': &lt;SCons.Action.FunctionAction object at 0x700000&amp;gt;,
+  'RCFLAGS': ['/nologo'],
+  'RCSUFFIXES': ['.rc', '.rc2'],
+  'RDirs': &lt;SCons.Defaults.Variable_Method_Caller object at 0x700000&amp;gt;,
+  'SCANNERS': [&lt;SCons.Scanner.Base object at 0x700000&amp;gt;],
+  'SHCC': '$CC',
+  'SHCCCOM': &lt;SCons.Action.FunctionAction object at 0x700000&amp;gt;,
+  'SHCCFLAGS': ['$CCFLAGS'],
+  'SHCFLAGS': ['$CFLAGS'],
+  'SHCXX': '$CXX',
+  'SHCXXCOM': '${TEMPFILE("$SHCXX $_MSVC_OUTPUT_FLAG /c $CHANGED_SOURCES $SHCXXFLAGS $SHCCFLAGS $_CCCOMCOM","$SHCXXCOMSTR")}',
+  'SHCXXFLAGS': ['$CXXFLAGS'],
+  'SHELL': None,
+  'SHLIBPREFIX': '',
+  'SHLIBSUFFIX': '.dll',
+  'SHOBJPREFIX': '$OBJPREFIX',
+  'SHOBJSUFFIX': '$OBJSUFFIX',
+  'SPAWN': &lt;function spawn at 0x700000&amp;gt;,
+  'STATIC_AND_SHARED_OBJECTS_ARE_THE_SAME': 1,
+  'TARGET_ARCH': None,
+  'TARGET_OS': None,
+  'TEMPFILE': &lt;class 'SCons.Platform.TempFileMunge'&gt;,
+  'TEMPFILEPREFIX': '@',
+  'TOOLS': ['msvc', 'install', 'install'],
+  '_CCCOMCOM': '$CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS $CCPCHFLAGS $CCPDBFLAGS',
+  '_CPPDEFFLAGS': '${_defines(CPPDEFPREFIX, CPPDEFINES, CPPDEFSUFFIX, __env__)}',
+  '_CPPINCFLAGS': '$( ${_concat(INCPREFIX, CPPPATH, INCSUFFIX, __env__, RDirs, TARGET, SOURCE)} $)',
+  '_LIBDIRFLAGS': '$( ${_concat(LIBDIRPREFIX, LIBPATH, LIBDIRSUFFIX, __env__, RDirs, TARGET, SOURCE)} $)',
+  '_LIBFLAGS': '${_concat(LIBLINKPREFIX, LIBS, LIBLINKSUFFIX, __env__)}',
+  '_MSVC_OUTPUT_FLAG': &lt;function msvc_output_flag at 0x700000&amp;gt;,
+  '__DSHLIBVERSIONFLAGS': '${__libversionflags(__env__,"DSHLIBVERSION","_DSHLIBVERSIONFLAGS")}',
+  '__LDMODULEVERSIONFLAGS': '${__libversionflags(__env__,"LDMODULEVERSION","_LDMODULEVERSIONFLAGS")}',
+  '__SHLIBVERSIONFLAGS': '${__libversionflags(__env__,"SHLIBVERSION","_SHLIBVERSIONFLAGS")}',
+  '__libversionflags': &lt;function __libversionflags at 0x700000&amp;gt;,
+  '_concat': &lt;function _concat at 0x700000&amp;gt;,
+  '_defines': &lt;function _defines at 0x700000&amp;gt;,
+  '_stripixes': &lt;function _stripixes at 0x700000&amp;gt;}
+scons: done reading SConscript files.
+scons: Building targets ...
+scons: `.' is up to date.
+scons: done building targets.
 </screen>
diff --git a/doc/generated/examples/troubleshoot_Dump_ENV_1.xml b/doc/generated/examples/troubleshoot_Dump_ENV_1.xml
index bd674a6..786491f 100644
--- a/doc/generated/examples/troubleshoot_Dump_ENV_1.xml
+++ b/doc/generated/examples/troubleshoot_Dump_ENV_1.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <screen xmlns="http://www.scons.org/dbxsd/v1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons</userinput>
 scons: Reading SConscript files ...
-  File "/home/my/project/SConstruct", line 2
-
-    print env.Dump('ENV')
-
-            ^
-
-SyntaxError: invalid syntax
+{ 'PATH': '/usr/local/bin:/opt/bin:/bin:/usr/bin'}
+scons: done reading SConscript files.
+scons: Building targets ...
+scons: `.' is up to date.
+scons: done building targets.
 </screen>
diff --git a/doc/generated/examples/troubleshoot_Dump_ENV_2.xml b/doc/generated/examples/troubleshoot_Dump_ENV_2.xml
index c9f9258..b91c31c 100644
--- a/doc/generated/examples/troubleshoot_Dump_ENV_2.xml
+++ b/doc/generated/examples/troubleshoot_Dump_ENV_2.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <screen xmlns="http://www.scons.org/dbxsd/v1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">C:\&gt;<userinput>scons</userinput>
 scons: Reading SConscript files ...
-  File "/home/my/project/SConstruct", line 2
-
-    print env.Dump('ENV')
-
-            ^
-
-SyntaxError: invalid syntax
+{ 'PATH': 'C:\\WINDOWS\\System32:/usr/bin',
+  'PATHEXT': '.COM;.EXE;.BAT;.CMD',
+  'SystemRoot': 'C:\\WINDOWS'}
+scons: done reading SConscript files.
+scons: Building targets ...
+scons: `.' is up to date.
+scons: done building targets.
 </screen>
diff --git a/doc/generated/examples/troubleshoot_explain1_3.xml b/doc/generated/examples/troubleshoot_explain1_3.xml
index 0ee52a9..ebc13f8 100644
--- a/doc/generated/examples/troubleshoot_explain1_3.xml
+++ b/doc/generated/examples/troubleshoot_explain1_3.xml
@@ -3,5 +3,5 @@
 cp file.in file.oout
 
 scons: warning: Cannot find target file.out after building
-File "/home/bdbaddog/devel/scons/as_scons/src/script/scons.py", line 201, in &lt;module&gt;
+File "/home/bdeegan/devel/scons/git/as_scons/src/script/scons.py", line 204, in &lt;module&gt;
 </screen>
diff --git a/doc/generated/examples/troubleshoot_stacktrace_2.xml b/doc/generated/examples/troubleshoot_stacktrace_2.xml
index 4b55f0d..76cfc1a 100644
--- a/doc/generated/examples/troubleshoot_stacktrace_2.xml
+++ b/doc/generated/examples/troubleshoot_stacktrace_2.xml
@@ -4,7 +4,7 @@ scons: *** [prog.o] Source `prog.c' not found, needed by target `prog.o'.
 scons: internal stack trace:
   File "bootstrap/src/engine/SCons/Job.py", line 199, in start
     task.prepare()
-  File "bootstrap/src/engine/SCons/Script/Main.py", line 175, in prepare
+  File "bootstrap/src/engine/SCons/Script/Main.py", line 177, in prepare
     return SCons.Taskmaster.OutOfDateTask.prepare(self)
   File "bootstrap/src/engine/SCons/Taskmaster.py", line 198, in prepare
     executor.prepare()
diff --git a/doc/generated/functions.gen b/doc/generated/functions.gen
index 79a83c6..9fc9d4b 100644
--- a/doc/generated/functions.gen
+++ b/doc/generated/functions.gen
@@ -1197,6 +1197,10 @@ Multiple calls to
 <function xmlns="http://www.scons.org/dbxsd/v1.0">Default</function>
 are legal,
 and add to the list of default targets.
+As noted above, both forms of this call affect the
+same global list of default targets; the
+construction environment method applies
+construction variable expansion to the targets.
 </para>
 
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
@@ -3523,16 +3527,16 @@ below, for a complete explanation of the arguments and behavior.
   </varlistentry>
   <varlistentry id="f-SConscript">
     <term>
-      <literal>SConscript(scripts, [exports, variant_dir, duplicate])</literal>
+      <literal>SConscript(scripts, [exports, variant_dir, duplicate, must_exist])</literal>
     </term>
     <term>
-      <literal>env.SConscript(scripts, [exports, variant_dir, duplicate])</literal>
+      <literal>env.SConscript(scripts, [exports, variant_dir, duplicate, must_exist])</literal>
     </term>
     <term>
-      <literal>SConscript(dirs=subdirs, [name=script, exports, variant_dir, duplicate])</literal>
+      <literal>SConscript(dirs=subdirs, [name=script, exports, variant_dir, duplicate, must_exist])</literal>
     </term>
     <term>
-      <literal>env.SConscript(dirs=subdirs, [name=script, exports, variant_dir, duplicate])</literal>
+      <literal>env.SConscript(dirs=subdirs, [name=script, exports, variant_dir, duplicate, must_exist])</literal>
     </term>
     <listitem>
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
@@ -3734,6 +3738,17 @@ TODO??? SConscript('build/SConscript', src_dir='src')
 </para>
 
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
+The optional
+<varname>must_exist</varname>
+argument, if true, causes an exception to be raised if a requested
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">SConscript</filename> file is not found. The current default is false,
+causing only a warning to be omitted, but this behavior is deprecated.
+For scripts which truly intend to be optional, transition to
+explicty supplying
+<literal>must_exist=False</literal> to the call.
+</para>
+
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Here are some composite examples:
 </para>
 
diff --git a/doc/generated/tools.gen b/doc/generated/tools.gen
index f858aa4..be717e3 100644
--- a/doc/generated/tools.gen
+++ b/doc/generated/tools.gen
@@ -57,11 +57,11 @@ Sets construction variables for the IBM Visual Age linker.
   <varlistentry id="t-applelink">
     <term>applelink</term>
     <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-Sets construction variables for the Apple linker
-(similar to the GNU linker).
-</para>
-<para>Sets:  &cv-link-FRAMEWORKPATHPREFIX;, &cv-link-LDMODULECOM;, &cv-link-LDMODULEFLAGS;, &cv-link-LDMODULEPREFIX;, &cv-link-LDMODULESUFFIX;, &cv-link-LINKCOM;, &cv-link-SHLINKCOM;, &cv-link-SHLINKFLAGS;, &cv-link-_FRAMEWORKPATH;, &cv-link-_FRAMEWORKS;.</para><para>Uses:  &cv-link-FRAMEWORKSFLAGS;.</para></listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                Sets construction variables for the Apple linker
+                (similar to the GNU linker).
+            </para>
+        <para>Sets:  &cv-link-APPLELINK_COMPATIBILITY_VERSION;, &cv-link-APPLELINK_CURRENT_VERSION;, &cv-link-APPLELINK_NO_COMPATIBILITY_VERSION;, &cv-link-APPLELINK_NO_CURRENT_VERSION;, &cv-link-FRAMEWORKPATHPREFIX;, &cv-link-LDMODULECOM;, &cv-link-LDMODULEFLAGS;, &cv-link-LDMODULEPREFIX;, &cv-link-LDMODULESUFFIX;, &cv-link-LINKCOM;, &cv-link-SHLINKCOM;, &cv-link-SHLINKFLAGS;, &cv-link-_APPLELINK_COMPATIBILITY_VERSION;, &cv-link-_APPLELINK_CURRENT_VERSION;, &cv-link-_FRAMEWORKPATH;, &cv-link-_FRAMEWORKS;.</para><para>Uses:  &cv-link-FRAMEWORKSFLAGS;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-ar">
     <term>ar</term>
@@ -586,10 +586,10 @@ Sets construction variables for the <application xmlns="http://www.scons.org/dbx
   <varlistentry id="t-javac">
     <term>javac</term>
     <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-Sets construction variables for the <application xmlns="http://www.scons.org/dbxsd/v1.0">javac</application> compiler.
-</para>
-<para>Sets:  &cv-link-JAVABOOTCLASSPATH;, &cv-link-JAVAC;, &cv-link-JAVACCOM;, &cv-link-JAVACFLAGS;, &cv-link-JAVACLASSPATH;, &cv-link-JAVACLASSSUFFIX;, &cv-link-JAVASOURCEPATH;, &cv-link-JAVASUFFIX;.</para><para>Uses:  &cv-link-JAVACCOMSTR;.</para></listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                Sets construction variables for the <application xmlns="http://www.scons.org/dbxsd/v1.0">javac</application> compiler.
+            </para>
+        <para>Sets:  &cv-link-JAVABOOTCLASSPATH;, &cv-link-JAVAC;, &cv-link-JAVACCOM;, &cv-link-JAVACFLAGS;, &cv-link-JAVACLASSPATH;, &cv-link-JAVACLASSSUFFIX;, &cv-link-JAVAINCLUDES;, &cv-link-JAVASOURCEPATH;, &cv-link-JAVASUFFIX;.</para><para>Uses:  &cv-link-JAVACCOMSTR;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-javah">
     <term>javah</term>
@@ -621,7 +621,7 @@ Sets construction variables for the D language compiler LDC2.
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
 Sets construction variables for the <application xmlns="http://www.scons.org/dbxsd/v1.0">lex</application> lexical analyser.
 </para>
-<para>Sets:  &cv-link-LEX;, &cv-link-LEXCOM;, &cv-link-LEXFLAGS;.</para><para>Uses:  &cv-link-LEXCOMSTR;.</para></listitem>
+<para>Sets:  &cv-link-LEX;, &cv-link-LEXCOM;, &cv-link-LEXFLAGS;, &cv-link-LEXUNISTD;.</para><para>Uses:  &cv-link-LEXCOMSTR;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-link">
     <term>link</term>
@@ -750,8 +750,9 @@ Sets construction variables for the Microsoft Visual C/C++ compiler.
   </varlistentry>
   <varlistentry id="t-msvs">
     <term>msvs</term>
-    <listitem> <para xmlns="http://www.scons.org/dbxsd/v1.0">
-Sets construction variables for Microsoft Visual Studio. </para> <para>Sets:  &cv-link-MSVSBUILDCOM;, &cv-link-MSVSCLEANCOM;, &cv-link-MSVSENCODING;, &cv-link-MSVSPROJECTCOM;, &cv-link-MSVSREBUILDCOM;, &cv-link-MSVSSCONS;, &cv-link-MSVSSCONSCOM;, &cv-link-MSVSSCONSCRIPT;, &cv-link-MSVSSCONSFLAGS;, &cv-link-MSVSSOLUTIONCOM;.</para></listitem>
+    <listitem>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">Sets construction variables for Microsoft Visual Studio.</para>
+    <para>Sets:  &cv-link-MSVSBUILDCOM;, &cv-link-MSVSCLEANCOM;, &cv-link-MSVSENCODING;, &cv-link-MSVSPROJECTCOM;, &cv-link-MSVSREBUILDCOM;, &cv-link-MSVSSCONS;, &cv-link-MSVSSCONSCOM;, &cv-link-MSVSSCONSCRIPT;, &cv-link-MSVSSCONSFLAGS;, &cv-link-MSVSSOLUTIONCOM;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-mwcc">
     <term>mwcc</term>
@@ -778,19 +779,19 @@ Sets construction variables for the
 </para>
 <para>Sets:  &cv-link-AS;, &cv-link-ASCOM;, &cv-link-ASFLAGS;, &cv-link-ASPPCOM;, &cv-link-ASPPFLAGS;.</para><para>Uses:  &cv-link-ASCOMSTR;, &cv-link-ASPPCOMSTR;.</para></listitem>
   </varlistentry>
-  <varlistentry id="t-Packaging">
-    <term>Packaging</term>
+  <varlistentry id="t-packaging">
+    <term>packaging</term>
     <listitem>
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
-Sets construction variables for the <function xmlns="http://www.scons.org/dbxsd/v1.0">Package</function> Builder.
+A framework for building binary and source packages.
 </para>
 </listitem>
   </varlistentry>
-  <varlistentry id="t-packaging">
-    <term>packaging</term>
+  <varlistentry id="t-Packaging">
+    <term>Packaging</term>
     <listitem>
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
-A framework for building binary and source packages.
+Sets construction variables for the <function xmlns="http://www.scons.org/dbxsd/v1.0">Package</function> Builder.
 </para>
 </listitem>
   </varlistentry>
diff --git a/doc/generated/tools.mod b/doc/generated/tools.mod
index 1209d74..f9bc1d7 100644
--- a/doc/generated/tools.mod
+++ b/doc/generated/tools.mod
@@ -78,8 +78,8 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE.  DO NOT EDIT.
 <!ENTITY t-mwcc "<literal xmlns='http://www.scons.org/dbxsd/v1.0'>mwcc</literal>">
 <!ENTITY t-mwld "<literal xmlns='http://www.scons.org/dbxsd/v1.0'>mwld</literal>">
 <!ENTITY t-nasm "<literal xmlns='http://www.scons.org/dbxsd/v1.0'>nasm</literal>">
-<!ENTITY t-Packaging "<literal xmlns='http://www.scons.org/dbxsd/v1.0'>Packaging</literal>">
 <!ENTITY t-packaging "<literal xmlns='http://www.scons.org/dbxsd/v1.0'>packaging</literal>">
+<!ENTITY t-Packaging "<literal xmlns='http://www.scons.org/dbxsd/v1.0'>Packaging</literal>">
 <!ENTITY t-pdf "<literal xmlns='http://www.scons.org/dbxsd/v1.0'>pdf</literal>">
 <!ENTITY t-pdflatex "<literal xmlns='http://www.scons.org/dbxsd/v1.0'>pdflatex</literal>">
 <!ENTITY t-pdftex "<literal xmlns='http://www.scons.org/dbxsd/v1.0'>pdftex</literal>">
@@ -186,8 +186,8 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE.  DO NOT EDIT.
 <!ENTITY t-link-mwcc "<link linkend='t-mwcc' xmlns='http://www.scons.org/dbxsd/v1.0'><literal>mwcc</literal></link>">
 <!ENTITY t-link-mwld "<link linkend='t-mwld' xmlns='http://www.scons.org/dbxsd/v1.0'><literal>mwld</literal></link>">
 <!ENTITY t-link-nasm "<link linkend='t-nasm' xmlns='http://www.scons.org/dbxsd/v1.0'><literal>nasm</literal></link>">
-<!ENTITY t-link-Packaging "<link linkend='t-Packaging' xmlns='http://www.scons.org/dbxsd/v1.0'><literal>Packaging</literal></link>">
 <!ENTITY t-link-packaging "<link linkend='t-packaging' xmlns='http://www.scons.org/dbxsd/v1.0'><literal>packaging</literal></link>">
+<!ENTITY t-link-Packaging "<link linkend='t-Packaging' xmlns='http://www.scons.org/dbxsd/v1.0'><literal>Packaging</literal></link>">
 <!ENTITY t-link-pdf "<link linkend='t-pdf' xmlns='http://www.scons.org/dbxsd/v1.0'><literal>pdf</literal></link>">
 <!ENTITY t-link-pdflatex "<link linkend='t-pdflatex' xmlns='http://www.scons.org/dbxsd/v1.0'><literal>pdflatex</literal></link>">
 <!ENTITY t-link-pdftex "<link linkend='t-pdftex' xmlns='http://www.scons.org/dbxsd/v1.0'><literal>pdftex</literal></link>">
diff --git a/doc/generated/variables.gen b/doc/generated/variables.gen
index 8a8dc99..c7048b4 100644
--- a/doc/generated/variables.gen
+++ b/doc/generated/variables.gen
@@ -31,6 +31,94 @@ if <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHLIBVERSION"><enva
 </para>
 </listitem>
   </varlistentry>
+  <varlistentry id="cv-_APPLELINK_COMPATIBILITY_VERSION">
+    <term>_APPLELINK_COMPATIBILITY_VERSION</term>
+    <listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                A macro (by default a generator function) used to create the linker flags to specify
+                apple's linker's -compatibility_version flag.
+                The default generator uses <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-APPLELINK_COMPATIBILITY_VERSION"><envar>$APPLELINK_COMPATIBILITY_VERSION</envar></link>
+                and <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-APPLELINK_NO_COMPATIBILITY_VERSION"><envar>$APPLELINK_NO_COMPATIBILITY_VERSION</envar></link> and  <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHLIBVERSION"><envar>$SHLIBVERSION</envar></link>
+                to determine the correct flag.
+            </para>
+        </listitem>
+  </varlistentry>
+  <varlistentry id="cv-APPLELINK_COMPATIBILITY_VERSION">
+    <term>APPLELINK_COMPATIBILITY_VERSION</term>
+    <listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                On Mac OS X this is used to set the linker flag:
+
+                -compatibility_version
+            </para>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                The value is specified as X[.Y[.Z]] where X is between 1 and 65535, Y can be omitted or between 1 and
+                255, Z can be omitted or between 1 and 255. This value will be derived from <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHLIBVERSION"><envar>$SHLIBVERSION</envar></link> if
+                not
+                specified. The lowest digit will be dropped and replaced by a 0.
+            </para>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                If the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-APPLELINK_NO_COMPATIBILITY_VERSION"><envar>$APPLELINK_NO_COMPATIBILITY_VERSION</envar></link> is set then no -compatibility_version will be
+                output.
+            </para>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">See MacOS's ld manpage for more details</para>
+        </listitem>
+  </varlistentry>
+  <varlistentry id="cv-_APPLELINK_CURRENT_VERSION">
+    <term>_APPLELINK_CURRENT_VERSION</term>
+    <listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                A macro (by default a generator function) used to create the linker flags to specify apple's linker's
+                -current_version flag.  The default generator uses <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-APPLELINK_CURRENT_VERSION"><envar>$APPLELINK_CURRENT_VERSION</envar></link> and
+                <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-APPLELINK_NO_CURRENT_VERSION"><envar>$APPLELINK_NO_CURRENT_VERSION</envar></link> and  <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHLIBVERSION"><envar>$SHLIBVERSION</envar></link> to determine the correct flag.
+            </para>
+        </listitem>
+  </varlistentry>
+  <varlistentry id="cv-APPLELINK_CURRENT_VERSION">
+    <term>APPLELINK_CURRENT_VERSION</term>
+    <listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                On Mac OS X this is used to set the linker flag:
+
+                -current_version
+            </para>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                The value is specified as X[.Y[.Z]] where X is between 1 and 65535, Y can be omitted or between 1 and
+                255, Z can be omitted or between 1 and 255. This value will be set to <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHLIBVERSION"><envar>$SHLIBVERSION</envar></link> if not
+                specified.
+            </para>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                If the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-APPLELINK_NO_CURRENT_VERSION"><envar>$APPLELINK_NO_CURRENT_VERSION</envar></link> is set then no -current_version will be
+                output.
+            </para>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">See MacOS's ld manpage for more details</para>
+
+        </listitem>
+  </varlistentry>
+  <varlistentry id="cv-APPLELINK_NO_COMPATIBILITY_VERSION">
+    <term>APPLELINK_NO_COMPATIBILITY_VERSION</term>
+    <listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                Set this to any True (1|True|non-empty string) value to disable adding -compatibility_version flag when
+                generating versioned shared libraries.
+            </para>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                This overrides <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-APPLELINK_COMPATIBILITY_VERSION"><envar>$APPLELINK_COMPATIBILITY_VERSION</envar></link>.
+            </para>
+        </listitem>
+  </varlistentry>
+  <varlistentry id="cv-APPLELINK_NO_CURRENT_VERSION">
+    <term>APPLELINK_NO_CURRENT_VERSION</term>
+    <listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                Set this to any True (1|True|non-empty string) value to disable adding -current_version flag when
+                generating versioned shared libraries.
+            </para>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                This overrides <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-APPLELINK_CURRENT_VERSION"><envar>$APPLELINK_CURRENT_VERSION</envar></link>.
+            </para>
+        </listitem>
+  </varlistentry>
   <varlistentry id="cv-AR">
     <term>AR</term>
     <listitem>
@@ -51,7 +139,9 @@ This is used to fill in the
 <literal>Architecture:</literal>
 field in an Ipkg
 <filename>control</filename> file,
-and as part of the name of a generated RPM file.
+and the <literal>BuildArch:</literal> field
+in the RPM <filename>.spec</filename> file,
+as well as forming part of the name of a generated RPM package file.
 </para>
 </listitem>
   </varlistentry>
@@ -240,7 +330,7 @@ or this:
 
 <example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env = Environment()
-env['BUILDERS]['NewBuilder'] = foo
+env['BUILDERS']['NewBuilder'] = foo
 </example_commands>
 </listitem>
   </varlistentry>
@@ -389,7 +479,6 @@ the <filename>control</filename> for Ipkg,
 the <filename>.wxs</filename> for MSI).
 If set, the function will be called
 after the SCons template for the file has been written.
-XXX
 </para>
 </listitem>
   </varlistentry>
@@ -480,7 +569,8 @@ An automatically-generated construction variable
 containing the C preprocessor command-line options
 to define values.
 The value of <envar xmlns="http://www.scons.org/dbxsd/v1.0">$_CPPDEFFLAGS</envar> is created
-by appending <envar xmlns="http://www.scons.org/dbxsd/v1.0">$CPPDEFPREFIX</envar> and <envar xmlns="http://www.scons.org/dbxsd/v1.0">$CPPDEFSUFFIX</envar>
+by respectively prepending and appending
+<envar xmlns="http://www.scons.org/dbxsd/v1.0">$CPPDEFPREFIX</envar> and <envar xmlns="http://www.scons.org/dbxsd/v1.0">$CPPDEFSUFFIX</envar>
 to the beginning and end
 of each definition in <envar xmlns="http://www.scons.org/dbxsd/v1.0">$CPPDEFINES</envar>.
 </para>
@@ -503,7 +593,8 @@ If <envar xmlns="http://www.scons.org/dbxsd/v1.0">$CPPDEFINES</envar> is a strin
 the values of the
 <envar xmlns="http://www.scons.org/dbxsd/v1.0">$CPPDEFPREFIX</envar> and <envar xmlns="http://www.scons.org/dbxsd/v1.0">$CPPDEFSUFFIX</envar>
 construction variables
-will be added to the beginning and end.
+will be respectively prepended and appended to the beginning and end
+of each definition in <envar xmlns="http://www.scons.org/dbxsd/v1.0">$CPPDEFINES</envar>.
 </para>
 
 <example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
@@ -517,7 +608,7 @@ If <envar xmlns="http://www.scons.org/dbxsd/v1.0">$CPPDEFINES</envar> is a list,
 the values of the
 <envar xmlns="http://www.scons.org/dbxsd/v1.0">$CPPDEFPREFIX</envar> and <envar xmlns="http://www.scons.org/dbxsd/v1.0">$CPPDEFSUFFIX</envar>
 construction variables
-will be appended to the beginning and end
+will be respectively prepended and appended to the beginning and end
 of each element in the list.
 If any element is a list or tuple,
 then the first item is the name being
@@ -535,7 +626,7 @@ If <envar xmlns="http://www.scons.org/dbxsd/v1.0">$CPPDEFINES</envar> is a dicti
 the values of the
 <envar xmlns="http://www.scons.org/dbxsd/v1.0">$CPPDEFPREFIX</envar> and <envar xmlns="http://www.scons.org/dbxsd/v1.0">$CPPDEFSUFFIX</envar>
 construction variables
-will be appended to the beginning and end
+will be respectively prepended and appended to the beginning and end
 of each item from the dictionary.
 The key of each dictionary item
 is a name being defined
@@ -563,7 +654,7 @@ env = Environment(CPPDEFINES={'B':2, 'A':None})
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
 The prefix used to specify preprocessor definitions
 on the C compiler command line.
-This will be appended to the beginning of each definition
+This will be prepended to the beginning of each definition
 in the <envar xmlns="http://www.scons.org/dbxsd/v1.0">$CPPDEFINES</envar> construction variable
 when the <envar xmlns="http://www.scons.org/dbxsd/v1.0">$_CPPDEFFLAGS</envar> variable is automatically generated.
 </para>
@@ -619,7 +710,7 @@ An automatically-generated construction variable
 containing the C preprocessor command-line options
 for specifying directories to be searched for include files.
 The value of <envar xmlns="http://www.scons.org/dbxsd/v1.0">$_CPPINCFLAGS</envar> is created
-by appending <envar xmlns="http://www.scons.org/dbxsd/v1.0">$INCPREFIX</envar> and <envar xmlns="http://www.scons.org/dbxsd/v1.0">$INCSUFFIX</envar>
+by respectively prepending and appending <envar xmlns="http://www.scons.org/dbxsd/v1.0">$INCPREFIX</envar> and <envar xmlns="http://www.scons.org/dbxsd/v1.0">$INCSUFFIX</envar>
 to the beginning and end
 of each directory in <envar xmlns="http://www.scons.org/dbxsd/v1.0">$CPPPATH</envar>.
 </para>
@@ -661,7 +752,7 @@ through the automatically-generated
 <envar xmlns="http://www.scons.org/dbxsd/v1.0">$_CPPINCFLAGS</envar>
 construction variable,
 which is constructed by
-appending the values of the
+respectively prepending and appending the value of the
 <envar xmlns="http://www.scons.org/dbxsd/v1.0">$INCPREFIX</envar> and <envar xmlns="http://www.scons.org/dbxsd/v1.0">$INCSUFFIX</envar>
 construction variables
 to the beginning and end
@@ -2602,7 +2693,8 @@ containing the Fortran compiler command-line options
 for specifying directories to be searched for include
 files and module files.
 The value of <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-_FORTRANINCFLAGS"><envar>$_FORTRANINCFLAGS</envar></link> is created
-by prepending/appending <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-INCPREFIX"><envar>$INCPREFIX</envar></link> and <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-INCSUFFIX"><envar>$INCSUFFIX</envar></link>
+by respectively prepending and appending
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-INCPREFIX"><envar>$INCPREFIX</envar></link> and <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-INCSUFFIX"><envar>$INCSUFFIX</envar></link>
 to the beginning and end
 of each directory in <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FORTRANPATH"><envar>$FORTRANPATH</envar></link>.
 </para>
@@ -2625,7 +2717,7 @@ for module files, as well.
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
 The prefix used to specify a module directory on the Fortran compiler command
 line.
-This will be appended to the beginning of the directory
+This will be prepended to the beginning of the directory
 in the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FORTRANMODDIR"><envar>$FORTRANMODDIR</envar></link> construction variables
 when the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-_FORTRANMODFLAG"><envar>$_FORTRANMODFLAG</envar></link> variables is automatically generated.
 </para>
@@ -2637,7 +2729,7 @@ when the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-_FORTRANMODFL
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
 The suffix used to specify a module directory on the Fortran compiler command
 line.
-This will be appended to the beginning of the directory
+This will be appended to the end of the directory
 in the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FORTRANMODDIR"><envar>$FORTRANMODDIR</envar></link> construction variables
 when the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-_FORTRANMODFLAG"><envar>$_FORTRANMODFLAG</envar></link> variables is automatically generated.
 </para>
@@ -2653,8 +2745,8 @@ for specifying the directory location where the Fortran
 compiler should place any module files that happen to get
 generated during compilation.
 The value of <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-_FORTRANMODFLAG"><envar>$_FORTRANMODFLAG</envar></link> is created
-by prepending/appending <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FORTRANMODDIRPREFIX"><envar>$FORTRANMODDIRPREFIX</envar></link> and
-<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FORTRANMODDIRSUFFIX"><envar>$FORTRANMODDIRSUFFIX</envar></link>
+by respectively prepending and appending
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FORTRANMODDIRPREFIX"><envar>$FORTRANMODDIRPREFIX</envar></link> and <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FORTRANMODDIRSUFFIX"><envar>$FORTRANMODDIRSUFFIX</envar></link>
 to the beginning and end of the directory in <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FORTRANMODDIR"><envar>$FORTRANMODDIR</envar></link>.
 </para>
 </listitem>
@@ -2727,7 +2819,7 @@ through the automatically-generated
 <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-_FORTRANINCFLAGS"><envar>$_FORTRANINCFLAGS</envar></link>
 construction variable,
 which is constructed by
-appending the values of the
+respectively prepending and appending the values of the
 <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-INCPREFIX"><envar>$INCPREFIX</envar></link> and <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-INCSUFFIX"><envar>$INCSUFFIX</envar></link>
 construction variables
 to the beginning and end
@@ -2797,107 +2889,107 @@ The default list is:
   <varlistentry id="cv-FRAMEWORKPATH">
     <term>FRAMEWORKPATH</term>
     <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-On Mac OS X with gcc,
-a list containing the paths to search for frameworks.
-Used by the compiler to find framework-style includes like
-#include &lt;Fmwk/Header.h&gt;.
-Used by the linker to find user-specified frameworks when linking (see
-<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FRAMEWORKS"><envar>$FRAMEWORKS</envar></link>).
-For example:
-</para>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                On Mac OS X with gcc,
+                a list containing the paths to search for frameworks.
+                Used by the compiler to find framework-style includes like
+                #include &lt;Fmwk/Header.h&gt;.
+                Used by the linker to find user-specified frameworks when linking (see
+                <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FRAMEWORKS"><envar>$FRAMEWORKS</envar></link>).
+                For example:
+            </para>
 
-<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
- env.AppendUnique(FRAMEWORKPATH='#myframeworkdir')
-</example_commands>
+            <example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
+                env.AppendUnique(FRAMEWORKPATH='#myframeworkdir')
+            </example_commands>
 
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-will add
-</para>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                will add
+            </para>
 
-<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
-  ... -Fmyframeworkdir
-</example_commands>
+            <example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
+                ... -Fmyframeworkdir
+            </example_commands>
 
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-to the compiler and linker command lines.
-</para>
-</listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                to the compiler and linker command lines.
+            </para>
+        </listitem>
   </varlistentry>
   <varlistentry id="cv-_FRAMEWORKPATH">
     <term>_FRAMEWORKPATH</term>
     <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-On Mac OS X with gcc, an automatically-generated construction variable
-containing the linker command-line options corresponding to
-<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FRAMEWORKPATH"><envar>$FRAMEWORKPATH</envar></link>.
-</para>
-</listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                On Mac OS X with gcc, an automatically-generated construction variable
+                containing the linker command-line options corresponding to
+                <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FRAMEWORKPATH"><envar>$FRAMEWORKPATH</envar></link>.
+            </para>
+        </listitem>
   </varlistentry>
   <varlistentry id="cv-FRAMEWORKPATHPREFIX">
     <term>FRAMEWORKPATHPREFIX</term>
     <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-On Mac OS X with gcc, the prefix to be used for the FRAMEWORKPATH entries.
-(see <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FRAMEWORKPATH"><envar>$FRAMEWORKPATH</envar></link>).
-The default value is
-<option>-F</option>.
-</para>
-</listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                On Mac OS X with gcc, the prefix to be used for the FRAMEWORKPATH entries.
+                (see <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FRAMEWORKPATH"><envar>$FRAMEWORKPATH</envar></link>).
+                The default value is
+                <option>-F</option>.
+            </para>
+        </listitem>
   </varlistentry>
   <varlistentry id="cv-FRAMEWORKPREFIX">
     <term>FRAMEWORKPREFIX</term>
     <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-On Mac OS X with gcc,
-the prefix to be used for linking in frameworks
-(see <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FRAMEWORKS"><envar>$FRAMEWORKS</envar></link>).
-The default value is
-<option>-framework</option>.
-</para>
-</listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                On Mac OS X with gcc,
+                the prefix to be used for linking in frameworks
+                (see <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FRAMEWORKS"><envar>$FRAMEWORKS</envar></link>).
+                The default value is
+                <option>-framework</option>.
+            </para>
+        </listitem>
   </varlistentry>
   <varlistentry id="cv-_FRAMEWORKS">
     <term>_FRAMEWORKS</term>
     <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-On Mac OS X with gcc,
-an automatically-generated construction variable
-containing the linker command-line options
-for linking with FRAMEWORKS.
-</para>
-</listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                On Mac OS X with gcc,
+                an automatically-generated construction variable
+                containing the linker command-line options
+                for linking with FRAMEWORKS.
+            </para>
+        </listitem>
   </varlistentry>
   <varlistentry id="cv-FRAMEWORKS">
     <term>FRAMEWORKS</term>
     <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-On Mac OS X with gcc, a list of the framework names to be linked into a
-program or shared library or bundle.
-The default value is the empty list.
-For example:
-</para>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                On Mac OS X with gcc, a list of the framework names to be linked into a
+                program or shared library or bundle.
+                The default value is the empty list.
+                For example:
+            </para>
 
-<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
- env.AppendUnique(FRAMEWORKS=Split('System Cocoa SystemConfiguration'))
-</example_commands>
+            <example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
+                env.AppendUnique(FRAMEWORKS=Split('System Cocoa SystemConfiguration'))
+            </example_commands>
 
-</listitem>
+        </listitem>
   </varlistentry>
   <varlistentry id="cv-FRAMEWORKSFLAGS">
     <term>FRAMEWORKSFLAGS</term>
     <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-On Mac OS X with gcc,
-general user-supplied frameworks options to be added at
-the end of a command
-line building a loadable module.
-(This has been largely superseded by
-the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FRAMEWORKPATH"><envar>$FRAMEWORKPATH</envar></link>, <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FRAMEWORKPATHPREFIX"><envar>$FRAMEWORKPATHPREFIX</envar></link>,
-<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FRAMEWORKPREFIX"><envar>$FRAMEWORKPREFIX</envar></link> and <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FRAMEWORKS"><envar>$FRAMEWORKS</envar></link> variables
-described above.)
-</para>
-</listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                On Mac OS X with gcc,
+                general user-supplied frameworks options to be added at
+                the end of a command
+                line building a loadable module.
+                (This has been largely superseded by
+                the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FRAMEWORKPATH"><envar>$FRAMEWORKPATH</envar></link>, <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FRAMEWORKPATHPREFIX"><envar>$FRAMEWORKPATHPREFIX</envar></link>,
+                <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FRAMEWORKPREFIX"><envar>$FRAMEWORKPREFIX</envar></link> and <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FRAMEWORKS"><envar>$FRAMEWORKS</envar></link> variables
+                described above.)
+            </para>
+        </listitem>
   </varlistentry>
   <varlistentry id="cv-GS">
     <term>GS</term>
@@ -2940,6 +3032,15 @@ is <quote><literal>-dNOPAUSE -dBATCH -sDEVICE=pdfwrite</literal></quote>
     <term>HOST_ARCH</term>
     <listitem>
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
+        The name of the host hardware architecture used to create the Environment.
+        If a platform is specified when creating the Environment, then
+        that Platform's logic will handle setting this value.
+        This value is immutable, and should not be changed by the user after
+        the Environment is initialized.
+        Currently only set for Win32.
+</para>
+    
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Sets the host architecture for Visual Studio compiler. If not set,
 default to the detected host architecture: note that this may depend
 on the python you are using.
@@ -2955,16 +3056,7 @@ Valid values are the same as for <envar xmlns="http://www.scons.org/dbxsd/v1.0">
 This is currently only used on Windows, but in the future it will be
 used on other OSes as well.
 </para>
-
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-        The name of the host hardware architecture used to create the Environment.
-        If a platform is specified when creating the Environment, then
-        that Platform's logic will handle setting this value.
-        This value is immutable, and should not be changed by the user after
-        the Environment is initialized.
-        Currently only set for Win32.
-</para>
-    </listitem>
+</listitem>
   </varlistentry>
   <varlistentry id="cv-HOST_OS">
     <term>HOST_OS</term>
@@ -3087,7 +3179,7 @@ env = Environment(IMPLICIT_COMMAND_DEPENDENCIES = 0)
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
 The prefix used to specify an include directory on the C compiler command
 line.
-This will be appended to the beginning of each directory
+This will be prepended to the beginning of each directory
 in the <envar xmlns="http://www.scons.org/dbxsd/v1.0">$CPPPATH</envar> and <envar xmlns="http://www.scons.org/dbxsd/v1.0">$FORTRANPATH</envar> construction variables
 when the <envar xmlns="http://www.scons.org/dbxsd/v1.0">$_CPPINCFLAGS</envar> and <envar xmlns="http://www.scons.org/dbxsd/v1.0">$_FORTRANINCFLAGS</envar>
 variables are automatically generated.
@@ -3206,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 <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">
@@ -3216,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 <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">
@@ -3265,107 +3357,111 @@ by default.
   <varlistentry id="cv-JAVABOOTCLASSPATH">
     <term>JAVABOOTCLASSPATH</term>
     <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-Specifies the list of directories that
-will be added to the
-<application xmlns="http://www.scons.org/dbxsd/v1.0">javac</application> command line
-via the <option>-bootclasspath</option> option.
-The individual directory names will be
-separated by the operating system's path separate character
-(<filename>:</filename> on UNIX/Linux/POSIX,
-<filename>;</filename> on Windows).
-</para>
-</listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                Specifies the list of directories that
+                will be added to the
+                <application xmlns="http://www.scons.org/dbxsd/v1.0">javac</application> command line
+                via the <option>-bootclasspath</option> option.
+                The individual directory names will be
+                separated by the operating system's path separate character
+                (<filename>:</filename> on UNIX/Linux/POSIX,
+                <filename>;</filename>
+                on Windows).
+            </para>
+        </listitem>
   </varlistentry>
   <varlistentry id="cv-JAVAC">
     <term>JAVAC</term>
     <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-The Java compiler.
-</para>
-</listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                The Java compiler.
+            </para>
+        </listitem>
   </varlistentry>
   <varlistentry id="cv-JAVACCOM">
     <term>JAVACCOM</term>
     <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-The command line used to compile a directory tree containing
-Java source files to
-corresponding Java class files.
-Any options specified in the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-JAVACFLAGS"><envar>$JAVACFLAGS</envar></link> construction variable
-are included on this command line.
-</para>
-</listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                The command line used to compile a directory tree containing
+                Java source files to
+                corresponding Java class files.
+                Any options specified in the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-JAVACFLAGS"><envar>$JAVACFLAGS</envar></link> construction variable
+                are included on this command line.
+            </para>
+        </listitem>
   </varlistentry>
   <varlistentry id="cv-JAVACCOMSTR">
     <term>JAVACCOMSTR</term>
     <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-The string displayed when compiling
-a directory tree of Java source files to
-corresponding Java class files.
-If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-JAVACCOM"><envar>$JAVACCOM</envar></link> (the command line) is displayed.
-</para>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                The string displayed when compiling
+                a directory tree of Java source files to
+                corresponding Java class files.
+                If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-JAVACCOM"><envar>$JAVACCOM</envar></link> (the command line) is displayed.
+            </para>
 
-<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
-env = Environment(JAVACCOMSTR = "Compiling class files $TARGETS from $SOURCES")
-</example_commands>
-</listitem>
+            <example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
+                env = Environment(JAVACCOMSTR = "Compiling class files $TARGETS from $SOURCES")
+            </example_commands>
+        </listitem>
   </varlistentry>
   <varlistentry id="cv-JAVACFLAGS">
     <term>JAVACFLAGS</term>
     <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-General options that are passed to the Java compiler.
-</para>
-</listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                General options that are passed to the Java compiler.
+            </para>
+        </listitem>
   </varlistentry>
   <varlistentry id="cv-JAVACLASSDIR">
     <term>JAVACLASSDIR</term>
     <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-The directory in which Java class files may be found.
-This is stripped from the beginning of any Java .class
-file names supplied to the
-<literal>JavaH</literal>
-builder.
-</para>
-</listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                The directory in which Java class files may be found.
+                This is stripped from the beginning of any Java .class
+                file names supplied to the
+                <literal>JavaH</literal>
+                builder.
+            </para>
+        </listitem>
   </varlistentry>
   <varlistentry id="cv-JAVACLASSPATH">
     <term>JAVACLASSPATH</term>
     <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-Specifies the list of directories that
-will be searched for Java
-<filename>.class</filename> file.
-The directories in this list will be added to the
-<application xmlns="http://www.scons.org/dbxsd/v1.0">javac</application> and <application xmlns="http://www.scons.org/dbxsd/v1.0">javah</application> command lines
-via the <option>-classpath</option> option.
-The individual directory names will be
-separated by the operating system's path separate character
-(<filename>:</filename> on UNIX/Linux/POSIX,
-<filename>;</filename> on Windows).
-</para>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                Specifies the list of directories that
+                will be searched for Java
+                <filename>.class</filename>
+                file.
+                The directories in this list will be added to the
+                <application xmlns="http://www.scons.org/dbxsd/v1.0">javac</application> and <application xmlns="http://www.scons.org/dbxsd/v1.0">javah</application> command lines
+                via the <option>-classpath</option> option.
+                The individual directory names will be
+                separated by the operating system's path separate character
+                (<filename>:</filename> on UNIX/Linux/POSIX,
+                <filename>;</filename>
+                on Windows).
+            </para>
 
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-Note that this currently just adds the specified
-directory via the <option>-classpath</option> option.
-<application xmlns="http://www.scons.org/dbxsd/v1.0">SCons</application> does not currently search the
-<envar xmlns="http://www.scons.org/dbxsd/v1.0">$JAVACLASSPATH</envar> directories for dependency
-<filename>.class</filename> files.
-</para>
-</listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                Note that this currently just adds the specified
+                directory via the <option>-classpath</option> option.
+                <application xmlns="http://www.scons.org/dbxsd/v1.0">SCons</application> does not currently search the
+                <envar xmlns="http://www.scons.org/dbxsd/v1.0">$JAVACLASSPATH</envar> directories for dependency
+                <filename>.class</filename>
+                files.
+            </para>
+        </listitem>
   </varlistentry>
   <varlistentry id="cv-JAVACLASSSUFFIX">
     <term>JAVACLASSSUFFIX</term>
     <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-The suffix for Java class files;
-<filename>.class</filename>
-by default.
-</para>
-</listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                The suffix for Java class files;
+                <filename>.class</filename>
+                by default.
+            </para>
+        </listitem>
   </varlistentry>
   <varlistentry id="cv-JAVAH">
     <term>JAVAH</term>
@@ -3409,65 +3505,77 @@ for Java classes.
 </para>
 </listitem>
   </varlistentry>
+  <varlistentry id="cv-JAVAINCLUDES">
+    <term>JAVAINCLUDES</term>
+    <listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                Include path for Java header files (such as jni.h)
+            </para>
+        </listitem>
+  </varlistentry>
   <varlistentry id="cv-JAVASOURCEPATH">
     <term>JAVASOURCEPATH</term>
     <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-Specifies the list of directories that
-will be searched for input
-<filename>.java</filename> file.
-The directories in this list will be added to the
-<application xmlns="http://www.scons.org/dbxsd/v1.0">javac</application> command line
-via the <option>-sourcepath</option> option.
-The individual directory names will be
-separated by the operating system's path separate character
-(<filename>:</filename> on UNIX/Linux/POSIX,
-<filename>;</filename> on Windows).
-</para>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                Specifies the list of directories that
+                will be searched for input
+                <filename>.java</filename>
+                file.
+                The directories in this list will be added to the
+                <application xmlns="http://www.scons.org/dbxsd/v1.0">javac</application> command line
+                via the <option>-sourcepath</option> option.
+                The individual directory names will be
+                separated by the operating system's path separate character
+                (<filename>:</filename> on UNIX/Linux/POSIX,
+                <filename>;</filename>
+                on Windows).
+            </para>
 
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-Note that this currently just adds the specified
-directory via the <option>-sourcepath</option> option.
-<application xmlns="http://www.scons.org/dbxsd/v1.0">SCons</application> does not currently search the
-<envar xmlns="http://www.scons.org/dbxsd/v1.0">$JAVASOURCEPATH</envar> directories for dependency
-<filename>.java</filename> files.
-</para>
-</listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                Note that this currently just adds the specified
+                directory via the <option>-sourcepath</option> option.
+                <application xmlns="http://www.scons.org/dbxsd/v1.0">SCons</application> does not currently search the
+                <envar xmlns="http://www.scons.org/dbxsd/v1.0">$JAVASOURCEPATH</envar> directories for dependency
+                <filename>.java</filename>
+                files.
+            </para>
+        </listitem>
   </varlistentry>
   <varlistentry id="cv-JAVASUFFIX">
     <term>JAVASUFFIX</term>
     <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-The suffix for Java files;
-<filename>.java</filename>
-by default.
-</para>
-</listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                The suffix for Java files;
+                <filename>.java</filename>
+                by default.
+            </para>
+        </listitem>
   </varlistentry>
   <varlistentry id="cv-JAVAVERSION">
     <term>JAVAVERSION</term>
     <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-Specifies the Java version being used by the <function xmlns="http://www.scons.org/dbxsd/v1.0">Java</function> builder.
-This is <emphasis>not</emphasis> currently used to select one
-version of the Java compiler vs. another.
-Instead, you should set this to specify the version of Java
-supported by your <application xmlns="http://www.scons.org/dbxsd/v1.0">javac</application> compiler.
-The default is <literal>1.4</literal>.
-</para>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                Specifies the Java version being used by the <function xmlns="http://www.scons.org/dbxsd/v1.0">Java</function> builder.
+                This is <emphasis>not</emphasis> currently used to select one
+                version of the Java compiler vs. another.
+                Instead, you should set this to specify the version of Java
+                supported by your <application xmlns="http://www.scons.org/dbxsd/v1.0">javac</application> compiler.
+                The default is <literal>1.4</literal>.
+            </para>
 
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-This is sometimes necessary because
-Java 1.5 changed the file names that are created
-for nested anonymous inner classes,
-which can cause a mismatch with the files
-that <application xmlns="http://www.scons.org/dbxsd/v1.0">SCons</application> expects will be generated by the <application xmlns="http://www.scons.org/dbxsd/v1.0">javac</application> compiler.
-Setting <envar xmlns="http://www.scons.org/dbxsd/v1.0">$JAVAVERSION</envar> to <literal>1.5</literal>
-(or <literal>1.6</literal>, as appropriate)
-can make <application xmlns="http://www.scons.org/dbxsd/v1.0">SCons</application> realize that a Java 1.5 or 1.6
-build is actually up to date.
-</para>
-</listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                This is sometimes necessary because
+                Java 1.5 changed the file names that are created
+                for nested anonymous inner classes,
+                which can cause a mismatch with the files
+                that <application xmlns="http://www.scons.org/dbxsd/v1.0">SCons</application> expects will be generated by the <application xmlns="http://www.scons.org/dbxsd/v1.0">javac</application> compiler.
+                Setting <envar xmlns="http://www.scons.org/dbxsd/v1.0">$JAVAVERSION</envar> to
+                <literal>1.5</literal>
+                (or <literal>1.6</literal>, as appropriate)
+                can make <application xmlns="http://www.scons.org/dbxsd/v1.0">SCons</application> realize that a Java 1.5 or 1.6
+                build is actually up to date.
+            </para>
+        </listitem>
   </varlistentry>
   <varlistentry id="cv-LATEX">
     <term>LATEX</term>
@@ -3690,6 +3798,14 @@ General options passed to the lexical analyzer generator.
 </para>
 </listitem>
   </varlistentry>
+  <varlistentry id="cv-LEXUNISTD">
+    <term>LEXUNISTD</term>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+Used only on windows environments to set a lex flag to prevent 'unistd.h' from being included. The default value is '--nounistd'.
+</para>
+</listitem>
+  </varlistentry>
   <varlistentry id="cv-_LIBDIRFLAGS">
     <term>_LIBDIRFLAGS</term>
     <listitem>
@@ -3698,7 +3814,7 @@ An automatically-generated construction variable
 containing the linker command-line options
 for specifying directories to be searched for library.
 The value of <envar xmlns="http://www.scons.org/dbxsd/v1.0">$_LIBDIRFLAGS</envar> is created
-by appending <envar xmlns="http://www.scons.org/dbxsd/v1.0">$LIBDIRPREFIX</envar> and <envar xmlns="http://www.scons.org/dbxsd/v1.0">$LIBDIRSUFFIX</envar>
+by respectively prepending and appending <envar xmlns="http://www.scons.org/dbxsd/v1.0">$LIBDIRPREFIX</envar> and <envar xmlns="http://www.scons.org/dbxsd/v1.0">$LIBDIRSUFFIX</envar>
 to the beginning and end
 of each directory in <envar xmlns="http://www.scons.org/dbxsd/v1.0">$LIBPATH</envar>.
 </para>
@@ -3709,7 +3825,7 @@ of each directory in <envar xmlns="http://www.scons.org/dbxsd/v1.0">$LIBPATH</en
     <listitem>
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
 The prefix used to specify a library directory on the linker command line.
-This will be appended to the beginning of each directory
+This will be prepended to the beginning of each directory
 in the <envar xmlns="http://www.scons.org/dbxsd/v1.0">$LIBPATH</envar> construction variable
 when the <envar xmlns="http://www.scons.org/dbxsd/v1.0">$_LIBDIRFLAGS</envar> variable is automatically generated.
 </para>
@@ -3742,7 +3858,7 @@ An automatically-generated construction variable
 containing the linker command-line options
 for specifying libraries to be linked with the resulting target.
 The value of <envar xmlns="http://www.scons.org/dbxsd/v1.0">$_LIBFLAGS</envar> is created
-by appending <envar xmlns="http://www.scons.org/dbxsd/v1.0">$LIBLINKPREFIX</envar> and <envar xmlns="http://www.scons.org/dbxsd/v1.0">$LIBLINKSUFFIX</envar>
+by respectively prepending and appending <envar xmlns="http://www.scons.org/dbxsd/v1.0">$LIBLINKPREFIX</envar> and <envar xmlns="http://www.scons.org/dbxsd/v1.0">$LIBLINKSUFFIX</envar>
 to the beginning and end
 of each filename in <envar xmlns="http://www.scons.org/dbxsd/v1.0">$LIBS</envar>.
 </para>
@@ -3753,7 +3869,7 @@ of each filename in <envar xmlns="http://www.scons.org/dbxsd/v1.0">$LIBS</envar>
     <listitem>
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
 The prefix used to specify a library to link on the linker command line.
-This will be appended to the beginning of each library
+This will be prepended to the beginning of each library
 in the <envar xmlns="http://www.scons.org/dbxsd/v1.0">$LIBS</envar> construction variable
 when the <envar xmlns="http://www.scons.org/dbxsd/v1.0">$_LIBFLAGS</envar> variable is automatically generated.
 </para>
@@ -3807,7 +3923,7 @@ through the automatically-generated
 <envar xmlns="http://www.scons.org/dbxsd/v1.0">$_LIBDIRFLAGS</envar>
 construction variable,
 which is constructed by
-appending the values of the
+respectively prepending and appending the values of the
 <envar xmlns="http://www.scons.org/dbxsd/v1.0">$LIBDIRPREFIX</envar> and <envar xmlns="http://www.scons.org/dbxsd/v1.0">$LIBDIRSUFFIX</envar>
 construction variables
 to the beginning and end
@@ -3863,7 +3979,7 @@ through the automatically-generated
 <envar xmlns="http://www.scons.org/dbxsd/v1.0">$_LIBFLAGS</envar>
 construction variable,
 which is constructed by
-appending the values of the
+respectively prepending and appending the values of the
 <envar xmlns="http://www.scons.org/dbxsd/v1.0">$LIBLINKPREFIX</envar> and <envar xmlns="http://www.scons.org/dbxsd/v1.0">$LIBLINKSUFFIX</envar>
 construction variables
 to the beginning and end
@@ -3930,10 +4046,10 @@ and these suffixes.
     <term>LICENSE</term>
     <listitem>
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
-The abbreviated name of the license under which
-this project is released (gpl, lpgl, bsd etc.).
+The abbreviated name, preferably the SPDX code, of the license under which
+this project is released (GPL-3.0, LGPL-2.1, BSD-2-Clause etc.).
 See http://www.opensource.org/licenses/alphabetical
-for a list of license names.
+for a list of license names and SPDX codes.
 </para>
 </listitem>
   </varlistentry>
@@ -4379,6 +4495,7 @@ constructor; setting it later has no effect.
 
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
 Valid values for Windows are
+<literal>14.1</literal>,
 <literal>14.0</literal>,
 <literal>14.0Exp</literal>,
 <literal>12.0</literal>,
@@ -4402,254 +4519,311 @@ Versions ending in <literal>Exp</literal> refer to "Express" or
   </varlistentry>
   <varlistentry id="cv-MSVS">
     <term>MSVS</term>
-    <listitem> <para xmlns="http://www.scons.org/dbxsd/v1.0">
-When the Microsoft Visual Studio tools are initialized, they set up this
-dictionary with the following keys: </para><variablelist xmlns="http://www.scons.org/dbxsd/v1.0">
-    <varlistentry>
-      <term>VERSION</term>
-
-      <listitem>
-        <para>the version of MSVS being used (can be set via
-        <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-MSVS_VERSION"><envar>$MSVS_VERSION</envar></link>)</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>VERSIONS</term>
-
-      <listitem>
-        <para>the available versions of MSVS installed</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>VCINSTALLDIR</term>
-
-      <listitem>
-        <para>installed directory of Visual C++</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>VSINSTALLDIR</term>
-
-      <listitem>
-        <para>installed directory of Visual Studio</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>FRAMEWORKDIR</term>
-
-      <listitem>
-        <para>installed directory of the .NET framework</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>FRAMEWORKVERSIONS</term>
-
-      <listitem>
-        <para>list of installed versions of the .NET framework, sorted
-        latest to oldest.</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>FRAMEWORKVERSION</term>
-
-      <listitem>
-        <para>latest installed version of the .NET
-        framework</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>FRAMEWORKSDKDIR</term>
-
-      <listitem>
-        <para>installed location of the .NET SDK.</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>PLATFORMSDKDIR</term>
-
-      <listitem>
-        <para>installed location of the Platform SDK.</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>PLATFORMSDK_MODULES</term>
-
-      <listitem>
-        <para>dictionary of installed Platform SDK modules, where the
-        dictionary keys are keywords for the various modules, and the values
-        are 2-tuples where the first is the release date, and the second is
-        the version number.</para>
-      </listitem>
-    </varlistentry>
-  </variablelist><para xmlns="http://www.scons.org/dbxsd/v1.0">If a value isn't set, it wasn't available in the
-registry.</para></listitem>
+    <listitem>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">
+        When the Microsoft Visual Studio tools are initialized,
+        they set up this dictionary with the following keys:
+      </para>
+      <variablelist xmlns="http://www.scons.org/dbxsd/v1.0">
+        <varlistentry>
+          <term>VERSION</term> <listitem>
+            <para>the version of MSVS being used (can be set via
+            <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-MSVS_VERSION"><envar>$MSVS_VERSION</envar></link>)</para>
+          </listitem>
+        </varlistentry> <varlistentry>
+          <term>VERSIONS</term> <listitem>
+            <para>the available versions of MSVS installed</para>
+          </listitem>
+        </varlistentry> <varlistentry>
+          <term>VCINSTALLDIR</term> <listitem>
+            <para>installed directory of Visual C++</para>
+          </listitem>
+        </varlistentry> <varlistentry>
+          <term>VSINSTALLDIR</term> <listitem>
+            <para>installed directory of Visual Studio</para>
+          </listitem>
+        </varlistentry> <varlistentry>
+          <term>FRAMEWORKDIR</term> <listitem>
+            <para>installed directory of the .NET framework</para>
+          </listitem>
+        </varlistentry> <varlistentry>
+          <term>FRAMEWORKVERSIONS</term> <listitem>
+            <para>
+              list of installed versions of the .NET framework,
+              sorted latest to oldest.
+            </para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>FRAMEWORKVERSION</term>
+          <listitem>
+            <para>latest installed version of the .NET framework</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>FRAMEWORKSDKDIR</term>
+          <listitem>
+            <para>installed location of the .NET SDK.</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>PLATFORMSDKDIR</term>
+          <listitem>
+            <para>installed location of the Platform SDK.</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>PLATFORMSDK_MODULES</term>
+          <listitem>
+            <para>
+              dictionary of installed Platform SDK modules, where the
+              dictionary keys are keywords for the various modules,
+              and the values are 2-tuples where the first is the
+              release date, and the second is the version number.
+            </para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">If a value is not set, it was not available in the registry.</para>
+    </listitem>
   </varlistentry>
   <varlistentry id="cv-MSVS_ARCH">
     <term>MSVS_ARCH</term>
-    <listitem> <para xmlns="http://www.scons.org/dbxsd/v1.0">Sets
-the architecture for which the generated project(s) should build. </para>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">The default value is <literal>x86</literal>. <literal>amd64</literal> is
-also supported by <application xmlns="http://www.scons.org/dbxsd/v1.0">SCons</application> for some Visual Studio versions. Trying to set
-<envar xmlns="http://www.scons.org/dbxsd/v1.0">$MSVS_ARCH</envar> to an architecture that's not supported for a given Visual
-Studio version will generate an error. </para> </listitem>
+    <listitem>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">Sets the architecture for which the generated project(s) should build.</para>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">
+        The default value is <literal>x86</literal>.
+        <literal>amd64</literal> is also supported by <application xmlns="http://www.scons.org/dbxsd/v1.0">SCons</application> for
+        most Visual Studio versions. Since Visual Studio 2015
+        <literal>arm</literal> is supported, and since Visual Studio
+        2017 <literal>arm64</literal> is supported.
+        Trying to set <envar xmlns="http://www.scons.org/dbxsd/v1.0">$MSVS_ARCH</envar>
+        to an architecture that's not supported for a given Visual
+        Studio version will generate an error.
+      </para>
+    </listitem>
   </varlistentry>
   <varlistentry id="cv-MSVS_PROJECT_GUID">
     <term>MSVS_PROJECT_GUID</term>
-    <listitem> <para xmlns="http://www.scons.org/dbxsd/v1.0">The string placed in a generated
+    <listitem>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">
+        The string placed in a generated
 Microsoft Visual Studio project file as the value of the
-<literal>ProjectGUID</literal> attribute. There is no default value. If not
-defined, a new GUID is generated. </para> </listitem>
+        <literal>ProjectGUID</literal> attribute. There is no default
+        value. If not
+defined, a new GUID is generated.
+
+      </para>
+    </listitem>
   </varlistentry>
   <varlistentry id="cv-MSVS_SCC_AUX_PATH">
     <term>MSVS_SCC_AUX_PATH</term>
-    <listitem> <para xmlns="http://www.scons.org/dbxsd/v1.0">The path name placed in a generated
+    <listitem>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">
+        The path name placed in a generated
 Microsoft Visual Studio project file as the value of the
-<literal>SccAuxPath</literal> attribute if the
-<envar>MSVS_SCC_PROVIDER</envar> construction variable is also set. There is
-no default value. </para> </listitem>
+        <literal>SccAuxPath</literal> attribute if the
+        <envar>MSVS_SCC_PROVIDER</envar> construction variable is
+        also set. There is
+no default value.
+
+      </para>
+    </listitem>
   </varlistentry>
   <varlistentry id="cv-MSVS_SCC_CONNECTION_ROOT">
     <term>MSVS_SCC_CONNECTION_ROOT</term>
-    <listitem> <para xmlns="http://www.scons.org/dbxsd/v1.0">The root path of projects in
-your SCC workspace, i.e the path under which all project and solution files
-will be generated. It is used as a reference path from which the relative
-paths of the generated Microsoft Visual Studio project and solution files are
-computed. The relative project file path is placed as the value of the
-<literal>SccLocalPath</literal> attribute of the project file and as the
-values of the
-<literal>SccProjectFilePathRelativizedFromConnection[i]</literal> (where [i]
-ranges from 0 to the number of projects in the solution) attributes of the
-<literal>GlobalSection(SourceCodeControl)</literal> section of the Microsoft
-Visual Studio solution file. Similarly the relative solution file path is
-placed as the values of the <literal>SccLocalPath[i]</literal> (where [i]
-ranges from 0 to the number of projects in the solution) attributes of the
-<literal>GlobalSection(SourceCodeControl)</literal> section of the Microsoft
-Visual Studio solution file. This is used only if the
-<envar>MSVS_SCC_PROVIDER</envar> construction variable is also set. The
-default value is the current working directory. </para> </listitem>
+    <listitem>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">
+        The root path of projects in your SCC workspace, i.e the
+        path under which all project and solution files will be
+        generated. It is used as a reference path from which the
+        relative paths of the generated Microsoft Visual Studio project
+        and solution files are computed. The relative project file path
+        is placed as the value of the <literal>SccLocalPath</literal>
+        attribute of the project file and as the values of the
+        <literal>SccProjectFilePathRelativizedFromConnection[i]</literal>
+        (where [i] ranges from 0 to the number of projects in the solution)
+        attributes of the <literal>GlobalSection(SourceCodeControl)</literal>
+        section of the Microsoft Visual Studio solution file. Similarly
+        the relative solution file path is placed as the values of the
+        <literal>SccLocalPath[i]</literal> (where [i] ranges from 0
+        to the number of projects in the solution) attributes of the
+        <literal>GlobalSection(SourceCodeControl)</literal> section of
+        the Microsoft Visual Studio solution file. This is used only if
+        the <envar>MSVS_SCC_PROVIDER</envar> construction variable is
+        also set. The default value is the current working directory.
+      </para>
+    </listitem>
   </varlistentry>
   <varlistentry id="cv-MSVS_SCC_PROJECT_NAME">
     <term>MSVS_SCC_PROJECT_NAME</term>
-    <listitem> <para xmlns="http://www.scons.org/dbxsd/v1.0">The project name placed in
-a generated Microsoft Visual Studio project file as the value of the
-<literal>SccProjectName</literal> attribute if the
-<envar>MSVS_SCC_PROVIDER</envar> construction variable is also set. In this
-case the string is also placed in the <literal>SccProjectName0</literal>
-attribute of the <literal>GlobalSection(SourceCodeControl)</literal> section
-of the Microsoft Visual Studio solution file. There is no default value.
-</para> </listitem>
+    <listitem>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">
+        The project name placed in a generated Microsoft
+        Visual Studio project file as the value of the
+        <literal>SccProjectName</literal> attribute if the
+        <envar>MSVS_SCC_PROVIDER</envar> construction variable
+        is also set. In this case the string is also placed in
+        the <literal>SccProjectName0</literal> attribute of the
+        <literal>GlobalSection(SourceCodeControl)</literal> section
+        of the Microsoft Visual Studio solution file. There is no
+        default value.
+      </para>
+    </listitem>
   </varlistentry>
   <varlistentry id="cv-MSVS_SCC_PROVIDER">
     <term>MSVS_SCC_PROVIDER</term>
-    <listitem> <para xmlns="http://www.scons.org/dbxsd/v1.0">The
-string placed in a generated Microsoft Visual Studio project file as the value
-of the <literal>SccProvider</literal> attribute. The string is also placed in
-the <literal>SccProvider0</literal> attribute of the
-<literal>GlobalSection(SourceCodeControl)</literal> section of the Microsoft
-Visual Studio solution file. There is no default value. </para> </listitem>
+    <listitem>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">
+        The string placed in a generated Microsoft
+        Visual Studio project file as the value of the
+        <literal>SccProvider</literal> attribute. The string is
+        also placed in the <literal>SccProvider0</literal> attribute
+        of the <literal>GlobalSection(SourceCodeControl)</literal>
+        section of the Microsoft Visual Studio solution file. There
+        is no default value.
+      </para>
+    </listitem>
   </varlistentry>
   <varlistentry id="cv-MSVS_VERSION">
     <term>MSVS_VERSION</term>
-    <listitem> <para xmlns="http://www.scons.org/dbxsd/v1.0">Sets the preferred version
-of Microsoft Visual Studio to use. </para> <para xmlns="http://www.scons.org/dbxsd/v1.0">If <envar xmlns="http://www.scons.org/dbxsd/v1.0">$MSVS_VERSION</envar> is not
-set, <application xmlns="http://www.scons.org/dbxsd/v1.0">SCons</application> will (by default) select the latest version of Visual Studio
-installed on your system. So, if you have version 6 and version 7 (MSVS .NET)
-installed, it will prefer version 7. You can override this by specifying the
-<envar>MSVS_VERSION</envar> variable in the Environment initialization,
-setting it to the appropriate version ('6.0' or '7.0', for example). If the
-specified version isn't installed, tool initialization will fail. </para>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">This is obsolete: use <envar xmlns="http://www.scons.org/dbxsd/v1.0">$MSVC_VERSION</envar> instead. If <envar xmlns="http://www.scons.org/dbxsd/v1.0">$MSVS_VERSION</envar> is
-set and <envar xmlns="http://www.scons.org/dbxsd/v1.0">$MSVC_VERSION</envar> is not, <envar xmlns="http://www.scons.org/dbxsd/v1.0">$MSVC_VERSION</envar> will be set automatically
-to <envar xmlns="http://www.scons.org/dbxsd/v1.0">$MSVS_VERSION</envar>. If both are set to different values, scons will raise an
-error. </para> </listitem>
+    <listitem>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">Sets the preferred version of Microsoft Visual Studio to use.</para>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">
+        If <envar xmlns="http://www.scons.org/dbxsd/v1.0">$MSVS_VERSION</envar> is not set, <application xmlns="http://www.scons.org/dbxsd/v1.0">SCons</application> will (by default)
+        select the latest version of Visual Studio installed on your
+        system. So, if you have version 6 and version 7 (MSVS .NET)
+        installed, it will prefer version 7. You can override this by
+        specifying the <envar>MSVS_VERSION</envar> variable in the
+        Environment initialization, setting it to the appropriate
+        version ('6.0' or '7.0', for example). If the specified
+        version isn't installed, tool initialization will fail.
+      </para>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">
+        This is obsolete: use <envar xmlns="http://www.scons.org/dbxsd/v1.0">$MSVC_VERSION</envar> instead. If
+        <envar xmlns="http://www.scons.org/dbxsd/v1.0">$MSVS_VERSION</envar> is set and <envar xmlns="http://www.scons.org/dbxsd/v1.0">$MSVC_VERSION</envar> is
+        not, <envar xmlns="http://www.scons.org/dbxsd/v1.0">$MSVC_VERSION</envar> will be set automatically to
+        <envar xmlns="http://www.scons.org/dbxsd/v1.0">$MSVS_VERSION</envar>. If both are set to different values,
+        scons will raise an error.
+      </para>
+    </listitem>
   </varlistentry>
   <varlistentry id="cv-MSVSBUILDCOM">
     <term>MSVSBUILDCOM</term>
     <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">The build command line placed in a generated Microsoft Visual Studio
-project file. The default is to have Visual Studio invoke SCons with any
-specified build targets. </para> </listitem>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">
+        The build command line placed in a generated Microsoft Visual
+        Studio project file. The default is to have Visual Studio
+        invoke SCons with any specified build targets.
+      </para>
+    </listitem>
   </varlistentry>
   <varlistentry id="cv-MSVSCLEANCOM">
     <term>MSVSCLEANCOM</term>
-    <listitem> <para xmlns="http://www.scons.org/dbxsd/v1.0">The clean command line placed in a generated Microsoft Visual
-Studio project file. The default is to have Visual Studio invoke SCons with
-the -c option to remove any specified targets. </para> </listitem>
+    <listitem>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">
+        The clean command line placed in a generated Microsoft Visual
+        Studio project file. The default is to have Visual Studio
+        invoke SCons with the -c option to remove any specified
+        targets.
+      </para>
+    </listitem>
   </varlistentry>
   <varlistentry id="cv-MSVSENCODING">
     <term>MSVSENCODING</term>
-    <listitem> <para xmlns="http://www.scons.org/dbxsd/v1.0">The encoding string placed in a
-generated Microsoft Visual Studio project file. The default is encoding
-<literal>Windows-1252</literal>. </para> </listitem>
+    <listitem>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">
+        The encoding string placed in a generated Microsoft
+        Visual Studio project file. The default is encoding
+        <literal>Windows-1252</literal>.
+      </para>
+    </listitem>
   </varlistentry>
   <varlistentry id="cv-MSVSPROJECTCOM">
     <term>MSVSPROJECTCOM</term>
-    <listitem> <para xmlns="http://www.scons.org/dbxsd/v1.0">The action used to generate Microsoft
-Visual Studio project files. </para> </listitem>
+    <listitem>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">The action used to generate Microsoft Visual Studio project files.</para>
+    </listitem>
   </varlistentry>
   <varlistentry id="cv-MSVSPROJECTSUFFIX">
     <term>MSVSPROJECTSUFFIX</term>
-    <listitem> <para xmlns="http://www.scons.org/dbxsd/v1.0">The suffix used for Microsoft Visual
-Studio project (DSP) files. The default value is <filename>.vcproj</filename>
-when using Visual Studio version 7.x (.NET) or later version, and
-<filename>.dsp</filename> when using earlier versions of Visual Studio.
-</para> </listitem>
+    <listitem>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">
+        The suffix used for Microsoft Visual Studio project (DSP)
+        files. The default value is <filename>.vcproj</filename>
+        when using Visual Studio version 7.x (.NET) or later version,
+        and <filename>.dsp</filename> when using earlier versions of
+        Visual Studio.
+      </para>
+    </listitem>
   </varlistentry>
   <varlistentry id="cv-MSVSREBUILDCOM">
     <term>MSVSREBUILDCOM</term>
-    <listitem> <para xmlns="http://www.scons.org/dbxsd/v1.0">The
-rebuild command line placed in a generated Microsoft Visual Studio project
-file. The default is to have Visual Studio invoke SCons with any specified
-rebuild targets. </para> </listitem>
+    <listitem>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">
+        The rebuild command line placed in a generated Microsoft
+        Visual Studio project file. The default is to have Visual
+        Studio invoke SCons with any specified rebuild targets.
+
+      </para>
+    </listitem>
   </varlistentry>
   <varlistentry id="cv-MSVSSCONS">
     <term>MSVSSCONS</term>
     <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">The SCons used in generated Microsoft Visual Studio project files. The
-default is the version of SCons being used to generate the project file.
-</para> </listitem>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">
+        The SCons used in generated Microsoft Visual Studio project
+        files. The default is the version of SCons being used to
+        generate the project file.
+      </para>
+    </listitem>
   </varlistentry>
   <varlistentry id="cv-MSVSSCONSCOM">
     <term>MSVSSCONSCOM</term>
-    <listitem> <para xmlns="http://www.scons.org/dbxsd/v1.0">The default
-SCons command used in generated Microsoft Visual Studio project files. </para>
-</listitem>
+    <listitem>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">
+        The default SCons command used in generated Microsoft Visual
+        Studio project files.
+      </para>
+    </listitem>
   </varlistentry>
   <varlistentry id="cv-MSVSSCONSCRIPT">
     <term>MSVSSCONSCRIPT</term>
-    <listitem> <para xmlns="http://www.scons.org/dbxsd/v1.0">The sconscript
-file (that is, <filename xmlns="http://www.scons.org/dbxsd/v1.0">SConstruct</filename> or <filename xmlns="http://www.scons.org/dbxsd/v1.0">SConscript</filename> file) that will be invoked by
-Visual Studio project files (through the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-MSVSSCONSCOM"><envar>$MSVSSCONSCOM</envar></link> variable). The
-default is the same sconscript file that contains the call to <function xmlns="http://www.scons.org/dbxsd/v1.0">MSVSProject</function>
-to build the project file. </para> </listitem>
+    <listitem>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">
+        The sconscript file (that is, <filename xmlns="http://www.scons.org/dbxsd/v1.0">SConstruct</filename> or <filename xmlns="http://www.scons.org/dbxsd/v1.0">SConscript</filename>
+        file) that will be invoked by Visual Studio project files
+        (through the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-MSVSSCONSCOM"><envar>$MSVSSCONSCOM</envar></link> variable). The default
+        is the same sconscript file that contains the call to
+        <function xmlns="http://www.scons.org/dbxsd/v1.0">MSVSProject</function> to build the project file.
+      </para>
+    </listitem>
   </varlistentry>
   <varlistentry id="cv-MSVSSCONSFLAGS">
     <term>MSVSSCONSFLAGS</term>
-    <listitem> <para xmlns="http://www.scons.org/dbxsd/v1.0">The
-SCons flags used in generated Microsoft Visual Studio project files. </para>
-</listitem>
+    <listitem>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">
+        The SCons flags used in generated Microsoft Visual Studio project files.
+      </para>
+    </listitem>
   </varlistentry>
   <varlistentry id="cv-MSVSSOLUTIONCOM">
     <term>MSVSSOLUTIONCOM</term>
-    <listitem> <para xmlns="http://www.scons.org/dbxsd/v1.0">The action used to generate Microsoft
-Visual Studio solution files. </para> </listitem>
+    <listitem>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">The action used to generate Microsoft Visual Studio solution files.</para>
+    </listitem>
   </varlistentry>
   <varlistentry id="cv-MSVSSOLUTIONSUFFIX">
     <term>MSVSSOLUTIONSUFFIX</term>
-    <listitem> <para xmlns="http://www.scons.org/dbxsd/v1.0">The suffix used for Microsoft
-Visual Studio solution (DSW) files. The default value is
-<filename>.sln</filename> when using Visual Studio version 7.x (.NET), and
-<filename>.dsw</filename> when using earlier versions of Visual Studio.
-</para> </listitem>
+    <listitem>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">
+        The suffix used for Microsoft Visual Studio solution (DSW)
+        files. The default value is <filename>.sln</filename>
+        when using Visual Studio version 7.x (.NET), and
+        <filename>.dsw</filename> when using earlier versions of
+        Visual Studio.
+      </para>
+    </listitem>
   </varlistentry>
   <varlistentry id="cv-MT">
     <term>MT</term>
@@ -5601,7 +5775,8 @@ containing the command-line options
 for specifying directories to be searched
 by the resource compiler.
 The value of <envar xmlns="http://www.scons.org/dbxsd/v1.0">$RCINCFLAGS</envar> is created
-by appending <envar xmlns="http://www.scons.org/dbxsd/v1.0">$RCINCPREFIX</envar> and <envar xmlns="http://www.scons.org/dbxsd/v1.0">$RCINCSUFFIX</envar>
+by respectively prepending and appending
+<envar xmlns="http://www.scons.org/dbxsd/v1.0">$RCINCPREFIX</envar> and <envar xmlns="http://www.scons.org/dbxsd/v1.0">$RCINCSUFFIX</envar>
 to the beginning and end
 of each directory in <envar xmlns="http://www.scons.org/dbxsd/v1.0">$CPPPATH</envar>.
 </para>
@@ -5613,7 +5788,7 @@ of each directory in <envar xmlns="http://www.scons.org/dbxsd/v1.0">$CPPPATH</en
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
 The prefix (flag) used to specify an include directory
 on the resource compiler command line.
-This will be appended to the beginning of each directory
+This will be prepended to the beginning of each directory
 in the <envar xmlns="http://www.scons.org/dbxsd/v1.0">$CPPPATH</envar> construction variable
 when the <envar xmlns="http://www.scons.org/dbxsd/v1.0">$RCINCFLAGS</envar> variable is expanded.
 </para>
@@ -5735,7 +5910,7 @@ An automatically-generated construction variable
 containing the rpath flags to be used when linking
 a program with shared libraries.
 The value of <envar xmlns="http://www.scons.org/dbxsd/v1.0">$_RPATH</envar> is created
-by appending <envar xmlns="http://www.scons.org/dbxsd/v1.0">$RPATHPREFIX</envar> and <envar xmlns="http://www.scons.org/dbxsd/v1.0">$RPATHSUFFIX</envar>
+by respectively prepending <envar xmlns="http://www.scons.org/dbxsd/v1.0">$RPATHPREFIX</envar> and appending <envar xmlns="http://www.scons.org/dbxsd/v1.0">$RPATHSUFFIX</envar>
 to the beginning and end
 of each directory in <envar xmlns="http://www.scons.org/dbxsd/v1.0">$RPATH</envar>.
 </para>
@@ -5763,7 +5938,7 @@ path, you must make it absolute yourself.
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
 The prefix used to specify a directory to be searched for
 shared libraries when running programs.
-This will be appended to the beginning of each directory
+This will be prepended to the beginning of each directory
 in the <envar xmlns="http://www.scons.org/dbxsd/v1.0">$RPATH</envar> construction variable
 when the <envar xmlns="http://www.scons.org/dbxsd/v1.0">$_RPATH</envar> variable is automatically generated.
 </para>
@@ -5863,11 +6038,15 @@ below, for more information.
   </varlistentry>
   <varlistentry id="cv-SCONS_HOME">
     <term>SCONS_HOME</term>
-    <listitem> <para xmlns="http://www.scons.org/dbxsd/v1.0">The
-(optional) path to the SCons library directory, initialized from the external
-environment. If set, this is used to construct a shorter and more efficient
-search path in the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-MSVSSCONS"><envar>$MSVSSCONS</envar></link> command line executed from Microsoft
-Visual Studio project files. </para> </listitem>
+    <listitem>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">
+        The (optional) path to the SCons library directory,
+        initialized from the external environment. If set, this is
+        used to construct a shorter and more efficient search path in
+        the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-MSVSSCONS"><envar>$MSVSSCONS</envar></link> command line executed from Microsoft
+        Visual Studio project files.
+      </para>
+    </listitem>
   </varlistentry>
   <varlistentry id="cv-SHCC">
     <term>SHCC</term>
@@ -6610,16 +6789,6 @@ Example <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHLIBVERSION">
 </para>
 </listitem>
   </varlistentry>
-  <varlistentry id="cv-SHLIBVERSIONFLAGS">
-    <term>SHLIBVERSIONFLAGS</term>
-    <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-Extra flags added to <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHLINKCOM"><envar>$SHLINKCOM</envar></link> when building versioned
-<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-SharedLibrary"><function>SharedLibrary</function></link>. These flags are only used when <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHLIBVERSION"><envar>$SHLIBVERSION</envar></link> is
-set.
-</para>
-</listitem>
-  </varlistentry>
   <varlistentry id="cv-_SHLIBVERSIONFLAGS">
     <term>_SHLIBVERSIONFLAGS</term>
     <listitem>
@@ -6633,6 +6802,16 @@ and some extra dynamically generated options (such as
 </para>
 </listitem>
   </varlistentry>
+  <varlistentry id="cv-SHLIBVERSIONFLAGS">
+    <term>SHLIBVERSIONFLAGS</term>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+Extra flags added to <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHLINKCOM"><envar>$SHLINKCOM</envar></link> when building versioned
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-SharedLibrary"><function>SharedLibrary</function></link>. These flags are only used when <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHLIBVERSION"><envar>$SHLIBVERSION</envar></link> is
+set.
+</para>
+</listitem>
+  </varlistentry>
   <varlistentry id="cv-SHLINK">
     <term>SHLINK</term>
     <listitem>
@@ -6935,7 +7114,8 @@ An automatically-generated construction variable
 containing the SWIG command-line options
 for specifying directories to be searched for included files.
 The value of <envar xmlns="http://www.scons.org/dbxsd/v1.0">$_SWIGINCFLAGS</envar> is created
-by appending <envar xmlns="http://www.scons.org/dbxsd/v1.0">$SWIGINCPREFIX</envar> and <envar xmlns="http://www.scons.org/dbxsd/v1.0">$SWIGINCSUFFIX</envar>
+by respectively prepending and appending
+<envar xmlns="http://www.scons.org/dbxsd/v1.0">$SWIGINCPREFIX</envar> and <envar xmlns="http://www.scons.org/dbxsd/v1.0">$SWIGINCSUFFIX</envar>
 to the beginning and end
 of each directory in <envar xmlns="http://www.scons.org/dbxsd/v1.0">$SWIGPATH</envar>.
 </para>
@@ -6946,7 +7126,7 @@ of each directory in <envar xmlns="http://www.scons.org/dbxsd/v1.0">$SWIGPATH</e
     <listitem>
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
 The prefix used to specify an include directory on the SWIG command line.
-This will be appended to the beginning of each directory
+This will be prepended to the beginning of each directory
 in the <envar xmlns="http://www.scons.org/dbxsd/v1.0">$SWIGPATH</envar> construction variable
 when the <envar xmlns="http://www.scons.org/dbxsd/v1.0">$_SWIGINCFLAGS</envar> variable is automatically generated.
 </para>
@@ -7020,7 +7200,7 @@ through the automatically-generated
 <envar xmlns="http://www.scons.org/dbxsd/v1.0">$_SWIGINCFLAGS</envar>
 construction variable,
 which is constructed by
-appending the values of the
+respectively prepending and appending the values of the
 <envar xmlns="http://www.scons.org/dbxsd/v1.0">$SWIGINCPREFIX</envar> and <envar xmlns="http://www.scons.org/dbxsd/v1.0">$SWIGINCSUFFIX</envar>
 construction variables
 to the beginning and end
@@ -7095,6 +7275,13 @@ that may not be set or used in a construction environment.
     <term>TARGET_ARCH</term>
     <listitem>
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
+        The name of the target hardware architecture for the compiled objects
+        created by this Environment.
+        This defaults to the value of HOST_ARCH, and the user can override it.
+        Currently only set for Win32.
+</para>
+    
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Sets the target architecture for Visual Studio compiler (i.e. the arch
 of the binaries generated by the compiler). If not set, default to
 <envar xmlns="http://www.scons.org/dbxsd/v1.0">$HOST_ARCH</envar>, or, if that is unset, to the architecture of the
@@ -7104,29 +7291,28 @@ This variable must be passed as an argument to the Environment()
 constructor; setting it later has no effect.  
 This is currently only used on Windows, but in the future it will be
 used on other OSes as well.
+If this is set and MSVC_VERSION is not set, this will search for 
+all installed MSVC's that support the TARGET_ARCH, selecting the 
+latest version for use.
 </para>
 
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
 Valid values for Windows are
 <literal>x86</literal>,
+<literal>arm</literal>,
 <literal>i386</literal>
 (for 32 bits); 
 <literal>amd64</literal>,
+<literal>arm64</literal>,
 <literal>emt64</literal>,
 <literal>x86_64</literal>
 (for 64 bits);
 and <literal>ia64</literal> (Itanium).
+
 For example, if you want to compile 64-bit binaries, you would set
 <literal>TARGET_ARCH='x86_64'</literal> in your SCons environment.
 </para>
-
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-        The name of the target hardware architecture for the compiled objects
-        created by this Environment.
-        This defaults to the value of HOST_ARCH, and the user can override it.
-        Currently only set for Win32.
-</para>
-    </listitem>
+</listitem>
   </varlistentry>
   <varlistentry id="cv-TARGET_OS">
     <term>TARGET_OS</term>
@@ -7162,14 +7348,30 @@ The suffix used for tar file names.
     <listitem>
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
 The prefix for a temporary file used
-to execute lines longer than $MAXLINELENGTH.
-The default is '@'.
-This may be set for toolchains that use other values,
-such as '-@' for the diab compiler
+to store lines lines longer than $MAXLINELENGTH
+as operations which call out to a shell will fail
+if the line is too long, which particularly
+impacts linking.
+The default is '@', which works for the Microsoft
+and GNU toolchains on Windows.
+Set this appropriately for other toolchains,
+for example '-@' for the diab compiler
 or '-via' for ARM toolchain.
 </para>
 </listitem>
   </varlistentry>
+  <varlistentry id="cv-TEMPFILESUFFIX">
+    <term>TEMPFILESUFFIX</term>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+The suffix used for the temporary file name
+used for long command lines. The name should
+include the dot ('.') if one is wanted as
+it will not be added automatically.
+The default is '.lnk'.
+</para>
+</listitem>
+  </varlistentry>
   <varlistentry id="cv-TEX">
     <term>TEX</term>
     <listitem>
@@ -7542,6 +7744,7 @@ This is used to fill in the
 <literal>BuildRequires:</literal>
 field in the RPM
 <filename>.spec</filename> file.
+Note this should only be used on a host managed by rpm as the dependencies will not be resolvable at build time otherwise.
 </para>
 </listitem>
   </varlistentry>
@@ -7600,7 +7803,8 @@ field in the RPM
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
 This is used to fill in the
 <literal>Epoch:</literal>
-field in the controlling information for RPM packages.
+field in the RPM
+<filename>.spec</filename> file.
 </para>
 </listitem>
   </varlistentry>
@@ -7626,6 +7830,38 @@ field in the RPM
 </para>
 </listitem>
   </varlistentry>
+  <varlistentry id="cv-X_RPM_EXTRADEFS">
+    <term>X_RPM_EXTRADEFS</term>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+A list used to supply extra defintions or flags
+to be added to the RPM <filename>.spec</filename> file.
+Each item is added as-is with a carriage return appended.
+This is useful if some specific RPM feature not otherwise
+anticipated by SCons needs to be turned on or off.
+Note if this variable is omitted, SCons will by
+default supply the value
+<literal>'%global debug_package %{nil}'</literal>
+to disable debug package generation.
+To enable debug package generation, include this
+variable set either to None, or to a custom
+list that does not include the default line.
+Added in version 3.1.
+</para>
+
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
+env.Package(
+    NAME             = 'foo',
+...
+    X_RPM_EXTRADEFS = [
+        '%define _unpackaged_files_terminate_build 0'
+        '%define _missing_doc_files_terminate_build 0'
+    ],
+... )
+</example_commands>
+
+</listitem>
+  </varlistentry>
   <varlistentry id="cv-X_RPM_GROUP">
     <term>X_RPM_GROUP</term>
     <listitem>
diff --git a/doc/generated/variables.mod b/doc/generated/variables.mod
index 6ecf6c9..28c08dc 100644
--- a/doc/generated/variables.mod
+++ b/doc/generated/variables.mod
@@ -10,6 +10,12 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE.  DO NOT EDIT.
 
 <!ENTITY cv-__LDMODULEVERSIONFLAGS "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$__LDMODULEVERSIONFLAGS</envar>">
 <!ENTITY cv-__SHLIBVERSIONFLAGS "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$__SHLIBVERSIONFLAGS</envar>">
+<!ENTITY cv-_APPLELINK_COMPATIBILITY_VERSION "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$_APPLELINK_COMPATIBILITY_VERSION</envar>">
+<!ENTITY cv-APPLELINK_COMPATIBILITY_VERSION "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$APPLELINK_COMPATIBILITY_VERSION</envar>">
+<!ENTITY cv-_APPLELINK_CURRENT_VERSION "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$_APPLELINK_CURRENT_VERSION</envar>">
+<!ENTITY cv-APPLELINK_CURRENT_VERSION "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$APPLELINK_CURRENT_VERSION</envar>">
+<!ENTITY cv-APPLELINK_NO_COMPATIBILITY_VERSION "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$APPLELINK_NO_COMPATIBILITY_VERSION</envar>">
+<!ENTITY cv-APPLELINK_NO_CURRENT_VERSION "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$APPLELINK_NO_CURRENT_VERSION</envar>">
 <!ENTITY cv-AR "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$AR</envar>">
 <!ENTITY cv-ARCHITECTURE "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$ARCHITECTURE</envar>">
 <!ENTITY cv-ARCOM "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$ARCOM</envar>">
@@ -232,6 +238,7 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE.  DO NOT EDIT.
 <!ENTITY cv-JAVAHCOM "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$JAVAHCOM</envar>">
 <!ENTITY cv-JAVAHCOMSTR "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$JAVAHCOMSTR</envar>">
 <!ENTITY cv-JAVAHFLAGS "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$JAVAHFLAGS</envar>">
+<!ENTITY cv-JAVAINCLUDES "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$JAVAINCLUDES</envar>">
 <!ENTITY cv-JAVASOURCEPATH "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$JAVASOURCEPATH</envar>">
 <!ENTITY cv-JAVASUFFIX "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$JAVASUFFIX</envar>">
 <!ENTITY cv-JAVAVERSION "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$JAVAVERSION</envar>">
@@ -256,6 +263,7 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE.  DO NOT EDIT.
 <!ENTITY cv-LEXCOM "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$LEXCOM</envar>">
 <!ENTITY cv-LEXCOMSTR "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$LEXCOMSTR</envar>">
 <!ENTITY cv-LEXFLAGS "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$LEXFLAGS</envar>">
+<!ENTITY cv-LEXUNISTD "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$LEXUNISTD</envar>">
 <!ENTITY cv-_LIBDIRFLAGS "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$_LIBDIRFLAGS</envar>">
 <!ENTITY cv-LIBDIRPREFIX "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$LIBDIRPREFIX</envar>">
 <!ENTITY cv-LIBDIRSUFFIX "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$LIBDIRSUFFIX</envar>">
@@ -496,8 +504,8 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE.  DO NOT EDIT.
 <!ENTITY cv-_SHLIBSONAME "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$_SHLIBSONAME</envar>">
 <!ENTITY cv-SHLIBSUFFIX "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$SHLIBSUFFIX</envar>">
 <!ENTITY cv-SHLIBVERSION "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$SHLIBVERSION</envar>">
-<!ENTITY cv-SHLIBVERSIONFLAGS "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$SHLIBVERSIONFLAGS</envar>">
 <!ENTITY cv-_SHLIBVERSIONFLAGS "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$_SHLIBVERSIONFLAGS</envar>">
+<!ENTITY cv-SHLIBVERSIONFLAGS "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$SHLIBVERSIONFLAGS</envar>">
 <!ENTITY cv-SHLINK "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$SHLINK</envar>">
 <!ENTITY cv-SHLINKCOM "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$SHLINKCOM</envar>">
 <!ENTITY cv-SHLINKCOMSTR "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$SHLINKCOMSTR</envar>">
@@ -537,6 +545,7 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE.  DO NOT EDIT.
 <!ENTITY cv-TARGETS "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$TARGETS</envar>">
 <!ENTITY cv-TARSUFFIX "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$TARSUFFIX</envar>">
 <!ENTITY cv-TEMPFILEPREFIX "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$TEMPFILEPREFIX</envar>">
+<!ENTITY cv-TEMPFILESUFFIX "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$TEMPFILESUFFIX</envar>">
 <!ENTITY cv-TEX "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$TEX</envar>">
 <!ENTITY cv-TEXCOM "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$TEXCOM</envar>">
 <!ENTITY cv-TEXCOMSTR "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$TEXCOMSTR</envar>">
@@ -584,6 +593,7 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE.  DO NOT EDIT.
 <!ENTITY cv-X_RPM_EPOCH "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$X_RPM_EPOCH</envar>">
 <!ENTITY cv-X_RPM_EXCLUDEARCH "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$X_RPM_EXCLUDEARCH</envar>">
 <!ENTITY cv-X_RPM_EXLUSIVEARCH "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$X_RPM_EXLUSIVEARCH</envar>">
+<!ENTITY cv-X_RPM_EXTRADEFS "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$X_RPM_EXTRADEFS</envar>">
 <!ENTITY cv-X_RPM_GROUP "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$X_RPM_GROUP</envar>">
 <!ENTITY cv-X_RPM_GROUP_lang "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$X_RPM_GROUP_lang</envar>">
 <!ENTITY cv-X_RPM_ICON "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$X_RPM_ICON</envar>">
@@ -639,6 +649,12 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE.  DO NOT EDIT.
 
 <!ENTITY cv-link-__LDMODULEVERSIONFLAGS "<link linkend='cv-__LDMODULEVERSIONFLAGS' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$__LDMODULEVERSIONFLAGS</envar></link>">
 <!ENTITY cv-link-__SHLIBVERSIONFLAGS "<link linkend='cv-__SHLIBVERSIONFLAGS' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$__SHLIBVERSIONFLAGS</envar></link>">
+<!ENTITY cv-link-_APPLELINK_COMPATIBILITY_VERSION "<link linkend='cv-_APPLELINK_COMPATIBILITY_VERSION' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$_APPLELINK_COMPATIBILITY_VERSION</envar></link>">
+<!ENTITY cv-link-APPLELINK_COMPATIBILITY_VERSION "<link linkend='cv-APPLELINK_COMPATIBILITY_VERSION' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$APPLELINK_COMPATIBILITY_VERSION</envar></link>">
+<!ENTITY cv-link-_APPLELINK_CURRENT_VERSION "<link linkend='cv-_APPLELINK_CURRENT_VERSION' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$_APPLELINK_CURRENT_VERSION</envar></link>">
+<!ENTITY cv-link-APPLELINK_CURRENT_VERSION "<link linkend='cv-APPLELINK_CURRENT_VERSION' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$APPLELINK_CURRENT_VERSION</envar></link>">
+<!ENTITY cv-link-APPLELINK_NO_COMPATIBILITY_VERSION "<link linkend='cv-APPLELINK_NO_COMPATIBILITY_VERSION' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$APPLELINK_NO_COMPATIBILITY_VERSION</envar></link>">
+<!ENTITY cv-link-APPLELINK_NO_CURRENT_VERSION "<link linkend='cv-APPLELINK_NO_CURRENT_VERSION' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$APPLELINK_NO_CURRENT_VERSION</envar></link>">
 <!ENTITY cv-link-AR "<link linkend='cv-AR' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$AR</envar></link>">
 <!ENTITY cv-link-ARCHITECTURE "<link linkend='cv-ARCHITECTURE' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$ARCHITECTURE</envar></link>">
 <!ENTITY cv-link-ARCOM "<link linkend='cv-ARCOM' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$ARCOM</envar></link>">
@@ -861,6 +877,7 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE.  DO NOT EDIT.
 <!ENTITY cv-link-JAVAHCOM "<link linkend='cv-JAVAHCOM' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$JAVAHCOM</envar></link>">
 <!ENTITY cv-link-JAVAHCOMSTR "<link linkend='cv-JAVAHCOMSTR' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$JAVAHCOMSTR</envar></link>">
 <!ENTITY cv-link-JAVAHFLAGS "<link linkend='cv-JAVAHFLAGS' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$JAVAHFLAGS</envar></link>">
+<!ENTITY cv-link-JAVAINCLUDES "<link linkend='cv-JAVAINCLUDES' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$JAVAINCLUDES</envar></link>">
 <!ENTITY cv-link-JAVASOURCEPATH "<link linkend='cv-JAVASOURCEPATH' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$JAVASOURCEPATH</envar></link>">
 <!ENTITY cv-link-JAVASUFFIX "<link linkend='cv-JAVASUFFIX' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$JAVASUFFIX</envar></link>">
 <!ENTITY cv-link-JAVAVERSION "<link linkend='cv-JAVAVERSION' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$JAVAVERSION</envar></link>">
@@ -885,6 +902,7 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE.  DO NOT EDIT.
 <!ENTITY cv-link-LEXCOM "<link linkend='cv-LEXCOM' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$LEXCOM</envar></link>">
 <!ENTITY cv-link-LEXCOMSTR "<link linkend='cv-LEXCOMSTR' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$LEXCOMSTR</envar></link>">
 <!ENTITY cv-link-LEXFLAGS "<link linkend='cv-LEXFLAGS' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$LEXFLAGS</envar></link>">
+<!ENTITY cv-link-LEXUNISTD "<link linkend='cv-LEXUNISTD' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$LEXUNISTD</envar></link>">
 <!ENTITY cv-link-_LIBDIRFLAGS "<link linkend='cv-_LIBDIRFLAGS' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$_LIBDIRFLAGS</envar></link>">
 <!ENTITY cv-link-LIBDIRPREFIX "<link linkend='cv-LIBDIRPREFIX' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$LIBDIRPREFIX</envar></link>">
 <!ENTITY cv-link-LIBDIRSUFFIX "<link linkend='cv-LIBDIRSUFFIX' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$LIBDIRSUFFIX</envar></link>">
@@ -1125,8 +1143,8 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE.  DO NOT EDIT.
 <!ENTITY cv-link-_SHLIBSONAME "<link linkend='cv-_SHLIBSONAME' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$_SHLIBSONAME</envar></link>">
 <!ENTITY cv-link-SHLIBSUFFIX "<link linkend='cv-SHLIBSUFFIX' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$SHLIBSUFFIX</envar></link>">
 <!ENTITY cv-link-SHLIBVERSION "<link linkend='cv-SHLIBVERSION' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$SHLIBVERSION</envar></link>">
-<!ENTITY cv-link-SHLIBVERSIONFLAGS "<link linkend='cv-SHLIBVERSIONFLAGS' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$SHLIBVERSIONFLAGS</envar></link>">
 <!ENTITY cv-link-_SHLIBVERSIONFLAGS "<link linkend='cv-_SHLIBVERSIONFLAGS' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$_SHLIBVERSIONFLAGS</envar></link>">
+<!ENTITY cv-link-SHLIBVERSIONFLAGS "<link linkend='cv-SHLIBVERSIONFLAGS' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$SHLIBVERSIONFLAGS</envar></link>">
 <!ENTITY cv-link-SHLINK "<link linkend='cv-SHLINK' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$SHLINK</envar></link>">
 <!ENTITY cv-link-SHLINKCOM "<link linkend='cv-SHLINKCOM' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$SHLINKCOM</envar></link>">
 <!ENTITY cv-link-SHLINKCOMSTR "<link linkend='cv-SHLINKCOMSTR' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$SHLINKCOMSTR</envar></link>">
@@ -1166,6 +1184,7 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE.  DO NOT EDIT.
 <!ENTITY cv-link-TARGETS "<link linkend='cv-TARGETS' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$TARGETS</envar></link>">
 <!ENTITY cv-link-TARSUFFIX "<link linkend='cv-TARSUFFIX' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$TARSUFFIX</envar></link>">
 <!ENTITY cv-link-TEMPFILEPREFIX "<link linkend='cv-TEMPFILEPREFIX' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$TEMPFILEPREFIX</envar></link>">
+<!ENTITY cv-link-TEMPFILESUFFIX "<link linkend='cv-TEMPFILESUFFIX' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$TEMPFILESUFFIX</envar></link>">
 <!ENTITY cv-link-TEX "<link linkend='cv-TEX' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$TEX</envar></link>">
 <!ENTITY cv-link-TEXCOM "<link linkend='cv-TEXCOM' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$TEXCOM</envar></link>">
 <!ENTITY cv-link-TEXCOMSTR "<link linkend='cv-TEXCOMSTR' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$TEXCOMSTR</envar></link>">
@@ -1213,6 +1232,7 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE.  DO NOT EDIT.
 <!ENTITY cv-link-X_RPM_EPOCH "<link linkend='cv-X_RPM_EPOCH' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$X_RPM_EPOCH</envar></link>">
 <!ENTITY cv-link-X_RPM_EXCLUDEARCH "<link linkend='cv-X_RPM_EXCLUDEARCH' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$X_RPM_EXCLUDEARCH</envar></link>">
 <!ENTITY cv-link-X_RPM_EXLUSIVEARCH "<link linkend='cv-X_RPM_EXLUSIVEARCH' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$X_RPM_EXLUSIVEARCH</envar></link>">
+<!ENTITY cv-link-X_RPM_EXTRADEFS "<link linkend='cv-X_RPM_EXTRADEFS' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$X_RPM_EXTRADEFS</envar></link>">
 <!ENTITY cv-link-X_RPM_GROUP "<link linkend='cv-X_RPM_GROUP' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$X_RPM_GROUP</envar></link>">
 <!ENTITY cv-link-X_RPM_GROUP_lang "<link linkend='cv-X_RPM_GROUP_lang' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$X_RPM_GROUP_lang</envar></link>">
 <!ENTITY cv-link-X_RPM_ICON "<link linkend='cv-X_RPM_ICON' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$X_RPM_ICON</envar></link>">