Regenerated docs for 4.5.0 release.

11 files changed, 1399 insertions, 742 deletions

diff --git a/doc/generated/builders.gen b/doc/generated/builders.gen
index ff3bb39e5..deccae72a 100644
--- a/doc/generated/builders.gen
+++ b/doc/generated/builders.gen
@@ -624,9 +624,9 @@ env.Jar(target = 'bar.jar',
             </para>
 
             <example_commands>
-env.Java(target = 'classes', source = 'src')
-env.Java(target = 'classes', source = ['src1', 'src2'])
-env.Java(target = 'classes', source = ['File1.java', 'File2.java'])
+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>
@@ -768,7 +768,7 @@ env.M4(target = 'foo.c', source = 'foo.c.m4')
 Builds an output file from a <command>moc</command> input file.
 <command>moc</command> input files are either header files or C++ files.
 This builder is only available after using the
-tool &t-link-qt;. See the &cv-link-QTDIR; variable for more information.
+tool &t-link-qt3;. See the &cv-link-QT3DIR; variable for more information.
 Example:
 </para>
 
@@ -832,70 +832,106 @@ Compile files for languages defined in <filename>LINGUAS</filename> file
     <term><function>MSVSProject</function>()</term>
     <term><replaceable>env</replaceable>.<methodname>MSVSProject</methodname>()</term>
     <listitem><para>
-        Builds a Microsoft Visual Studio project file, and by default
-        builds a solution file as well.
+        Build a Microsoft Visual C++ project file and solution file.
       </para>
       <para>
-        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
-        &cv-link-MSVS_VERSION; in the Environment constructor). For
-        Visual Studio 6, it will generate a <filename>.dsp</filename>
-        file. For Visual Studio 7, 8, and 9, it will
-        generate a <filename>.vcproj</filename> file.  For Visual
-        Studio 10 and later, it will generate a
-        <filename>.vcxproj</filename> file.
-      </para>
+        Builds a C++ project file based on the
+        version of Visual Studio (or to be more precise, of MSBuild)
+        that is configured: either the latest installed version,
+        or the version specified by
+        &cv-link-MSVC_VERSION; in the current &consenv;.
+        For Visual Studio 6.0 a <filename>.dsp</filename> file is generated.
+        For Visual Studio versions 2002-2008,
+        a <filename>.vcproj</filename> file is generated.
+        For Visual Studio 2010 and later a <filename>.vcxproj</filename>
+        file is generated.
+        Note there are multiple versioning schemes involved in
+        the Microsoft compilation environment -
+        see the description of &cv-link-MSVC_VERSION; for equivalences.
+        &SCons; does not know how to construct project files for
+        other languages (such as <filename>.csproj</filename> for C#,
+        <filename>.vbproj</filename> for Visual Basic or 
+        <filename>.pyproject</filename> for Python)).
+        </para>
       <para>
-        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 and later. This behavior may be disabled by
-        specifying <literal>auto_build_solution=0</literal> when you
-        call &b-MSVSProject;, in which case you presumably want to
-        build the solution file(s) by calling the &b-MSVSSolution;
-        Builder (see below).
+        For the <filename>.vcxproj</filename> file, the underlying
+        format is the MSBuild XML Schema, and the details conform to:
+        <ulink url="https://learn.microsoft.com/en-us/cpp/build/reference/vcxproj-file-structure">
+        https://learn.microsoft.com/en-us/cpp/build/reference/vcxproj-file-structure</ulink>.
+        The generated solution file enables Visual Studio to
+        understand the project structure, and allows building it
+        using MSBuild to call back to &SCons;.
+        The project file encodes a toolset version that has been
+        selected by &SCons; as described above. Since recent Visual
+        Studio versions support multiple concurrent toolsets,
+        use &cv-link-MSVC_VERSION; to select the desired one if
+        it does not match the &SCons; default.
+        The project file also includes entries which describe
+        how to call &SCons; to build the project from within Visual Studio
+        (or from an MSBuild command line).
+        In some situations &SCons; may generate this incorrectly -
+        notably when using the <emphasis>scons-local</emphasis>
+        distribution, which is not installed in a way that that
+        matches the default invocation line.
+        If so, the &cv-link-SCONS_HOME; &consvar; can be used to describe
+        the right way to locate the &SCons; code so that it can be imported.
       </para>
       <para>
-        The &b-MSVSProject; 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
-        &cv-link-SOURCES; 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.
+        By default, a matching solution file for the project is also generated.
+        This behavior may be disabled by
+        specifying <parameter>auto_build_solution=0</parameter>
+        to the &b-MSVSProject; builder.
+        The solution file can also be independently
+        generated by calling the &b-MSVSSolution; builder,
+        such as in the case where a solution should describe
+        multiple projects.
+        See the &b-link-MSVSSolution; description for further information.
       </para>
       <para>
-        The above filename lists are all optional, although at least
-        one must be specified for the resulting project file to
+        The &b-MSVSProject; builder accepts several keyword arguments
+        describing lists of filenames to be placed into the project file.
+        Currently,
+        <parameter>srcs</parameter>,
+        <parameter>incs</parameter>,
+        <parameter>localincs</parameter>,
+        <parameter>resources</parameter>,
+        and <parameter>misc</parameter>
+        are recognized.
+        The names are intended to be self-explanatory, but note that the
+        filenames need to be specified as strings, <emphasis>not</emphasis>
+        as &SCons; File Nodes
+        (for example if you generate files for inclusion by using the
+        &f-link-Glob; function, the results should be converted to
+        a list of strings before passing them to &b-MSVSProject;).
+        This is because Visual Studio and MSBuild know nothing about &SCons;
+        Node types.
+        Each of the filename lists are individually optional, but at
+        least one list must be specified for the resulting project file to
         be non-empty.
       </para>
       <para>
         In addition to the above lists of values, the following values
-        may be specified:
+        may be specified as keyword arguments:
       </para>
       <variablelist>
         <varlistentry>
-          <term>target</term>
+          <term><parameter>target</parameter></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 &cv-link-MSVSPROJECTSUFFIX;
-              construction variable will be defined to the correct
+              &consvar; will be defined to the correct
               value (see example below).
             </para>
           </listitem>
         </varlistentry>
         <varlistentry>
-          <term>variant</term>
+          <term><parameter>variant</parameter></term>
           <listitem>
             <para>
-              The name of this particular variant. For Visual Studio 7
+              The name of this particular variant. Except for Visual Studio 6
               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
@@ -910,145 +946,184 @@ Compile files for languages defined in <filename>LINGUAS</filename> file
           </listitem>
         </varlistentry>
         <varlistentry>
-          <term>cmdargs</term>
+          <term><parameter>cmdargs</parameter></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
+              <parameter>cmdargs</parameter> entries must match the number
+              of <parameter>variant</parameter> entries, or be empty (not
               specified). If you give only one, it will automatically
               be propagated to all variants.
             </para>
           </listitem>
         </varlistentry>
         <varlistentry>
-          <term>cppdefines</term>
+          <term><parameter>cppdefines</parameter></term>
           <listitem>
             <para>
               Preprocessor definitions for the different variants.
-              The number of <literal>cppdefines</literal> entries
-              must match the number of <literal>variant</literal>
+              The number of <parameter>cppdefines</parameter> entries
+              must match the number of <parameter>variant</parameter>
               entries, or be empty (not specified). If you give
               only one, it will automatically be propagated to all
-              variants. If you don't give this parameter, SCons
+              variants. If you don't give this parameter, &SCons;
               will use the invoking environment's
-              <literal>CPPDEFINES</literal> entry for all variants.
+              &cv-link-CPPDEFINES; entry for all variants.
             </para>
           </listitem>
         </varlistentry>
         <varlistentry>
-          <term>cppflags</term>
+          <term><parameter>cppflags</parameter></term>
           <listitem>
             <para>
               Compiler flags for the different variants.
-              If a /std:c++ flag is found then /Zc:__cplusplus is
-              appended to the flags if not already found, this
-              ensures that intellisense uses the /std:c++ switch.
-              The number of <literal>cppflags</literal> entries
-              must match the number of <literal>variant</literal>
+              If a <option>/std:c++</option> flag is found then
+              <option>/Zc:__cplusplus</option> is appended to the
+              flags if not already found, this ensures that Intellisense
+              uses the <option>/std:c++</option> switch.
+              The number of <parameter>cppflags</parameter> entries
+              must match the number of <parameter>variant</parameter>
               entries, or be empty (not specified). If you give
               only one, it will automatically be propagated to all
               variants. If you don't give this parameter, SCons
               will combine the invoking environment's
-              <literal>CCFLAGS</literal>, <literal>CXXFLAGS</literal>,
-              <literal>CPPFLAGS</literal> entries for all variants.
+              &cv-link-CCFLAGS;, &cv-link-CXXFLAGS;,
+              &cv-link-CPPFLAGS; entries for all variants.
             </para>
           </listitem>
         </varlistentry>
         <varlistentry>
-          <term>cpppaths</term>
+          <term><parameter>cpppaths</parameter></term>
           <listitem>
             <para>
               Compiler include paths for the different variants.
-              The number of <literal>cpppaths</literal> entries
-              must match the number of <literal>variant</literal>
+              The number of <parameter>cpppaths</parameter> entries
+              must match the number of <parameter>variant</parameter>
               entries, or be empty (not specified). If you give
               only one, it will automatically be propagated to all
               variants. If you don't give this parameter, SCons
               will use the invoking environment's
-              <literal>CPPPATH</literal> entry for all variants.
+              &cv-link-CPPPATH; entry for all variants.
             </para>
           </listitem>
         </varlistentry>
         <varlistentry>
-          <term>buildtarget</term>
+          <term><parameter>buildtarget</parameter></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.
+              <parameter>buildtarget</parameter> entries must match the
+              number of <parameter>variant</parameter> entries.
             </para>
           </listitem>
         </varlistentry>
         <varlistentry>
-          <term>runfile</term>
+          <term><parameter>runfile</parameter></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
+              value of the <parameter>Output</parameter> field in the
+              resulting Visual C++ project file. If this is not
               specified, the default is the same as the specified
-              <literal>buildtarget</literal> value.
+              <parameter>buildtarget</parameter> value.
             </para>
           </listitem>
         </varlistentry>
       </variablelist>
+      <note>
+      <para>
+        &SCons; and Microsoft Visual Studio understand projects in
+        different ways, and the mapping is sometimes imperfect:
+      </para>
       <para>
-        Note that because &SCons; always executes its build commands
+        Because &SCons; always executes its build commands
         from the directory in which the &SConstruct; file is located,
         if you generate a project file in a different directory
-        than the &SConstruct; directory, users will not be able to
+        than the directory of the &SConstruct; file, 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>
+        be remedied by adding the Visual C/C++ <option>/FC</option>
         compiler option to the &cv-link-CCFLAGS; variable so that
         the compiler will print the full path name of any files that
         cause compilation errors.
       </para>
+      <para>
+        If the project file is only used to teach the Visual Studio
+        project browser about the file layout there should be no issues,
+        However, Visual Studio should not be used to make changes
+        to the project structure, build options, etc. as these will
+        (a) not feed back to the &SCons; description of the project
+        and (b) be lost if &SCons; regenerates the project file.
+        The SConscript files should remain the definitive description
+        of the build.
+      </para>
+      <para>
+        If the project file is used to drive MSBuild (such as selecting
+        "build" from the Visual Studio interface) you lose the direct
+        control of target selection and command-line options you would
+        have if launching the build directly from &SCons;,
+        because these will be hardcoded in the project file to the
+        values specified in the &b-MSVSProject; call.
+        You can regain some of this control by defining multiple variants,
+        using multiple &b-MSVSProject; calls to arrange different build
+        targets, arguments, defines, flags and paths for different variants.
+      </para>
+      <para>
+        If the build is divided into a solution with multiple MSBuild
+        projects the mapping is further strained.  In this case,
+        it is important not to set Visual Studio to do parallel builds,
+        as it will then launch the separate project builds in parallel,
+        and &SCons; does not work well if called that way.
+        Instead you can set up the &SCons; build for parallel building -
+        see the &f-link-SetOption; function for how to do this with
+        <parameter>num_jobs</parameter>.
+      </para>
+      </note>
+
       <para>Example usage:</para>
       <example_commands>
 barsrcs = ['bar.cpp']
 barincs = ['bar.h']
 barlocalincs = ['StdAfx.h']
-barresources = ['bar.rc','resource.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')
+env.MSVSProject(
+    target='Bar' + env['MSVSPROJECTSUFFIX'],
+    srcs=barsrcs,
+    incs=barincs,
+    localincs=barlocalincs,
+    resources=barresources,
+    misc=barmisc,
+    buildtarget=buildtarget,
+    variant='Release',
+)
       </example_commands>
-      <para>
-        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>
         <varlistentry>
-          <term>DebugSettings</term>
+          <term><parameter>DebugSettings</parameter></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),
+              version installed. As for <parameter>cmdargs</parameter>,
               you can specify a <parameter>DebugSettings</parameter>
               dictionary per variant. If you give only one, it will
               be propagated to all variants.
             </para>
+            <para>
+             <emphasis>Changed in version 2.4:</emphasis>
+             Added the optional <parameter>DebugSettings</parameter> parameter.
+            </para>
           </listitem>
         </varlistentry>
       </variablelist>
@@ -1072,12 +1147,17 @@ msvcver = vars.args.get('vc', '9')
 
 # Check command args to force one Microsoft Visual Studio version
 if msvcver == '9' or msvcver == '11':
-  env = Environment(MSVC_VERSION=msvcver+'.0', MSVC_BATCH=False)
+    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")
+    env = Environment()
+
+AddOption(
+    '--userfile',
+    action='store_true',
+    dest='userfile',
+    default=False,
+    help="Create Visual C++ project file",
+)
 
 #
 # 1. Configure your Debug Setting dictionary with options you want in the list
@@ -1085,28 +1165,28 @@ AddOption('--userfile', action='store_true', dest='userfile', default=False,
 # a specific application for testing your dll with Microsoft Visual Studio 2008 (v9):
 #
 V9DebugSettings = {
-    'Command':'c:\\myapp\\using\\thisdll.exe',
+    'Command': 'c:\\myapp\\using\\thisdll.exe',
     'WorkingDirectory': 'c:\\myapp\\using\\',
     'CommandArguments': '-p password',
-#     'Attach':'false',
-#     'DebuggerType':'3',
-#     'Remote':'1',
-#     'RemoteMachine': None,
-#     'RemoteCommand': None,
-#     'HttpUrl': None,
-#     'PDBPath': None,
-#     'SQLDebugging': None,
-#     'Environment': '',
-#     'EnvironmentMerge':'true',
-#     'DebuggerFlavor': None,
-#     'MPIRunCommand': None,
-#     'MPIRunArguments': None,
-#     'MPIRunWorkingDirectory': None,
-#     'ApplicationCommand': None,
-#     'ApplicationArguments': None,
-#     'ShimCommand': None,
-#     'MPIAcceptMode': None,
-#     'MPIAcceptFilter': None,
+    # 'Attach':'false',
+    # 'DebuggerType':'3',
+    # 'Remote':'1',
+    # 'RemoteMachine': None,
+    # 'RemoteCommand': None,
+    # 'HttpUrl': None,
+    # 'PDBPath': None,
+    # 'SQLDebugging': None,
+    # 'Environment': '',
+    # 'EnvironmentMerge':'true',
+    # 'DebuggerFlavor': None,
+    # 'MPIRunCommand': None,
+    # 'MPIRunArguments': None,
+    # 'MPIRunWorkingDirectory': None,
+    # 'ApplicationCommand': None,
+    # 'ApplicationArguments': None,
+    # 'ShimCommand': None,
+    # 'MPIAcceptMode': None,
+    # 'MPIAcceptFilter': None,
 }
 
 #
@@ -1120,28 +1200,28 @@ V10DebugSettings = {
     'LocalDebuggerCommand': 'c:\\myapp\\using\\thisdll.exe',
     'LocalDebuggerWorkingDirectory': 'c:\\myapp\\using\\',
     'LocalDebuggerCommandArguments': '-p password',
-#     'LocalDebuggerEnvironment': None,
-#     'DebuggerFlavor': 'WindowsLocalDebugger',
-#     'LocalDebuggerAttach': None,
-#     'LocalDebuggerDebuggerType': None,
-#     'LocalDebuggerMergeEnvironment': None,
-#     'LocalDebuggerSQLDebugging': None,
-#     'RemoteDebuggerCommand': None,
-#     'RemoteDebuggerCommandArguments': None,
-#     'RemoteDebuggerWorkingDirectory': None,
-#     'RemoteDebuggerServerName': None,
-#     'RemoteDebuggerConnection': None,
-#     'RemoteDebuggerDebuggerType': None,
-#     'RemoteDebuggerAttach': None,
-#     'RemoteDebuggerSQLDebugging': None,
-#     'DeploymentDirectory': None,
-#     'AdditionalFiles': None,
-#     'RemoteDebuggerDeployDebugCppRuntime': None,
-#     'WebBrowserDebuggerHttpUrl': None,
-#     'WebBrowserDebuggerDebuggerType': None,
-#     'WebServiceDebuggerHttpUrl': None,
-#     'WebServiceDebuggerDebuggerType': None,
-#     'WebServiceDebuggerSQLDebugging': None,
+    # 'LocalDebuggerEnvironment': None,
+    # 'DebuggerFlavor': 'WindowsLocalDebugger',
+    # 'LocalDebuggerAttach': None,
+    # 'LocalDebuggerDebuggerType': None,
+    # 'LocalDebuggerMergeEnvironment': None,
+    # 'LocalDebuggerSQLDebugging': None,
+    # 'RemoteDebuggerCommand': None,
+    # 'RemoteDebuggerCommandArguments': None,
+    # 'RemoteDebuggerWorkingDirectory': None,
+    # 'RemoteDebuggerServerName': None,
+    # 'RemoteDebuggerConnection': None,
+    # 'RemoteDebuggerDebuggerType': None,
+    # 'RemoteDebuggerAttach': None,
+    # 'RemoteDebuggerSQLDebugging': None,
+    # 'DeploymentDirectory': None,
+    # 'AdditionalFiles': None,
+    # 'RemoteDebuggerDeployDebugCppRuntime': None,
+    # 'WebBrowserDebuggerHttpUrl': None,
+    # 'WebBrowserDebuggerDebuggerType': None,
+    # 'WebServiceDebuggerHttpUrl': None,
+    # 'WebServiceDebuggerDebuggerType': None,
+    # 'WebServiceDebuggerSQLDebugging': None,
 }
 
 #
@@ -1163,72 +1243,86 @@ else:
 barsrcs = ['bar.cpp', 'dllmain.cpp', 'stdafx.cpp']
 barincs = ['targetver.h']
 barlocalincs = ['StdAfx.h']
-barresources = ['bar.rc','resource.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, {}))
+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=f'vc={msvcver}',
+    DebugSettings=(dbgSettings, {}),
+)
       </example_commands>
     </listitem>
   </varlistentry>
   <varlistentry id="b-MSVSSolution">
     <term><function>MSVSSolution</function>()</term>
     <term><replaceable>env</replaceable>.<methodname>MSVSSolution</methodname>()</term>
-    <listitem><para>Builds a Microsoft Visual Studio solution file.</para>
+    <listitem><para>Build a Microsoft Visual Studio Solution file.</para>
       <para>
-        This builds a Visual Studio solution file, based on the
-        version of Visual Studio that is configured (either the
+        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
-        &cv-link-MSVS_VERSION; 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.
+        &cv-link-MSVC_VERSION; in the &consenv;. For
+        Visual Studio 6, a <filename>.dsw</filename> file is generated.
+        For Visual Studio .NET 2002 and later,
+        it will generate a <filename>.sln</filename> file.
+        Note there are multiple versioning schemes involved in
+        the Microsoft compilation environment -
+        see the description of &cv-link-MSVC_VERSION; for equivalences.
+      </para>
+      <para>
+        The solution file is a container for one or more projects,
+        and follows the format described at
+        <ulink url="https://learn.microsoft.com/en-us/visualstudio/extensibility/internals/solution-dot-sln-file">
+        https://learn.microsoft.com/en-us/visualstudio/extensibility/internals/solution-dot-sln-file</ulink>.
       </para>
       <para>The following values must be specified:</para>
       <variablelist>
         <varlistentry>
-          <term>target</term>
+          <term><parameter>target</parameter></term>
           <listitem>
             <para>
-              The name of the target .dsw or .sln file. The correct
+              The name of the target <filename>.dsw</filename> or
+              <filename>.sln</filename> file. The correct
               suffix for the version of Visual Studio must be used,
               but the value &cv-link-MSVSSOLUTIONSUFFIX; will be
               defined to the correct value (see example below).
             </para>
           </listitem>
-        </varlistentry> <varlistentry>
-          <term>variant</term> <listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><parameter>variant</parameter></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.
+              <literal>"Debug|Xbox"</literal>. Default platform is Win32.
             </para>
           </listitem>
-        </varlistentry> <varlistentry>
-          <term>projects</term> <listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><parameter>projects</parameter></term>
+          <listitem>
             <para>
               A list of project file names, or Project nodes returned
-              by calls to the &b-MSVSProject; 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.
+              by calls to the &b-link-MSVSProject; Builder, to be placed
+              into the solution file.
+              Note that these filenames need to be specified as strings,
+              NOT as &SCons; File Nodes.
+              This is because the solution file will be interpreted by MSBuild
+              and by Visual Studio, which know nothing about &SCons; Node types.
             </para>
           </listitem>
         </varlistentry>
@@ -1446,7 +1540,7 @@ file as the second element. Normally the object file is ignored.
 This builder is only
 provided when Microsoft Visual C++ is being used as the compiler.
 The &b-PCH; builder is generally used in
-conjunction with the &cv-link-PCH; construction variable to force object files to use
+conjunction with the &cv-link-PCH; &consvar; to force object files to use
 the precompiled header:
 </para>
 
@@ -1988,15 +2082,17 @@ file names.
 </para>
 
 <example_commands>
-classes = env.Java(target = 'classdir', source = 'src')
-env.RMIC(target = 'outdir1', source = classes)
-
-env.RMIC(target = 'outdir2',
-         source = ['package/foo.class', 'package/bar.class'])
-
-env.RMIC(target = 'outdir3',
-         source = ['classes/foo.class', 'classes/bar.class'],
-         JAVACLASSDIR = 'classes')
+classes = env.Java(target='classdir', source='src')
+env.RMIC(target='outdir1', source=classes)
+env.RMIC(
+    target='outdir2',
+    source=['package/foo.class', 'package/bar.class'],
+)
+env.RMIC(
+    target='outdir3',
+    source=['classes/foo.class', 'classes/bar.class'],
+    JAVACLASSDIR='classes',
+)
 </example_commands>
 </listitem>
   </varlistentry>
@@ -2353,6 +2449,11 @@ are flattened. See also &b-link-Textfile;.
 </para>
 
 <para>
+By default the target file encoding is "utf-8" and can be changed by &cv-link-FILE_ENCODING;
+Examples:
+</para>
+
+<para>
 If a single source file name is specified and has a <filename>.in</filename> suffix,
 the suffix is stripped and the remainder of the name is used as the default target name.
 </para>
@@ -2484,7 +2585,7 @@ Nested lists of source strings
 are flattened.
 Source strings need not literally be Python strings:
 they can be Nodes or Python objects that convert cleanly
-to &f-link-Value; nodes
+to &f-link-Value; nodes.
 </para>
 
 <para>
@@ -2492,6 +2593,9 @@ The prefix and suffix specified by the &cv-link-TEXTFILEPREFIX;
 and &cv-link-TEXTFILESUFFIX; &consvars;
 (by default an empty string and <filename>.txt</filename>, respectively)
 are automatically added to the target if they are not already present.
+</para>
+<para>
+By default the target file encoding is "utf-8" and can be changed by &cv-link-FILE_ENCODING;
 Examples:
 </para>
 
@@ -2704,14 +2808,14 @@ files.
     <listitem><para>
 Builds a header file, an implementation file and a moc file from an ui file.
 and returns the corresponding nodes in the that order.
-This builder is only available after using the tool &t-link-qt;.
+This builder is only available after using the tool &t-link-qt3;.
 Note: you can specify <filename>.ui</filename> files directly as source
 files to the &b-link-Program;,
 &b-link-Library; and &b-link-SharedLibrary; builders
 without using this builder. Using this builder lets you override the standard
 naming conventions (be careful: prefixes are always prepended to names of
 built files; if you don't want prefixes, you may set them to ``).
-See the &cv-link-QTDIR; variable for more information.
+See the &cv-link-QT3DIR; variable for more information.
 Example:
 </para>
 
diff --git a/doc/generated/examples/caching_ex-random_1.xml b/doc/generated/examples/caching_ex-random_1.xml
index 2e3b879dc..32b658c30 100644
--- a/doc/generated/examples/caching_ex-random_1.xml
+++ b/doc/generated/examples/caching_ex-random_1.xml
@@ -1,8 +1,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 f3.o -c f3.c
+cc -o f5.o -c f5.c
 cc -o f4.o -c f4.c
 cc -o f1.o -c f1.c
+cc -o f3.o -c f3.c
 cc -o f2.o -c f2.c
-cc -o f5.o -c f5.c
 cc -o prog f1.o f2.o f3.o f4.o f5.o
 </screen>
diff --git a/doc/generated/examples/factories_Chmod_1.xml b/doc/generated/examples/factories_Chmod_1.xml
index 652fa3872..1777a239c 100644
--- a/doc/generated/examples/factories_Chmod_1.xml
+++ b/doc/generated/examples/factories_Chmod_1.xml
@@ -1,4 +1,4 @@
 <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>
 Copy("file.out", "file.in")
-Chmod("file.out", 0755)
+Chmod("file.out", 0o755)
 </screen>
diff --git a/doc/generated/examples/separate_ex1_2.xml b/doc/generated/examples/separate_ex1_2.xml
new file mode 100644
index 000000000..f66f413e7
--- /dev/null
+++ b/doc/generated/examples/separate_ex1_2.xml
@@ -0,0 +1,16 @@
+<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 --tree=prune</userinput>
+cc -o build/hello.o -c build/hello.c
+cc -o build/hello build/hello.o
++-.
+  +-SConstruct
+  +-build
+  | +-build/SConscript
+  | +-build/hello
+  | | +-build/hello.o
+  | |   +-build/hello.c
+  | +-build/hello.c
+  | +-[build/hello.o]
+  +-src
+    +-src/SConscript
+    +-src/hello.c
+</screen>
diff --git a/doc/generated/examples/troubleshoot_explain1_3.xml b/doc/generated/examples/troubleshoot_explain1_3.xml
index 7a02fd52f..e658d89fd 100644
--- a/doc/generated/examples/troubleshoot_explain1_3.xml
+++ b/doc/generated/examples/troubleshoot_explain1_3.xml
@@ -2,5 +2,5 @@
 cp file.in file.oout
 
 scons: warning: Cannot find target file.out after building
-File "/Users/bdbaddog/devel/scons/git/scons-bugfixes-4/scripts/scons.py", line 97, in &lt;module&gt;
+File "/Users/bdbaddog/devel/scons/git/as_scons/scripts/scons.py", line 97, in &lt;module&gt;
 </screen>
diff --git a/doc/generated/examples/troubleshoot_stacktrace_2.xml b/doc/generated/examples/troubleshoot_stacktrace_2.xml
index 7c471eb1a..79234f279 100644
--- a/doc/generated/examples/troubleshoot_stacktrace_2.xml
+++ b/doc/generated/examples/troubleshoot_stacktrace_2.xml
@@ -1,11 +1,11 @@
 <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 --debug=stacktrace</userinput>
 scons: *** [prog.o] Source `prog.c' not found, needed by target `prog.o'.
 scons: internal stack trace:
-  File "SCons/Job.py", line 203, in start
+  File "SCons/Taskmaster/Job.py", line 219, in start
     task.prepare()
   File "SCons/Script/Main.py", line 180, in prepare
     return SCons.Taskmaster.OutOfDateTask.prepare(self)
-  File "SCons/Taskmaster.py", line 186, in prepare
+  File "SCons/Taskmaster/__init__.py", line 195, in prepare
     executor.prepare()
   File "SCons/Executor.py", line 418, in prepare
     raise SCons.Errors.StopError(msg % (s, self.batches[0].targets[0]))
diff --git a/doc/generated/functions.gen b/doc/generated/functions.gen
index 1c580f5d4..5a74fc6e4 100644
--- a/doc/generated/functions.gen
+++ b/doc/generated/functions.gen
@@ -425,126 +425,205 @@ Multiple targets can be passed in to a single call to
   <varlistentry id="f-Append">
     <term><replaceable>env</replaceable>.<methodname>Append</methodname>(<parameter>key=val, [...]</parameter>)</term>
     <listitem><para>
-Intelligently append values to &consvars; in the &consenv;
-named by <varname>env</varname>.
+Appends value(s) intelligently to &consvars; in
+<varname>env</varname>.
 The &consvars; and values to add to them are passed as
 <parameter>key=val</parameter> pairs (&Python; keyword arguments).
 &f-env-Append; is designed to allow adding values
-without normally having to know the data type of an existing &consvar;.
+without having to think about the data type of an existing &consvar;.
 Regular &Python; syntax can also be used to manipulate the &consvar;,
-but for that you must know the type of the &consvar;:
-for example, different &Python; syntax is needed to combine
-a list of values with a single string value, or vice versa.
+but for that you may need to know the types involved,
+for example pure &Python; lets you directly "add" two lists of strings,
+but adding a string to a list or a list to a string requires
+different syntax - things &f-Append; takes care of.
 Some pre-defined &consvars; do have type expectations
-based on how &SCons; will use them,
-for example &cv-link-CPPDEFINES; is normally a string or a list of strings,
-but can be a string,
-a list of strings,
-a list of tuples,
-or a dictionary, while &cv-link-LIBEMITTER;
-would expect a callable or list of callables,
-and &cv-link-BUILDERS; would expect a mapping type.
+based on how &SCons; will use them:
+for example &cv-link-CPPDEFINES; is often a string or a list of strings,
+but can also be a list of tuples or a dictionary;
+while &cv-link-LIBEMITTER;
+is expected to be a callable or list of callables,
+and &cv-link-BUILDERS; is expected to be a dictionary.
 Consult the documentation for the various &consvars; for more details.
 </para>
 
 <para>
-The following descriptions apply to both the append
-and prepend functions, the only difference being
-the insertion point of the added values.
-</para>
-<para>
-If <varname>env</varname>.  does not have a &consvar;
-indicated by <parameter>key</parameter>,
-<parameter>val</parameter>
-is added to the environment under that key as-is.
-</para>
-
-<para>
-<parameter>val</parameter> can be almost any type,
-and &SCons; will combine it with an existing value into an appropriate type,
-but there are a few special cases to be aware of.
-When two strings are combined,
-the result is normally a new string,
-with the caller responsible for supplying any needed separation.
-The exception to this is the &consvar; &cv-link-CPPDEFINES;,
-in which each item will be postprocessed by adding a prefix
-and/or suffix,
-so the contents are treated as a list of strings, that is,
-adding a string will result in a separate string entry,
-not a combined string. For &cv-CPPDEFINES; as well as
-for &cv-link-LIBS;, and the various <literal>*PATH</literal>;
-variables, &SCons; will supply the compiler-specific
-syntax (e.g. adding a <literal>-D</literal> or <literal>/D</literal>
-prefix for &cv-CPPDEFINES;), so this syntax should be omitted when
+The following descriptions apply to both the &f-Append;
+and &f-Prepend; methods, as well as their
+<emphasis role="bold">Unique</emphasis> variants,
+with the differences being the insertion point of the added values
+and whether duplication is allowed.
+</para>
+
+<para>
+<parameter>val</parameter> can be almost any type.
+If <varname>env</varname> does not have a &consvar;
+named <parameter>key</parameter>,
+then <parameter>key</parameter> is simply
+stored with a value of <parameter>val</parameter>.
+Otherwise, <parameter>val</parameter> is
+combinined with the existing value,
+possibly converting into an appropriate type
+which can hold the expanded contents.
+There are a few special cases to be aware of.
+Normally, when two strings are combined,
+the result is a new string containing their concatenation
+(and you are responsible for supplying any needed separation);
+however, the contents of &cv-link-CPPDEFINES; will
+will be postprocessed by adding a prefix and/or suffix
+to each entry when the command line is produced,
+so &SCons; keeps them separate -
+appending a string will result in a separate string entry,
+not a combined string.
+For &cv-CPPDEFINES;. as well as
+&cv-link-LIBS;, and the various <literal>*PATH</literal> variables,
+&SCons; will amend the variable by supplying the compiler-specific
+syntax (e.g. prepending a <literal>-D</literal> or <literal>/D</literal>
+prefix for &cv-CPPDEFINES;), so you should omit this syntax when
 adding values to these variables.
-Example (gcc syntax shown in the expansion of &CPPDEFINES;):
+Examples (gcc syntax shown in the expansion of &CPPDEFINES;):
 </para>
 
 <example_commands>
 env = Environment(CXXFLAGS="-std=c11", CPPDEFINES="RELEASE")
-print("CXXFLAGS={}, CPPDEFINES={}".format(env['CXXFLAGS'], env['CPPDEFINES']))
-# notice including a leading space in CXXFLAGS value
+print(f"CXXFLAGS = {env['CXXFLAGS']}, CPPDEFINES = {env['CPPDEFINES']}")
+# notice including a leading space in CXXFLAGS addition
 env.Append(CXXFLAGS=" -O", CPPDEFINES="EXTRA")
-print("CXXFLAGS={}, CPPDEFINES={}".format(env['CXXFLAGS'], env['CPPDEFINES']))
-print("CPPDEFINES will expand to {}".format(env.subst("$_CPPDEFFLAGS")))
+print(f"CXXFLAGS = {env['CXXFLAGS']}, CPPDEFINES = {env['CPPDEFINES']}")
+print("CPPDEFINES will expand to", env.subst('$_CPPDEFFLAGS'))
 </example_commands>
 
 <screen>
 $ scons -Q
-CXXFLAGS=-std=c11, CPPDEFINES=RELEASE
-CXXFLAGS=-std=c11 -O, CPPDEFINES=['RELEASE', 'EXTRA']
+CXXFLAGS = -std=c11, CPPDEFINES = RELEASE
+CXXFLAGS = -std=c11 -O, CPPDEFINES = deque(['RELEASE', 'EXTRA'])
 CPPDEFINES will expand to -DRELEASE -DEXTRA
 scons: `.' is up to date.
 </screen>
 
 <para>
-Because &cv-link-CPPDEFINES; is intended to
-describe C/C++ pre-processor macro definitions,
-it accepts additional syntax.
-Preprocessor macros can be valued, or un-valued, as in
-<computeroutput>-DBAR=1</computeroutput> or
-<computeroutput>-DFOO</computeroutput>.
-The macro can be be supplied as a complete string including the value,
-or as a tuple (or list) of macro, value, or as a dictionary.
-Example (again gcc syntax in the expanded defines):
+Because &cv-link-CPPDEFINES; is intended for command-line
+specification of C/C++ preprocessor macros,
+additional syntax is accepted when adding to it.
+The preprocessor accepts arguments to predefine a macro name by itself
+(<computeroutput>-DFOO</computeroutput> for most compilers,
+<computeroutput>/DFOO</computeroutput> for Microsoft C++),
+which gives it an implicit value of <constant>1</constant>,
+or can be given with a replacement value
+(<computeroutput>-DBAR=TEXT</computeroutput>).
+&SCons; follows these rules when adding to &cv-CPPDEFINES;:
+</para>
+<itemizedlist>
+<listitem>
+<para>A string is split on spaces,
+giving an easy way to enter multiple macros in one addition.
+Use an <literal>=</literal> to specify a valued macro.</para>
+</listitem>
+<listitem>
+<para>A tuple is treated as a valued macro. 
+Use the value <constant>None</constant> if the macro should not have a value.
+It is an error to supply more than two elements in such a tuple.</para>
+</listitem>
+<listitem>
+<para>A list is processed in order,
+adding each item without further interpretation.
+In this case, space-separated strings are not split.</para>
+</listitem>
+<listitem>
+<para>A dictionary is processed in order,
+adding each key:value pair as a valued macro.
+Use the value <constant>None</constant> if the macro should not have a value.
+</para>
+</listitem>
+</itemizedlist>
+
+<para>
+Examples:
 </para>
 
 <example_commands>
 env = Environment(CPPDEFINES="FOO")
-print("CPPDEFINES={}".format(env['CPPDEFINES']))
+print("CPPDEFINES =", env['CPPDEFINES'])
 env.Append(CPPDEFINES="BAR=1")
-print("CPPDEFINES={}".format(env['CPPDEFINES']))
-env.Append(CPPDEFINES=("OTHER", 2))
-print("CPPDEFINES={}".format(env['CPPDEFINES']))
+print("CPPDEFINES =", env['CPPDEFINES'])
+env.Append(CPPDEFINES=[("OTHER", 2)])
+print("CPPDEFINES =", env['CPPDEFINES'])
 env.Append(CPPDEFINES={"EXTRA": "arg"})
-print("CPPDEFINES={}".format(env['CPPDEFINES']))
-print("CPPDEFINES will expand to {}".format(env.subst("$_CPPDEFFLAGS")))
+print("CPPDEFINES =", env['CPPDEFINES'])
+print("CPPDEFINES will expand to", env.subst('$_CPPDEFFLAGS'))
 </example_commands>
 
 <screen>
 $ scons -Q
-CPPDEFINES=FOO
-CPPDEFINES=['FOO', 'BAR=1']
-CPPDEFINES=['FOO', 'BAR=1', ('OTHER', 2)]
-CPPDEFINES=['FOO', 'BAR=1', ('OTHER', 2), {'EXTRA': 'arg'}]
+CPPDEFINES = FOO
+CPPDEFINES = deque(['FOO', 'BAR=1'])
+CPPDEFINES = deque(['FOO', 'BAR=1', ('OTHER', 2)])
+CPPDEFINES = deque(['FOO', 'BAR=1', ('OTHER', 2), ('EXTRA', 'arg')])
 CPPDEFINES will expand to -DFOO -DBAR=1 -DOTHER=2 -DEXTRA=arg
 scons: `.' is up to date.
 </screen>
 
 <para>
-Adding a string <parameter>val</parameter>
-to a dictonary &consvar; will enter
-<parameter>val</parameter> as the key in the dict,
+Examples of adding multiple macros:
+</para>
+
+<example_commands>
+env = Environment()
+env.Append(CPPDEFINES=[("ONE", 1), "TWO", ("THREE", )])
+print("CPPDEFINES =", env['CPPDEFINES'])
+env.Append(CPPDEFINES={"FOUR": 4, "FIVE": None})
+print("CPPDEFINES =", env['CPPDEFINES'])
+print("CPPDEFINES will expand to", env.subst('$_CPPDEFFLAGS'))
+</example_commands>
+
+<screen>
+$ scons -Q
+CPPDEFINES = [('ONE', 1), 'TWO', ('THREE',)]
+CPPDEFINES = deque([('ONE', 1), 'TWO', ('THREE',), ('FOUR', 4), ('FIVE', None)])
+CPPDEFINES will expand to -DONE=1 -DTWO -DTHREE -DFOUR=4 -DFIVE
+scons: `.' is up to date.
+</screen>
+
+<para>
+<emphasis>Changed in version  4.5</emphasis>:
+clarifined the use of tuples vs. other types,
+handling is now consistent across the four functions.
+</para>
+
+<example_commands>
+env = Environment()
+env.Append(CPPDEFINES=("MACRO1", "MACRO2"))
+print("CPPDEFINES =", env['CPPDEFINES'])
+env.Append(CPPDEFINES=[("MACRO3", "MACRO4")])
+print("CPPDEFINES =", env['CPPDEFINES'])
+print("CPPDEFINES will expand to", env.subst('$_CPPDEFFLAGS'))
+</example_commands>
+
+<screen>
+$ scons -Q
+CPPDEFINES = ('MACRO1', 'MACRO2')
+CPPDEFINES = deque(['MACRO1', 'MACRO2', ('MACRO3', 'MACRO4')])
+CPPDEFINES will expand to -DMACRO1 -DMACRO2 -DMACRO3=MACRO4
+scons: `.' is up to date.
+</screen>
+
+<para>
+See &cv-link-CPPDEFINES; for more details.
+</para>
+
+<para>
+Appending a string <parameter>val</parameter>
+to a dictonary-typed &consvar; enters
+<parameter>val</parameter> as the key in the dictionary,
 and <literal>None</literal> as its value.
-Using a tuple type to supply a key + value only works
-for the special case of &cv-link-CPPDEFINES;
+Using a tuple type to supply a <literal>key, value</literal>
+only works for the special case of &cv-CPPDEFINES;
 described above.
 </para>
 
 <para>
 Although most combinations of types work without
 needing to know the details, some combinations
-do not make sense and a &Python; exception will be raised.
+do not make sense and &Python; raises an exception.
 </para>
 
 <para>
@@ -552,7 +631,7 @@ When using &f-env-Append; to modify &consvars;
 which are path specifications (conventionally,
 the names of such end in <literal>PATH</literal>),
 it is recommended to add the values as a list of strings,
-even if there is only a single string to add.
+even if you are only adding a single string.
 The same goes for adding library names to &cv-LIBS;.
 </para>
 
@@ -616,18 +695,18 @@ See also &f-link-env-PrependENVPath;.
 </listitem>
   </varlistentry>
   <varlistentry id="f-AppendUnique">
-    <term><replaceable>env</replaceable>.<methodname>AppendUnique</methodname>(<parameter>key=val, [...], delete_existing=False</parameter>)</term>
+    <term><replaceable>env</replaceable>.<methodname>AppendUnique</methodname>(<parameter>key=val, [...], [delete_existing=False]</parameter>)</term>
     <listitem><para>
 Append values to &consvars; in the current &consenv;,
 maintaining uniqueness.
-Works like &f-link-env-Append; (see for details),
-except that values already present in the &consvar;
-will not be added again.
+Works like &f-link-env-Append;,
+except that values that would become duplicates
+are not added.
 If <parameter>delete_existing</parameter>
-is <constant>True</constant>,
-the existing matching value is first removed,
-and the requested value is added,
-having the effect of moving such values to the end.
+is set to a true value, then for any duplicate,
+the existing instance of <parameter>val</parameter> is first removed,
+then <parameter>val</parameter> is appended,
+having the effect of moving it to the end.
 </para>
 
 <para>
@@ -1546,7 +1625,6 @@ will print:
   </varlistentry>
   <varlistentry id="f-EnsurePythonVersion">
     <term><function>EnsurePythonVersion</function>(<parameter>major, minor</parameter>)</term>
-    <term><replaceable>env</replaceable>.<methodname>EnsurePythonVersion</methodname>(<parameter>major, minor</parameter>)</term>
     <listitem><para>
 Ensure that the Python version is at least
 <varname>major</varname>.<varname>minor</varname>.
@@ -1566,7 +1644,6 @@ EnsurePythonVersion(2,2)
   </varlistentry>
   <varlistentry id="f-EnsureSConsVersion">
     <term><function>EnsureSConsVersion</function>(<parameter>major, minor, [revision]</parameter>)</term>
-    <term><replaceable>env</replaceable>.<methodname>EnsureSConsVersion</methodname>(<parameter>major, minor, [revision]</parameter>)</term>
     <listitem><para>
 Ensure that the SCons version is at least
 <varname>major.minor</varname>,
@@ -1669,7 +1746,6 @@ if Execute("mkdir sub/dir/ectory"):
   </varlistentry>
   <varlistentry id="f-Exit">
     <term><function>Exit</function>(<parameter>[value]</parameter>)</term>
-    <term><replaceable>env</replaceable>.<methodname>Exit</methodname>(<parameter>[value]</parameter>)</term>
     <listitem><para>
 This tells
 &scons;
@@ -2117,7 +2193,6 @@ Nodes or strings representing path names.
   </varlistentry>
   <varlistentry id="f-GetLaunchDir">
     <term><function>GetLaunchDir</function>()</term>
-    <term><replaceable>env</replaceable>.<methodname>GetLaunchDir</methodname>()</term>
     <listitem><para>
 Returns the absolute path name of the directory from which
 &scons;
@@ -2138,18 +2213,22 @@ file is found.
     <term><function>GetOption</function>(<parameter>name</parameter>)</term>
     <term><replaceable>env</replaceable>.<methodname>GetOption</methodname>(<parameter>name</parameter>)</term>
     <listitem><para>
-This function provides a way to query the value of
-options which can be set via the command line or using the
-&f-link-SetOption; function.
+Query the value of settable options which may have been set
+on the command line, or by using the &f-link-SetOption; function.
+The value of the option is returned in a type matching how the
+option was declared - see the documentation for the
+corresponding command line option for information about each specific
+option.
 </para>
+
 <para>
 <parameter>name</parameter> can be an entry from the following table,
 which shows the corresponding command line arguments
 that could affect the value.
 <parameter>name</parameter> can be also be the destination
 variable name from a project-specific option added using the
-&f-link-AddOption; function, as long as the addition
-happens prior to the &f-GetOption; call in the SConscript files.
+&f-link-AddOption; function, as long as that addition has been
+processed prior to the &f-GetOption; call in the &SConscript; files.
 </para>
 
 <informaltable rowsep="1" colsep="1" frame="topbot">
@@ -2374,56 +2453,83 @@ happens prior to the &f-GetOption; call in the SConscript files.
 </tbody>
 </tgroup>
 </informaltable>
-
-<para>
-See the documentation for the
-corresponding command line option for information about each specific
-option.
-</para>
 </listitem>
   </varlistentry>
   <varlistentry id="f-Glob">
-    <term><function>Glob</function>(<parameter>pattern, [ondisk, source, strings, exclude]</parameter>)</term>
-    <term><replaceable>env</replaceable>.<methodname>Glob</methodname>(<parameter>pattern, [ondisk, source, strings, exclude]</parameter>)</term>
+    <term><function>Glob</function>(<parameter>pattern, [ondisk=True, source=False, strings=False, exclude=None]</parameter>)</term>
+    <term><replaceable>env</replaceable>.<methodname>Glob</methodname>(<parameter>pattern, [ondisk=True, source=False, strings=False, exclude=None]</parameter>)</term>
     <listitem><para>
-Returns Nodes (or strings) that match the specified
-<parameter>pattern</parameter>,
-relative to the directory of the current
-&SConscript;
-file.
+Returns a possibly empty list of Nodes (or strings) that match
+pathname specification <parameter>pattern</parameter>.
+<parameter>pattern</parameter> can be absolute,
+top-relative,
+or (most commonly) relative to the directory of the current
+&SConscript; file.
+&f-Glob; matches both files stored on disk and Nodes
+which &SCons; already knows about, even if any corresponding
+file is not currently stored on disk.
 The evironment method form (&f-env-Glob;)
 performs string substition on
 <parameter>pattern</parameter>
-and returns whatever matches
-the resulting expanded pattern.
+and returns whatever matches the resulting expanded pattern.
+The results are sorted, unlike for the similar &Python;
+<systemitem>glob.glob</systemitem> function,
+to ensure build order will be stable.
 </para>
 
 <para>
-The specified
 <parameter>pattern</parameter>
-uses Unix shell style metacharacters for matching:
+can contain POSIX-style shell metacharacters for matching:
 </para>
 
-<example_commands>
-  *       matches everything
-  ?       matches any single character
-  [seq]   matches any character in seq
-  [!seq]  matches any char not in seq
-</example_commands>
+<informaltable rowsep="1" colsep="1" frame="topbot">
+<tgroup cols="2">
+<thead>
+  <row>
+    <entry>Pattern</entry>
+    <entry>Meaning</entry>
+  </row>
+</thead>
+<tbody>
+  <row>
+    <entry><literal>*</literal></entry>
+    <entry>matches everything</entry>
+  </row>
+  <row>
+      <entry><literal>?</literal></entry>
+      <entry>matches any single character</entry>
+  </row>
+  <row>
+      <entry><literal>[seq]</literal></entry>
+      <entry>matches any character in <emphasis>seq</emphasis>
+      (can be a list or a range).</entry>
+  </row>
+  <row>
+      <entry><literal>[!seq]</literal></entry>
+      <entry>matches any character not in <emphasis>seq</emphasis></entry>
+  </row>
+</tbody>
+</tgroup>
+</informaltable>
 
 <para>
-If the first character of a filename is a dot,
-it must be matched explicitly.
-Character matches do
-<emphasis>not</emphasis>
-span directory separators.
+For a literal match, wrap the metacharacter in brackets to
+escape the normal behavior.
+For example, <literal>'[?]'</literal> matches the character
+<literal>'?'</literal>.
+</para>
+
+<para>
+Filenames starting with a dot are specially handled -
+they can only be matched by patterns that start with a dot
+(or have a dot immediately following a pathname separator
+character, or slash), they are not not matched by the metacharacters.
+Metacharacter matches also do not span directory separators.
 </para>
 
 <para>
-The
 &f-Glob;
-knows about
-repositories
+understands repositories
 (see the
 &f-link-Repository;
 function)
@@ -2431,8 +2537,7 @@ and source directories
 (see the
 &f-link-VariantDir;
 function)
-and
-returns a Node (or string, if so configured)
+and returns a Node (or string, if so configured) match
 in the local (SConscript) directory
 if a matching Node is found
 anywhere in a corresponding
@@ -2440,65 +2545,60 @@ repository or source directory.
 </para>
 
 <para>
-The
+If the optional
 <parameter>ondisk</parameter>
-argument may be set to a value which evaluates
-<constant>False</constant>
-to disable the search for matches on disk,
-thereby only returning matches among
-already-configured File or Dir Nodes.
-The default behavior is to
-return corresponding Nodes
-for any on-disk matches found.
+argument evaluates false,
+the search for matches on disk is disabled,
+and only matches from
+already-configured File or Dir Nodes are returned.
+The default is to return Nodes for
+matches on disk as well.
 </para>
 
 <para>
-The
+If the optional
 <parameter>source</parameter>
-argument may be set to a value which evaluates
-<constant>True</constant>
-to specify that,
-when the local directory is a
-&f-VariantDir;,
-the returned Nodes should be from the
-corresponding source directory,
-not the local directory.
+argument evaluates true,
+and the local directory is a variant directory,
+then &f-Glob; returnes Nodes from
+the corresponding source directory,
+rather than the local directory.
+<!-- XXX what about generated files that don't exist in src but will be sources? -->
 </para>
 
 <para>
-The
+If the optional
 <parameter>strings</parameter>
-argument may be set to a value which evaluates
-<constant>True</constant>
-to have the
+argument evaluates true,
 &f-Glob;
-function return strings, not Nodes,
-that represent the matched files or directories.
+returns matches as strings, rather than Nodes.
 The returned strings will be relative to
 the local (SConscript) directory.
-(Note that This may make it easier to perform
+(Note that while this may make it easier to perform
 arbitrary manipulation of file names,
-but if the returned strings are
+it loses the context &SCons; would have in the Node,
+so if the returned strings are
 passed to a different
 &SConscript;
 file,
-any Node translation will be relative
-to the other
+any Node translation there will be relative
+to that
 &SConscript;
 directory,
-not the original
+not to the original
 &SConscript;
 directory.)
 </para>
 
 <para>
-The
+The optional
 <parameter>exclude</parameter>
 argument may be set to a pattern or a list of patterns
-(following the same Unix shell semantics)
-which must be filtered out of returned elements.
-Elements matching a least one pattern of
-this list will be excluded.
+descibing files or directories
+to filter out of the match list.
+Elements matching a least one specified pattern will be excluded.
+These patterns use the same syntax as for
+<parameter>pattern</parameter>.
 </para>
 
 <para>
@@ -2508,9 +2608,10 @@ Examples:
 <example_commands>
 Program("foo", Glob("*.c"))
 Zip("/tmp/everything", Glob(".??*") + Glob("*"))
-sources = Glob("*.cpp", exclude=["os_*_specific_*.cpp"]) + \
-          Glob( "os_%s_specific_*.cpp" % currentOS)
+sources = Glob("*.cpp", exclude=["os_*_specific_*.cpp"]) \
+    + Glob("os_%s_specific_*.cpp" % currentOS)
 </example_commands>
+
 </listitem>
   </varlistentry>
   <varlistentry id="f-Help">
@@ -2542,24 +2643,26 @@ the existing help text.
     <term><function>Ignore</function>(<parameter>target, dependency</parameter>)</term>
     <term><replaceable>env</replaceable>.<methodname>Ignore</methodname>(<parameter>target, dependency</parameter>)</term>
     <listitem><para>
-The specified dependency file(s)
-will be ignored when deciding if
-the target file(s) need to be rebuilt.
-</para>
-
-<para>
-You can also use
-&f-Ignore;
-to remove a target from the default build.
-In order to do this you must specify the directory the target will
-be built in as the target, and the file you want to skip building
-as the dependency.
+Ignores <parameter>dependency</parameter>
+when deciding if
+<parameter>target</parameter> needs to be rebuilt.
+<parameter>target</parameter> and
+<parameter>dependency</parameter>
+can each be a single filename or Node
+or a list of filenames or Nodes.
 </para>
 
 <para>
-Note that this will only remove the dependencies listed from
-the files built by default.  It will still be built if that
-dependency is needed by another object being built.
+&f-Ignore; can also be used to
+remove a target from the default build
+by specifying the directory the target will be built in as
+<parameter>target</parameter>
+and the file you want to skip selecting for building as
+<parameter>dependency</parameter>.
+Note that this only removes the target from
+the default target selection algorithm:
+if it is a dependency of another object being
+built &SCons; still builds it normally.
 See the third and forth examples below.
 </para>
 
@@ -3116,20 +3219,20 @@ See also &f-link-env-AppendENVPath;.
 </listitem>
   </varlistentry>
   <varlistentry id="f-PrependUnique">
-    <term><replaceable>env</replaceable>.<methodname>PrependUnique</methodname>(<parameter>key=val, delete_existing=False, [...]</parameter>)</term>
+    <term><replaceable>env</replaceable>.<methodname>PrependUnique</methodname>(<parameter>key=val, [...], [delete_existing=False]</parameter>)</term>
     <listitem><para>
 Prepend values to &consvars; in the current &consenv;,
 maintaining uniqueness.
-Works like &f-link-env-Append; (see for details),
+Works like &f-link-env-Append;,
 except that values are added to the front,
-rather than the end, of any existing value of the &consvar;,
-and values already present in the &consvar;
-will not be added again.
+rather than the end, of the &consvar;,
+and values that would become duplicates
+are not added.
 If <parameter>delete_existing</parameter>
-is <constant>True</constant>,
-the existing matching value is first removed,
-and the requested value is inserted,
-having the effect of moving such values to the front.
+is set to a true value, then for any duplicate,
+the existing instance of <parameter>val</parameter> is first removed,
+then <parameter>val</parameter> is inserted,
+having the effect of moving it to the front.
 </para>
 
 <para>
@@ -3713,24 +3816,16 @@ script does not explicitly call &Return;, it returns
   </varlistentry>
   <varlistentry id="f-SConscriptChdir">
     <term><function>SConscriptChdir</function>(<parameter>value</parameter>)</term>
-    <term><replaceable>env</replaceable>.<methodname>SConscriptChdir</methodname>(<parameter>value</parameter>)</term>
     <listitem><para>
 By default,
 &scons;
 changes its working directory
 to the directory in which each
-subsidiary SConscript file lives.
+subsidiary SConscript file lives
+while reading and processing that script.
 This behavior may be disabled
-by specifying either:
-</para>
-
-<example_commands>
-SConscriptChdir(0)
-env.SConscriptChdir(0)
-</example_commands>
-
-<para>
-in which case
+by specifying an argument which
+evaluates false, in which case
 &scons;
 will stay in the top-level directory
 while reading all SConscript files.
@@ -3748,10 +3843,9 @@ Example:
 </para>
 
 <example_commands>
-env = Environment()
-SConscriptChdir(0)
+SConscriptChdir(False)
 SConscript('foo/SConscript')	# will not chdir to foo
-env.SConscriptChdir(1)
+SConscriptChdir(True)
 SConscript('bar/SConscript')	# will chdir to bar
 </example_commands>
 </listitem>
@@ -4340,6 +4434,12 @@ appended to the &cv-link-TOOLS;
 </para>
 
 <para>
+<emphasis>Changed in version  4.2:</emphasis>
+&f-env-Tool; now returns the tool object,
+previously it did not return (i.e. returned <constant>None</constant>).
+</para>
+
+<para>
 Examples:
 </para>
 
@@ -4376,12 +4476,6 @@ msvctool(env)  # adds 'msvc' to the TOOLS variable
 gltool = Tool('opengl', toolpath = ['tools'])
 gltool(env)  # adds 'opengl' to the TOOLS variable
 </example_commands>
-
-<para>
-<emphasis>Changed in &SCons; 4.2: &f-env-Tool; now returns
-the tool object, previously it did not return
-(i.e. returned <constant>None</constant>).</emphasis>
-</para>
 </listitem>
   </varlistentry>
   <varlistentry id="f-ValidateOptions">
@@ -4420,7 +4514,7 @@ except SConsBadOptionError as e:
     print("Message is :%s" % e.opt_str)
     Exit(3)
             </example_commands>
-            
+
             <para>
                 This function is useful to force SCons to fail fast before you execute any expensive logic later in your
                 build logic.
@@ -4434,9 +4528,9 @@ scons --compilers=mingw (the correct flag is --compiler)
                 Could cause SCons to run configure steps with the incorrect compiler. Costing developer time trying to
                 track down why the configure logic failed with a compiler which should work.
             </para>
-
-
-
+            <para>
+                <emphasis>New in version 4.5.0</emphasis>
+            </para>
         </listitem>
   </varlistentry>
   <varlistentry id="f-Value">
@@ -4454,10 +4548,6 @@ will be rebuilt.
 files are up-to-date.)
 When using timestamp source signatures, Value Nodes'
 timestamps are equal to the system time when the Node is created.
-<parameter>name</parameter> can be provided as an alternative name
-for the resulting <literal>Value</literal> node; this is advised
-if the <parameter>value</parameter> parameter can't be converted to
-a string.
 </para>
 
 <para>
@@ -4477,6 +4567,18 @@ method that will return the built value of the Node.
 </para>
 
 <para>
+The optional <parameter>name</parameter> parameter can be provided as an
+alternative name for the resulting <literal>Value</literal> node;
+this is advised if the <parameter>value</parameter> parameter
+cannot be converted to a string.
+</para>
+
+<para>
+<emphasis>Changed in version 4.0:</emphasis>
+the <parameter>name</parameter> parameter was added.
+</para>
+
+<para>
 Examples:
 </para>
 
@@ -4496,8 +4598,8 @@ prefix = ARGUMENTS.get('prefix', '/usr/local')
 
 # Attach a .Config() builder for the above function action
 # to the construction environment.
-env['BUILDERS']['Config'] = Builder(action = create)
-env.Config(target = 'package-config', source = Value(prefix))
+env['BUILDERS']['Config'] = Builder(action=create)
+env.Config(target='package-config', source=Value(prefix))
 
 def build_value(target, source, env):
     # A function that "builds" a Python Value by updating
@@ -4510,8 +4612,8 @@ input = env.Value('after')
 
 # Attach a .UpdateValue() builder for the above function
 # action to the construction environment.
-env['BUILDERS']['UpdateValue'] = Builder(action = build_value)
-env.UpdateValue(target = Value(output), source = Value(input))
+env['BUILDERS']['UpdateValue'] = Builder(action=build_value)
+env.UpdateValue(target=Value(output), source=Value(input))
 </example_commands>
 </listitem>
   </varlistentry>
@@ -4585,7 +4687,7 @@ The subsidiary SConscript file must be called as if it were in
 <parameter>variant_dir</parameter>,
 regardless of the value of
 <parameter>duplicate</parameter>.
-When calling an SConscript file, you can use the 
+When calling an SConscript file, you can use the
 <parameter>exports</parameter> keyword argument
 to pass parameters (individually or as an appropriately set up environment)
 so the SConscript can pick up the right settings for that variant build.
diff --git a/doc/generated/tools.gen b/doc/generated/tools.gen
index f05b470e7..c3b4cfc51 100644
--- a/doc/generated/tools.gen
+++ b/doc/generated/tools.gen
@@ -779,13 +779,13 @@ the Microsoft toolchain:
   <varlistentry id="t-msvc">
     <term>msvc</term>
     <listitem><para>
-Sets construction variables for the Microsoft Visual C/C++ compiler.
+Sets &consvars; for the Microsoft Visual C/C++ compiler.
 </para>
-<para>Sets: &cv-link-BUILDERS;, &cv-link-CC;, &cv-link-CCCOM;, &cv-link-CCDEPFLAGS;, &cv-link-CCFLAGS;, &cv-link-CCPCHFLAGS;, &cv-link-CCPDBFLAGS;, &cv-link-CFILESUFFIX;, &cv-link-CFLAGS;, &cv-link-CPPDEFPREFIX;, &cv-link-CPPDEFSUFFIX;, &cv-link-CXX;, &cv-link-CXXCOM;, &cv-link-CXXFILESUFFIX;, &cv-link-CXXFLAGS;, &cv-link-INCPREFIX;, &cv-link-INCSUFFIX;, &cv-link-OBJPREFIX;, &cv-link-OBJSUFFIX;, &cv-link-PCHCOM;, &cv-link-PCHPDBFLAGS;, &cv-link-RC;, &cv-link-RCCOM;, &cv-link-RCFLAGS;, &cv-link-SHCC;, &cv-link-SHCCCOM;, &cv-link-SHCCFLAGS;, &cv-link-SHCFLAGS;, &cv-link-SHCXX;, &cv-link-SHCXXCOM;, &cv-link-SHCXXFLAGS;, &cv-link-SHOBJPREFIX;, &cv-link-SHOBJSUFFIX;.</para><para>Uses: &cv-link-CCCOMSTR;, &cv-link-CXXCOMSTR;, &cv-link-MSVC_NOTFOUND_POLICY;, &cv-link-PCH;, &cv-link-PCHSTOP;, &cv-link-PDB;, &cv-link-SHCCCOMSTR;, &cv-link-SHCXXCOMSTR;.</para></listitem>
+<para>Sets: &cv-link-BUILDERS;, &cv-link-CC;, &cv-link-CCCOM;, &cv-link-CCDEPFLAGS;, &cv-link-CCFLAGS;, &cv-link-CCPCHFLAGS;, &cv-link-CCPDBFLAGS;, &cv-link-CFILESUFFIX;, &cv-link-CFLAGS;, &cv-link-CPPDEFPREFIX;, &cv-link-CPPDEFSUFFIX;, &cv-link-CXX;, &cv-link-CXXCOM;, &cv-link-CXXFILESUFFIX;, &cv-link-CXXFLAGS;, &cv-link-INCPREFIX;, &cv-link-INCSUFFIX;, &cv-link-OBJPREFIX;, &cv-link-OBJSUFFIX;, &cv-link-PCHCOM;, &cv-link-PCHPDBFLAGS;, &cv-link-RC;, &cv-link-RCCOM;, &cv-link-RCFLAGS;, &cv-link-SHCC;, &cv-link-SHCCCOM;, &cv-link-SHCCFLAGS;, &cv-link-SHCFLAGS;, &cv-link-SHCXX;, &cv-link-SHCXXCOM;, &cv-link-SHCXXFLAGS;, &cv-link-SHOBJPREFIX;, &cv-link-SHOBJSUFFIX;.</para><para>Uses: &cv-link-CCCOMSTR;, &cv-link-CXXCOMSTR;, &cv-link-MSVC_NOTFOUND_POLICY;, &cv-link-MSVC_SCRIPTERROR_POLICY;, &cv-link-MSVC_SCRIPT_ARGS;, &cv-link-MSVC_SDK_VERSION;, &cv-link-MSVC_SPECTRE_LIBS;, &cv-link-MSVC_TOOLSET_VERSION;, &cv-link-MSVC_USE_SCRIPT;, &cv-link-MSVC_USE_SCRIPT_ARGS;, &cv-link-MSVC_USE_SETTINGS;, &cv-link-MSVC_VERSION;, &cv-link-PCH;, &cv-link-PCHSTOP;, &cv-link-PDB;, &cv-link-SHCCCOMSTR;, &cv-link-SHCXXCOMSTR;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-msvs">
     <term>msvs</term>
-    <listitem><para>Sets construction variables for Microsoft Visual Studio.</para>
+    <listitem><para>Sets &consvars; 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">
@@ -867,13 +867,22 @@ provided to an Action that uses this environment.
   <varlistentry id="t-qt">
     <term>qt</term>
     <listitem><para>
+Placeholder tool to alert anyone still using qt tools to switch to qt3 or newer tool.
+</para>
+</listitem>
+  </varlistentry>
+  <varlistentry id="t-qt3">
+    <term>qt3</term>
+    <listitem><para>
 Sets &consvars; for building Qt3 applications.
 </para>
 
 <note><para>
 This tool is only suitable for building targeted to Qt3,
 which is obsolete
-(<emphasis>the tool is deprecated since 4.3</emphasis>).
+(<emphasis>the tool is deprecated since 4.3,
+and was renamed to qt3 in 4.5.0.
+</emphasis>).
 There are contributed tools for Qt4 and Qt5, see
 <ulink url="https://github.com/SCons/scons-contrib">
 https://github.com/SCons/scons-contrib</ulink>.
@@ -901,11 +910,11 @@ you have to explicitly specify it at Environment creation:
 </para>
 
 <example_commands>
-Environment(tools=['default','qt'])
+Environment(tools=['default','qt3'])
 </example_commands>
 
 <para>
-The &t-qt; tool supports the following operations:
+The &t-qt3; tool supports the following operations:
 </para>
 
 <para>
@@ -920,7 +929,7 @@ directory. It must have one of the suffixes
 <filename>.hxx</filename>,
 <filename>.hh</filename>.
 You can turn off automatic moc file generation by setting
-&cv-link-QT_AUTOSCAN; to <constant>False</constant>.
+&cv-link-QT3_AUTOSCAN; to <constant>False</constant>.
 See also the corresponding
 &b-link-Moc; Builder.
 </para>
@@ -930,11 +939,11 @@ See also the corresponding
 As described in the Qt documentation, include the moc file at the end of
 the C++ file. Note that you have to include the file, which is generated
 by the transformation
-<literal>${QT_MOCCXXPREFIX}&lt;basename&gt;${QT_MOCCXXSUFFIX}</literal>, by default
+<literal>${QT3_MOCCXXPREFIX}&lt;basename&gt;${QT3_MOCCXXSUFFIX}</literal>, by default
 <filename>&lt;basename&gt;.mo</filename>. A warning is generated after building the moc file if you
 do not include the correct file. If you are using &f-link-VariantDir;, you may
 need to specify <parameter>duplicate=True</parameter>.
-You can turn off automatic moc file generation by setting &cv-QT_AUTOSCAN; to
+You can turn off automatic moc file generation by setting &cv-QT3_AUTOSCAN; to
 <literal>False</literal>. See also the corresponding
 &b-link-Moc; Builder.
 </para>
@@ -952,7 +961,7 @@ you may need to specify <parameter>duplicate=True</parameter> in calls to
 See also the corresponding
 &b-link-Uic; Builder.
 </para>
-<para>Sets: &cv-link-QTDIR;, &cv-link-QT_AUTOSCAN;, &cv-link-QT_BINPATH;, &cv-link-QT_CPPPATH;, &cv-link-QT_LIB;, &cv-link-QT_LIBPATH;, &cv-link-QT_MOC;, &cv-link-QT_MOCCXXPREFIX;, &cv-link-QT_MOCCXXSUFFIX;, &cv-link-QT_MOCFROMCXXCOM;, &cv-link-QT_MOCFROMCXXFLAGS;, &cv-link-QT_MOCFROMHCOM;, &cv-link-QT_MOCFROMHFLAGS;, &cv-link-QT_MOCHPREFIX;, &cv-link-QT_MOCHSUFFIX;, &cv-link-QT_UIC;, &cv-link-QT_UICCOM;, &cv-link-QT_UICDECLFLAGS;, &cv-link-QT_UICDECLPREFIX;, &cv-link-QT_UICDECLSUFFIX;, &cv-link-QT_UICIMPLFLAGS;, &cv-link-QT_UICIMPLPREFIX;, &cv-link-QT_UICIMPLSUFFIX;, &cv-link-QT_UISUFFIX;.</para><para>Uses: &cv-link-QTDIR;.</para></listitem>
+<para>Sets: &cv-link-QT3DIR;, &cv-link-QT3_AUTOSCAN;, &cv-link-QT3_BINPATH;, &cv-link-QT3_CPPPATH;, &cv-link-QT3_LIB;, &cv-link-QT3_LIBPATH;, &cv-link-QT3_MOC;, &cv-link-QT3_MOCCXXPREFIX;, &cv-link-QT3_MOCCXXSUFFIX;, &cv-link-QT3_MOCFROMCXXCOM;, &cv-link-QT3_MOCFROMCXXFLAGS;, &cv-link-QT3_MOCFROMHCOM;, &cv-link-QT3_MOCFROMHFLAGS;, &cv-link-QT3_MOCHPREFIX;, &cv-link-QT3_MOCHSUFFIX;, &cv-link-QT3_UIC;, &cv-link-QT3_UICCOM;, &cv-link-QT3_UICDECLFLAGS;, &cv-link-QT3_UICDECLPREFIX;, &cv-link-QT3_UICDECLSUFFIX;, &cv-link-QT3_UICIMPLFLAGS;, &cv-link-QT3_UICIMPLPREFIX;, &cv-link-QT3_UICIMPLSUFFIX;, &cv-link-QT3_UISUFFIX;.</para><para>Uses: &cv-link-QT3DIR;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-rmic">
     <term>rmic</term>
@@ -1071,7 +1080,7 @@ Sets construction variables for the TeX formatter and typesetter.
     <listitem><para>
 Set &consvars; for the &b-Textfile; and &b-Substfile; builders.
 </para>
-<para>Sets: &cv-link-LINESEPARATOR;, &cv-link-SUBSTFILEPREFIX;, &cv-link-SUBSTFILESUFFIX;, &cv-link-TEXTFILEPREFIX;, &cv-link-TEXTFILESUFFIX;.</para><para>Uses: &cv-link-SUBST_DICT;.</para></listitem>
+<para>Sets: &cv-link-FILE_ENCODING;, &cv-link-LINESEPARATOR;, &cv-link-SUBSTFILEPREFIX;, &cv-link-SUBSTFILESUFFIX;, &cv-link-TEXTFILEPREFIX;, &cv-link-TEXTFILESUFFIX;.</para><para>Uses: &cv-link-SUBST_DICT;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-tlib">
     <term>tlib</term>
diff --git a/doc/generated/tools.mod b/doc/generated/tools.mod
index 35eea5e2b..cb92b4fb2 100644
--- a/doc/generated/tools.mod
+++ b/doc/generated/tools.mod
@@ -86,6 +86,7 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE.  DO NOT EDIT.
 <!ENTITY t-pdftex "<literal xmlns='http://www.scons.org/dbxsd/v1.0'>pdftex</literal>">
 <!ENTITY t-python "<literal xmlns='http://www.scons.org/dbxsd/v1.0'>python</literal>">
 <!ENTITY t-qt "<literal xmlns='http://www.scons.org/dbxsd/v1.0'>qt</literal>">
+<!ENTITY t-qt3 "<literal xmlns='http://www.scons.org/dbxsd/v1.0'>qt3</literal>">
 <!ENTITY t-rmic "<literal xmlns='http://www.scons.org/dbxsd/v1.0'>rmic</literal>">
 <!ENTITY t-rpcgen "<literal xmlns='http://www.scons.org/dbxsd/v1.0'>rpcgen</literal>">
 <!ENTITY t-sgiar "<literal xmlns='http://www.scons.org/dbxsd/v1.0'>sgiar</literal>">
@@ -192,6 +193,7 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE.  DO NOT EDIT.
 <!ENTITY t-link-pdftex "<link linkend='t-pdftex' xmlns='http://www.scons.org/dbxsd/v1.0'><literal>pdftex</literal></link>">
 <!ENTITY t-link-python "<link linkend='t-python' xmlns='http://www.scons.org/dbxsd/v1.0'><literal>python</literal></link>">
 <!ENTITY t-link-qt "<link linkend='t-qt' xmlns='http://www.scons.org/dbxsd/v1.0'><literal>qt</literal></link>">
+<!ENTITY t-link-qt3 "<link linkend='t-qt3' xmlns='http://www.scons.org/dbxsd/v1.0'><literal>qt3</literal></link>">
 <!ENTITY t-link-rmic "<link linkend='t-rmic' xmlns='http://www.scons.org/dbxsd/v1.0'><literal>rmic</literal></link>">
 <!ENTITY t-link-rpcgen "<link linkend='t-rpcgen' xmlns='http://www.scons.org/dbxsd/v1.0'><literal>rpcgen</literal></link>">
 <!ENTITY t-link-sgiar "<link linkend='t-sgiar' xmlns='http://www.scons.org/dbxsd/v1.0'><literal>sgiar</literal></link>">
diff --git a/doc/generated/variables.gen b/doc/generated/variables.gen
index fdfa9bc9c..42935a317 100644
--- a/doc/generated/variables.gen
+++ b/doc/generated/variables.gen
@@ -448,7 +448,7 @@ Options added to the compiler command line
 to support building with precompiled headers.
 The default value expands expands to the appropriate
 Microsoft Visual C++ command-line options
-when the &cv-link-PCH; construction variable is set.
+when the &cv-link-PCH; &consvar; is set.
 </para>
 </listitem>
   </varlistentry>
@@ -462,7 +462,7 @@ to support storing debugging information in a
 Microsoft Visual C++ PDB file.
 The default value expands expands to appropriate
 Microsoft Visual C++ command-line options
-when the &cv-link-PDB; construction variable is set.
+when the &cv-link-PDB; &consvar; is set.
 </para>
 
 <para>
@@ -709,69 +709,112 @@ to each definition in &cv-link-CPPDEFINES;.
     </term>
     <listitem><para>
 A platform independent specification of C preprocessor macro definitions.
-The definitions will be added to command lines
+The definitions are added to command lines
 through the automatically-generated
-&cv-link-_CPPDEFFLAGS; &consvar; (see above),
+&cv-link-_CPPDEFFLAGS; &consvar;,
 which is constructed according to
-the type of value of &cv-CPPDEFINES;:
+the contents of &cv-CPPDEFINES;:
 </para>
 
+<itemizedlist>
+<listitem>
 <para>
 If &cv-CPPDEFINES; is a string,
 the values of the
 &cv-link-CPPDEFPREFIX; and &cv-link-CPPDEFSUFFIX; &consvars;
-will be respectively prepended and appended to 
-each definition in &cv-link-CPPDEFINES;.
+are respectively prepended and appended to
+each definition in &cv-CPPDEFINES;,
+split on whitespace.
 </para>
 
 <example_commands>
-# Will add -Dxyz to POSIX compiler command lines,
+# Adds -Dxyz to POSIX compiler command lines,
 # and /Dxyz to Microsoft Visual C++ command lines.
 env = Environment(CPPDEFINES='xyz')
 </example_commands>
 
+</listitem>
+<listitem>
 <para>
 If &cv-CPPDEFINES; is a list,
 the values of the
 &cv-CPPDEFPREFIX; and &cv-CPPDEFSUFFIX; &consvars;
-will be respectively prepended and appended to 
+are respectively prepended and appended to
 each element in the list.
-If any element is a list or tuple,
-then the first item is the name being
-defined and the second item is its value:
+If any element is a tuple (or list)
+then the first item of the tuple is the macro name
+and the second is the macro definition.
+If the definition is not omitted or <literal>None</literal>,
+the name and definition are combined into a single
+<literal>name=definition</literal> item
+before the preending/appending.
 </para>
 
 <example_commands>
-# Will add -DB=2 -DA to POSIX compiler command lines,
+# Adds -DB=2 -DA to POSIX compiler command lines,
 # and /DB=2 /DA to Microsoft Visual C++ command lines.
 env = Environment(CPPDEFINES=[('B', 2), 'A'])
 </example_commands>
 
+</listitem>
+<listitem>
 <para>
 If &cv-CPPDEFINES; is a dictionary,
 the values of the
 &cv-CPPDEFPREFIX; and &cv-CPPDEFSUFFIX; &consvars;
-will be respectively prepended and appended to
-each item from the dictionary.
-The key of each dictionary item
-is a name being defined
-to the dictionary item's corresponding value;
-if the value is
-<literal>None</literal>,
-then the name is defined without an explicit value.
-Note that the resulting flags are sorted by keyword
-to ensure that the order of the options on the
-command line is consistent each time
-&scons;
-is run.
+are respectively prepended and appended to
+each key from the dictionary.
+If the value for a key is not <literal>None</literal>,
+then the key (macro name) and the value
+(macros definition) are combined into a single
+<literal>name=definition</literal> item
+before the prepending/appending.
 </para>
 
 <example_commands>
-# Will add -DA -DB=2 to POSIX compiler command lines,
-# and /DA /DB=2 to Microsoft Visual C++ command lines.
+# Adds -DA -DB=2 to POSIX compiler command lines,
+# or /DA /DB=2 to Microsoft Visual C++ command lines.
 env = Environment(CPPDEFINES={'B':2, 'A':None})
 </example_commands>
 </listitem>
+</itemizedlist>
+
+<para>
+Depending on how contents are added to &cv-CPPDEFINES;,
+it may be transformed into a compound type,
+for example a list containing strings, tuples and/or dictionaries.
+&SCons; can correctly expand such a compound type.
+</para>
+
+<para>
+Note that &SCons; may call the compiler via a shell.
+If a macro definition contains characters such as spaces that
+have meaning to the shell, or is intended to be a string value,
+you may need to use the shell's quoting syntax to avoid
+interpretation by the shell before the preprocessor sees it.
+Function-like macros are not supported via this mechanism
+(and some compilers do not even implement that functionality
+via the command lines).
+When quoting, note that
+one set of quote characters are used to define a &Python; string,
+then quotes embedded inside that would be consumed by the shell
+unless escaped.  These examples may help illustrate:
+</para>
+
+<example_commands>
+env = Environment(CPPDEFINES=['USE_ALT_HEADER=\\"foo_alt.h\\"'])
+env = Environment(CPPDEFINES=[('USE_ALT_HEADER', '\\"foo_alt.h\\"')])
+</example_commands>
+
+<para>
+:<emphasis>Changed in version  4.5</emphasis>:
+&SCons; no longer sorts &cv-CPPDEFINES; values entered
+in dictionary form.  &Python; now preserves dictionary
+keys in the order they are entered, so it is no longer
+necessary to sort them to ensure a stable command line.
+</para>
+
+</listitem>
   </varlistentry>
   <varlistentry id="cv-CPPDEFPREFIX">
     <term>
@@ -2658,6 +2701,16 @@ target being built.
 </para>
 </listitem>
   </varlistentry>
+  <varlistentry id="cv-FILE_ENCODING">
+    <term>
+      <envar>FILE_ENCODING</envar>
+    </term>
+    <listitem><para>
+File encoding used for files written by &b-link-Textfile; and &b-link-Substfile;.  Set to "utf-8" by default.
+<emphasis>Added in version  4.5.0.</emphasis>
+</para>
+</listitem>
+  </varlistentry>
   <varlistentry id="cv-FORTRAN">
     <term>
       <envar>FORTRAN</envar>
@@ -2689,8 +2742,9 @@ in the &cv-link-FORTRANFLAGS;,
     <listitem><para>
 General user-specified options that are passed to the Fortran compiler.
 Similar to &cv-link-FORTRANFLAGS;,
-but this variable is applied to all dialects.
+but this &consvar; is applied to all dialects.
 </para>
+<para><emphasis>New in version 4.4.</emphasis></para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-FORTRANCOMSTR">
@@ -2729,9 +2783,8 @@ contain
 (or similar) include or module search path options
 that scons generates automatically from &cv-link-FORTRANPATH;.
 See
-&cv-link-_FORTRANINCFLAGS; and &cv-link-_FORTRANMODFLAG;,
-below,
-for the variables that expand those options.
+&cv-link-_FORTRANINCFLAGS; and &cv-link-_FORTRANMODFLAG;
+for the &consvars; that expand those options.
 </para>
 </listitem>
   </varlistentry>
@@ -3225,14 +3278,13 @@ determine the version of versioned import library.
       <envar>IMPLICIT_COMMAND_DEPENDENCIES</envar>
     </term>
     <listitem><para>
-Controls whether or not SCons will
+Controls whether or not &SCons; will
 add implicit dependencies for the commands
 executed to build targets.
 </para>
 
 <para>
-By default, SCons will add
-to each target
+By default, &SCons; will add to each target
 an implicit dependency on the command
 represented by the first argument of any
 command line it executes (which is typically
@@ -3476,16 +3528,30 @@ by default.
       <envar>JAVABOOTCLASSPATH</envar>
     </term>
     <listitem><para>
-                Specifies the list of directories that
-                will be added to the
-                &javac; 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).
+                Specifies the location of the bootstrap class files.
+                Can be specified as a string or Node object,
+                or as a list of strings or Node objects.
             </para>
+            <para>
+                The value will be added to the JDK command lines
+                via the <option>-bootclasspath</option> option,
+                which requires a system-specific search path separator.
+                This will be supplied by &SCons; as needed when it
+                constructs the command line if &cv-JAVABOOTCLASSPATH; is
+                provided in list form.
+                If &cv-JAVABOOTCLASSPATH; is a single string containing
+                search path separator characters
+                (<literal>:</literal> for POSIX systems or
+                <literal>;</literal> for Windows), it will not be modified;
+                and so is inherently system-specific;
+                to supply the path in a system-independent manner,
+                give &cv-JAVABOOTCLASSPATH; as a list of paths instead.
+            </para>
+            <note>
+                <para>
+                    Can only be used when compiling for releases prior to JDK 9.
+                </para>
+            </note>
         </listitem>
   </varlistentry>
   <varlistentry id="cv-JAVAC">
@@ -3541,10 +3607,9 @@ env = Environment(JAVACCOMSTR="Compiling class files $TARGETS from $SOURCES")
     </term>
     <listitem><para>
                 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.
+                This is stripped from the beginning of any Java
+                <filename>.class</filename>
+                file names supplied to the &b-link-JavaH; builder.
             </para>
         </listitem>
   </varlistentry>
@@ -3553,19 +3618,54 @@ env = Environment(JAVACCOMSTR="Compiling class files $TARGETS from $SOURCES")
       <envar>JAVACLASSPATH</envar>
     </term>
     <listitem><para>
-                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
-                &javac; and &javah; 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).
+                Specifies the class search path for the JDK tools.
+                Can be specified as a string or Node object,
+                or as a list of strings or Node objects.
+                Class path entries may be directory names to search
+                for class files or packages, pathnames to archives
+                (<filename>.jar</filename> or <filename>.zip</filename>)
+                containing classes, or paths ending in a "base name wildcard"
+                character (<literal>*</literal>), which matches files
+                in that directory with a <filename>.jar</filename> suffix.
+                See the Java documentation for more details.
             </para>
+            <para>
+                The value will be added to the JDK command lines
+                via the <option>-classpath</option> option,
+                which requires a system-specific search path separator.
+                This will be supplied by &SCons; as needed when it
+                constructs the command line if &cv-JAVACLASSPATH; is
+                provided in list form.
+                If &cv-JAVACLASSPATH; is a single string containing
+                search path separator characters
+                (<literal>:</literal> for POSIX systems or
+                <literal>;</literal> for Windows), 
+                it will be split on the separator into a list of individual
+                paths for dependency scanning purposes.
+                It will not be modified for JDK command-line usage,
+                so such a string is inherently system-specific;
+                to supply the path in a system-independent manner,
+                give &cv-JAVACLASSPATH; as a list of paths instead.
+            </para>
+            <note>
+              <para>
+                &SCons; <emphasis role="bold">always</emphasis>
+                supplies a <option>-sourcepath</option> 
+                when invoking the Java compiler &javac;,
+                regardless of the setting of &cv-link-JAVASOURCEPATH;,
+                as it passes the path(s) to the source(s) supplied
+                in the call to the &b-link-Java; builder via
+                <option>-sourcepath</option> .
+                From the documentation of the standard Java toolkit for &javac;:
+                <quote>If not compiling code for modules, if the
+                <option>--source-path</option> or <option>-sourcepath</option>
+                option is not specified, then the user class path is also
+                searched for source files.</quote>
+                Since <option>-sourcepath</option> is always supplied,
+                &javac; will not use the contents of the value of
+                &cv-JAVACLASSPATH; when searching for sources.
+              </para>
+            </note>
         </listitem>
   </varlistentry>
   <varlistentry id="cv-JAVACLASSSUFFIX">
@@ -3630,7 +3730,37 @@ for Java classes.
       <envar>JAVAINCLUDES</envar>
     </term>
     <listitem><para>
-                Include path for Java header files (such as jni.h)
+                Include path for Java header files
+                (such as <filename>jni.h</filename>).
+            </para>
+        </listitem>
+  </varlistentry>
+  <varlistentry id="cv-JAVAPROCESSORPATH">
+    <term>
+      <envar>JAVAPROCESSORPATH</envar>
+    </term>
+    <listitem><para>
+                Specifies the location of the annotation processor class files.
+                Can be specified as a string or Node object,
+                or as a list of strings or Node objects.
+            </para>
+            <para>
+                The value will be added to the JDK command lines
+                via the <option>-processorpath</option> option,
+                which requires a system-specific search path separator.
+                This will be supplied by &SCons; as needed when it
+                constructs the command line if &cv-JAVAPROCESSORPATH; is
+                provided in list form.
+                If &cv-JAVAPROCESSORPATH; is a single string containing
+                search path separator characters
+                (<literal>:</literal> for POSIX systems or
+                <literal>;</literal> for Windows), it will not be modified;
+                and so is inherently system-specific;
+                to supply the path in a system-independent manner,
+                give &cv-JAVAPROCESSORPATH; as a list of paths instead.
+            </para>
+            <para>
+                <emphasis>New in version 4.5.0</emphasis>
             </para>
         </listitem>
   </varlistentry>
@@ -3640,24 +3770,31 @@ for Java classes.
     </term>
     <listitem><para>
                 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
-                &javac; 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).
+                will be searched for input (source)
+                <filename>.java</filename> files.
+                Can be specified as a string or Node object,
+                or as a list of strings or Node objects.
+            </para>
+            <para>
+                The value will be added to the JDK command lines
+                via the <option>-sourcepath</option> option,
+                which requires a system-specific search path separator,
+                This will be supplied by &SCons; as needed when it
+                constructs the command line if &cv-JAVASOURCEPATH; is
+                provided in list form.
+                If &cv-JAVASOURCEPATH; is a single string containing
+                search path separator characters
+                (<literal>:</literal> for POSIX systems or
+                <literal>;</literal> for Windows), it will not be modified,
+                and so is inherently system-specific;
+                to supply the path in a system-independent manner,
+                give &cv-JAVASOURCEPATH; as a list of paths instead.
             </para>
-
             <para>
-                Note that this currently just adds the specified
-                directory via the <option>-sourcepath</option> option.
+                Note that the specified directories are only added to
+                the command line via the <option>-sourcepath</option> option.
                 &SCons; does not currently search the
-                &cv-JAVASOURCEPATH; directories for dependency
+                &cv-JAVASOURCEPATH; directories for dependent
                 <filename>.java</filename>
                 files.
             </para>
@@ -4720,11 +4857,11 @@ compilation of object files
 when calling the Microsoft Visual C/C++ compiler.
 All compilations of source files from the same source directory
 that generate target files in a same output directory
-and were configured in SCons using the same construction environment
+and were configured in SCons using the same &consenv;
 will be built in a single call to the compiler.
 Only source files that have changed since their
 object files were built will be passed to each compiler invocation
-(via the &cv-link-CHANGED_SOURCES; construction variable).
+(via the &cv-link-CHANGED_SOURCES; &consvar;).
 Any compilations where the object (target) file base name
 (minus the <filename>.obj</filename>)
 does not match the source file base name
@@ -4839,6 +4976,8 @@ When &cv-MSVC_NOTFOUND_POLICY; is not specified, the default &scons; behavior is
 subject to the conditions listed above. The default &scons; behavior may change in the future.
 </para>
 
+<para><emphasis>New in version 4.4</emphasis></para>
+
 </listitem>
   </varlistentry>
   <varlistentry id="cv-MSVC_SCRIPT_ARGS">
@@ -4851,8 +4990,8 @@ Pass user-defined arguments to the Visual C++ batch file determined via autodete
 
 <para>
 &cv-MSVC_SCRIPT_ARGS; is available for msvc batch file arguments that do not have first-class support
-via construction variables or when there is an issue with the appropriate construction variable validation.
-When available, it is recommended to use the appropriate construction variables (e.g., &cv-link-MSVC_TOOLSET_VERSION;)
+via &consvars; or when there is an issue with the appropriate &consvar; validation.
+When available, it is recommended to use the appropriate &consvars; (e.g., &cv-link-MSVC_TOOLSET_VERSION;)
 rather than &cv-MSVC_SCRIPT_ARGS; arguments.
 </para>
 
@@ -4976,6 +5115,8 @@ and compatible with the version of msvc selected.
 </itemizedlist>
 </para>
 
+<para><emphasis>New in version 4.4</emphasis></para>
+
 </listitem>
   </varlistentry>
   <varlistentry id="cv-MSVC_SCRIPTERROR_POLICY">
@@ -5028,6 +5169,9 @@ Issue a warning when msvc batch file errors are detected.
 <para>
 Suppress msvc batch file error messages.
 </para>
+
+<para><emphasis>New in version 4.4</emphasis></para>
+
 </listitem>
 </varlistentry>
 
@@ -5102,6 +5246,8 @@ when setting the script error policy to raise an exception (e.g., <literal>'Erro
 </itemizedlist>
 </para>
 
+<para><emphasis>New in version 4.4</emphasis></para>
+
 </listitem>
   </varlistentry>
   <varlistentry id="cv-MSVC_SDK_VERSION">
@@ -5221,6 +5367,8 @@ specify a Windows 10 SDK (e.g., <literal>'10.0.20348.0'</literal>) for the build
 </itemizedlist>
 </para>
 
+<para><emphasis>New in version 4.4</emphasis></para>
+
 </listitem>
   </varlistentry>
   <varlistentry id="cv-MSVC_SPECTRE_LIBS">
@@ -5302,6 +5450,8 @@ The burden is on the user to ensure the requisite libraries with spectre mitigat
 </itemizedlist>
 </para>
 
+<para><emphasis>New in version 4.4</emphasis></para>
+
 </listitem>
   </varlistentry>
   <varlistentry id="cv-MSVC_TOOLSET_VERSION">
@@ -5473,6 +5623,8 @@ The burden is on the user to ensure the requisite toolset target architecture bu
 </itemizedlist>
 </para>
 
+<para><emphasis>New in version 4.4</emphasis></para>
+
 </listitem>
   </varlistentry>
   <varlistentry id="cv-MSVC_USE_SCRIPT">
@@ -5500,7 +5652,7 @@ This can be useful to force the use of a compiler version that
 Setting
 &cv-MSVC_USE_SCRIPT; to <constant>None</constant> bypasses the
 Visual Studio autodetection entirely;
-use this if you are running SCons in a Visual Studio <command>cmd</command>
+use this if you are running &SCons; in a Visual Studio <command>cmd</command>
 window and importing the shell's environment variables - that
 is, if you are sure everything is set correctly already and
 you don't want &SCons; to change anything.
@@ -5508,6 +5660,12 @@ you don't want &SCons; to change anything.
 <para>
 &cv-MSVC_USE_SCRIPT; ignores &cv-link-MSVC_VERSION; and &cv-link-TARGET_ARCH;.
 </para>
+
+<para><emphasis>Changed in version 4.4:</emphasis>
+new &cv-link-MSVC_USE_SCRIPT_ARGS; provides a
+way to pass arguments.
+</para>
+
 </listitem>
   </varlistentry>
   <varlistentry id="cv-MSVC_USE_SCRIPT_ARGS">
@@ -5517,6 +5675,9 @@ you don't want &SCons; to change anything.
     <listitem><para>
 Provides arguments passed to the script &cv-link-MSVC_USE_SCRIPT;.
 </para>
+
+<para><emphasis>New in version 4.4</emphasis></para>
+
 </listitem>
   </varlistentry>
   <varlistentry id="cv-MSVC_USE_SETTINGS">
@@ -5598,11 +5759,15 @@ therefore may change at any time.
 </emphasis>
 The burden is on the user to ensure the dictionary contents are minimally sufficient to
 ensure successful builds.
-</para></listitem>
+</para>
+
+</listitem>
 
 </itemizedlist>
 </para>
 
+<para><emphasis>New in version 4.4</emphasis></para>
+
 </listitem>
   </varlistentry>
   <varlistentry id="cv-MSVC_UWP_APP">
@@ -5683,12 +5848,10 @@ The burden is on the user to ensure the requisite UWP libraries are installed.
     </term>
     <listitem><para>
 Sets the preferred  version of Microsoft Visual C/C++ to use.
-</para>
-
-<para>
+If the specified version is unavailable (not installed,
+or not discoverable), tool initialization will fail.
 If &cv-MSVC_VERSION; is not set, SCons will (by default) select the
-latest version of Visual C/C++ installed on your system.  If the
-specified version isn't installed, tool initialization will fail.
+latest version of Visual C/C++ installed on your system.
 </para>
 
 <para>
@@ -5701,28 +5864,186 @@ loaded into the environment.
 </para>
 
 <para>
-Valid values for Windows are
-<literal>14.3</literal>,
-<literal>14.2</literal>,
-<literal>14.1</literal>,
-<literal>14.1Exp</literal>,
-<literal>14.0</literal>,
-<literal>14.0Exp</literal>,
-<literal>12.0</literal>,
-<literal>12.0Exp</literal>,
-<literal>11.0</literal>,
-<literal>11.0Exp</literal>,
-<literal>10.0</literal>,
-<literal>10.0Exp</literal>,
-<literal>9.0</literal>,
-<literal>9.0Exp</literal>,
-<literal>8.0</literal>,
-<literal>8.0Exp</literal>,
-<literal>7.1</literal>,
-<literal>7.0</literal>,
-and <literal>6.0</literal>.
-Versions ending in <literal>Exp</literal> refer to "Express" or
-"Express for Desktop" editions.
+The valid values for &cv-MSVC_VERSION; represent major versions
+of the compiler, except that versions ending in <literal>Exp</literal>
+refer to "Express" or "Express for Desktop" Visual Studio editions,
+which require distict entries because they use a different
+filesystem layout and have some feature limitations compared to
+the full version.
+The following table shows correspondence
+of the selector string to various version indicators
+('x' is used as a placeholder for
+a single digit that can vary).
+Note that it is not necessary to install Visual Studio
+to build with &SCons; (for example, you can install only
+Build Tools), but if Visual Studio is installed,
+additional builders such as &b-link-MSVSSolution; and
+&b-link-MSVSProject; become avaialable and will
+correspond to the indicated versions.
+</para>
+
+<informaltable>
+  <tgroup cols="5">
+    <colspec align="left"/>
+    <colspec align="center"/>
+    <colspec align="center"/>
+    <colspec align="left"/>
+    <colspec align="center"/>
+    <thead>
+      <row>
+        <entry> SCons Key </entry>
+        <entry> MSVC++ Version </entry>
+        <entry> <literal>_MSVC_VER</literal> </entry>
+        <entry> VS Product </entry>
+        <entry> MSBuild/VS Version </entry>
+      </row>
+    </thead>
+    <tbody>
+      <row>
+        <entry> <literal>14.3</literal> </entry>
+        <entry> 14.3x </entry>
+        <entry> 193x </entry>
+        <entry> Visual Studio 2022 </entry>
+        <entry> 17.x </entry>
+      </row>
+      <row>
+        <entry> <literal>14.2</literal> </entry>
+        <entry> 14.2x </entry>
+        <entry> 192x </entry>
+        <entry> Visual Studio 2019 </entry>
+        <entry> 16.x, 16.1x </entry>
+      </row>
+      <row>
+        <entry> <literal>14.1</literal> </entry>
+        <entry> 14.1 or 14.1x </entry>
+        <entry> 191x </entry>
+        <entry> Visual Studio 2017 </entry>
+        <entry> 15.x </entry>
+      </row>
+      <row>
+        <entry> <literal>14.1Exp</literal> </entry>
+        <entry> 14.1 </entry>
+        <entry> 1910 </entry>
+        <entry> Visual Studio 2017 Express </entry>
+        <entry> 15.0 </entry>
+      </row>
+      <row>
+        <entry> <literal>14.0</literal> </entry>
+        <entry> 14.0 </entry>
+        <entry> 1900 </entry>
+        <entry> Visual Studio 2015 </entry>
+        <entry> 14.0 </entry>
+      </row>
+      <row>
+        <entry> <literal>14.0Exp</literal> </entry>
+        <entry> 14.0 </entry>
+        <entry> 1900 </entry>
+        <entry> Visual Studio 2015 Express </entry>
+        <entry> 14.0 </entry>
+      </row>
+      <row>
+        <entry> <literal>12.0</literal> </entry>
+        <entry> 12.0 </entry>
+        <entry> 1800 </entry>
+        <entry> Visual Studio 2013 </entry>
+        <entry> 12.0 </entry>
+      </row>
+      <row>
+        <entry> <literal>12.0Exp</literal> </entry>
+        <entry> 12.0 </entry>
+        <entry> 1800 </entry>
+        <entry> Visual Studio 2013 Express </entry>
+        <entry> 12.0 </entry>
+      </row>
+      <row>
+        <entry> <literal>11.0</literal> </entry>
+        <entry> 11.0 </entry>
+        <entry> 1700 </entry>
+        <entry> Visual Studio 2012 </entry>
+        <entry> 11.0 </entry>
+      </row>
+      <row>
+        <entry> <literal>11.0Exp</literal> </entry>
+        <entry> 11.0 </entry>
+        <entry> 1700 </entry>
+        <entry> Visual Studio 2012 Express </entry>
+        <entry> 11.0 </entry>
+      </row>
+      <row>
+        <entry> <literal>10.0</literal> </entry>
+        <entry> 10.0 </entry>
+        <entry> 1600 </entry>
+        <entry> Visual Studio 2010 </entry>
+        <entry> 10.0 </entry>
+      </row>
+      <row>
+        <entry> <literal>10.0Exp</literal> </entry>
+        <entry> 10.0 </entry>
+        <entry> 1600 </entry>
+        <entry> Visual C++ Express 2010 </entry>
+        <entry> 10.0 </entry>
+      </row>
+      <row>
+        <entry> <literal>9.0</literal> </entry>
+        <entry> 9.0 </entry>
+        <entry> 1500 </entry>
+        <entry> Visual Studio 2008 </entry>
+        <entry> 9.0 </entry>
+      </row>
+      <row>
+        <entry> <literal>9.0Exp</literal> </entry>
+        <entry> 9.0 </entry>
+        <entry> 1500 </entry>
+        <entry> Visual C++ Express 2008 </entry>
+        <entry> 9.0 </entry>
+      </row>
+      <row>
+        <entry> <literal>8.0</literal> </entry>
+        <entry> 8.0 </entry>
+        <entry> 1400 </entry>
+        <entry> Visual Studio 2005 </entry>
+        <entry> 8.0 </entry>
+      </row>
+      <row>
+        <entry> <literal>8.0Exp</literal> </entry>
+        <entry> 8.0 </entry>
+        <entry> 1400 </entry>
+        <entry> Visual C++ Express 2005 </entry>
+        <entry> 8.0 </entry>
+      </row>
+      <row>
+        <entry> <literal>7.1</literal> </entry>
+        <entry> 7.1 </entry>
+        <entry> 1300 </entry>
+        <entry> Visual Studio .NET 2003 </entry>
+        <entry> 7.1 </entry>
+      </row>
+      <row>
+        <entry> <literal>7.0</literal> </entry>
+        <entry> 7.0 </entry>
+        <entry> 1200 </entry>
+        <entry> Visual Studio .NET 2002 </entry>
+        <entry> 7.0 </entry>
+      </row>
+      <row>
+        <entry> <literal>6.0</literal> </entry>
+        <entry> 6.0 </entry>
+        <entry> 1100 </entry>
+        <entry> Visual Studio 6.0 </entry>
+        <entry> 6.0 </entry>
+      </row>
+    </tbody>
+  </tgroup>
+</informaltable>
+
+<para>
+The compilation environment can be further or more precisely specified through the
+use of several other &consvars;: see the descriptions of
+&cv-link-MSVC_TOOLSET_VERSION;,
+&cv-link-MSVC_SDK_VERSION;,
+&cv-link-MSVC_USE_SCRIPT;,
+&cv-link-MSVC_USE_SCRIPT_ARGS;,
+and &cv-link-MSVC_USE_SETTINGS;.
 </para>
 
 </listitem>
@@ -5737,28 +6058,39 @@ Versions ending in <literal>Exp</literal> refer to "Express" or
       </para>
       <variablelist>
         <varlistentry>
-          <term>VERSION</term> <listitem>
+          <term>VERSION</term>
+          <listitem>
             <para>the version of MSVS being used (can be set via
-            &cv-link-MSVS_VERSION;)</para>
+            &cv-link-MSVC_VERSION;)</para>
           </listitem>
-        </varlistentry> <varlistentry>
-          <term>VERSIONS</term> <listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>VERSIONS</term>
+          <listitem>
             <para>the available versions of MSVS installed</para>
           </listitem>
-        </varlistentry> <varlistentry>
-          <term>VCINSTALLDIR</term> <listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>VCINSTALLDIR</term>
+          <listitem>
             <para>installed directory of Visual C++</para>
           </listitem>
-        </varlistentry> <varlistentry>
-          <term>VSINSTALLDIR</term> <listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>VSINSTALLDIR</term>
+          <listitem>
             <para>installed directory of Visual Studio</para>
           </listitem>
-        </varlistentry> <varlistentry>
-          <term>FRAMEWORKDIR</term> <listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>FRAMEWORKDIR</term>
+          <listitem>
             <para>installed directory of the .NET framework</para>
           </listitem>
-        </varlistentry> <varlistentry>
-          <term>FRAMEWORKVERSIONS</term> <listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>FRAMEWORKVERSIONS</term>
+          <listitem>
             <para>
               list of installed versions of the .NET framework,
               sorted latest to oldest.
@@ -5795,7 +6127,12 @@ Versions ending in <literal>Exp</literal> refer to "Express" or
           </listitem>
         </varlistentry>
       </variablelist>
-      <para>If a value is not set, it was not available in the registry.</para>
+      <para>If a value is not set, it was not available in the registry.
+      Visual Studio 2017 and later do not use the registry for
+      primary storage of this information, so typically for these
+      versions only  <literal>PROJECTSUFFIX</literal> and
+      <literal>SOLUTIONSUFFIX</literal> will be set.
+      </para>
     </listitem>
   </varlistentry>
   <varlistentry id="cv-MSVS_ARCH">
@@ -5821,7 +6158,7 @@ Versions ending in <literal>Exp</literal> refer to "Express" or
     </term>
     <listitem><para>
         The string placed in a generated
-Microsoft Visual Studio project file as the value of the
+Microsoft Visual C++ project file as the value of the
         <literal>ProjectGUID</literal> attribute. There is no default
         value. If not
 defined, a new GUID is generated.
@@ -5835,9 +6172,9 @@ defined, a new GUID is generated.
     </term>
     <listitem><para>
         The path name placed in a generated
-Microsoft Visual Studio project file as the value of the
+Microsoft Visual C++ project file as the value of the
         <literal>SccAuxPath</literal> attribute if the
-        <envar>MSVS_SCC_PROVIDER</envar> construction variable is
+        <envar>MSVS_SCC_PROVIDER</envar> &consvar; is
         also set. There is
 no default value.
 
@@ -5852,7 +6189,7 @@ no default value.
         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
+        relative paths of the generated Microsoft Visual C++ 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
@@ -5865,7 +6202,7 @@ no default value.
         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
+        the <envar>MSVS_SCC_PROVIDER</envar> &consvar; is
         also set. The default value is the current working directory.
       </para>
     </listitem>
@@ -5876,9 +6213,9 @@ no default value.
     </term>
     <listitem><para>
         The project name placed in a generated Microsoft
-        Visual Studio project file as the value of the
+        Visual C++ project file as the value of the
         <literal>SccProjectName</literal> attribute if the
-        <envar>MSVS_SCC_PROVIDER</envar> construction variable
+        <envar>MSVS_SCC_PROVIDER</envar> &consvar;
         is also set. In this case the string is also placed in
         the <literal>SccProjectName0</literal> attribute of the
         <literal>GlobalSection(SourceCodeControl)</literal> section
@@ -5893,7 +6230,7 @@ no default value.
     </term>
     <listitem><para>
         The string placed in a generated Microsoft
-        Visual Studio project file as the value of the
+        Visual C++ 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>
@@ -5906,23 +6243,25 @@ no default value.
     <term>
       <envar>MSVS_VERSION</envar>
     </term>
-    <listitem><para>Sets the preferred version of Microsoft Visual Studio to use.</para>
+    <listitem><para>Set the preferred version of Microsoft Visual Studio to use.</para>
       <para>
         If &cv-MSVS_VERSION; is not set, &SCons; 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
+        specifying the &cv-link-MSVS_VERSION; variable when
+        initializing the Environment, 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>
-        This is obsolete: use &cv-MSVC_VERSION; instead. If
-        &cv-MSVS_VERSION; is set and &cv-MSVC_VERSION; is
-        not, &cv-MSVC_VERSION; will be set automatically to
-        &cv-MSVS_VERSION;. If both are set to different values,
-        scons will raise an error.
+        <emphasis>Deprecated since 1.3.0:</emphasis>
+        &cv-MSVS_VERSION; is deprecated in favor of &cv-link-MSVC_VERSION;.
+        As a transitional aid, if &cv-MSVS_VERSION; is set
+        and &cv-MSVC_VERSION; is not,
+        &cv-MSVC_VERSION; will be initialized to the value
+        of &cv-MSVS_VERSION;.
+        An error is raised if If both are set and have different values,
       </para>
     </listitem>
   </varlistentry>
@@ -5932,8 +6271,8 @@ no default value.
     </term>
     <listitem><para>
         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.
+        C++ project file. The default is to have Visual Studio
+        invoke &SCons; with any specified build targets.
       </para>
     </listitem>
   </varlistentry>
@@ -5943,9 +6282,9 @@ no default value.
     </term>
     <listitem><para>
         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.
+        C++ project file. The default is to have Visual Studio
+        invoke &SCons; with the <option>-c</option> option to remove
+        any specified targets.
       </para>
     </listitem>
   </varlistentry>
@@ -5955,7 +6294,7 @@ no default value.
     </term>
     <listitem><para>
         The encoding string placed in a generated Microsoft
-        Visual Studio project file. The default is encoding
+        Visual C++ project file. The default is encoding
         <literal>Windows-1252</literal>.
       </para>
     </listitem>
@@ -5964,7 +6303,7 @@ no default value.
     <term>
       <envar>MSVSPROJECTCOM</envar>
     </term>
-    <listitem><para>The action used to generate Microsoft Visual Studio project files.</para>
+    <listitem><para>The action used to generate Microsoft Visual C++ project files.</para>
     </listitem>
   </varlistentry>
   <varlistentry id="cv-MSVSPROJECTSUFFIX">
@@ -5972,11 +6311,12 @@ no default value.
       <envar>MSVSPROJECTSUFFIX</envar>
     </term>
     <listitem><para>
-        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.
+        The suffix used for Microsoft Visual C++ project (DSP)
+        files. The default value is 
+        <filename>.vcxproj</filename> when using Visual Studio 2010
+        and later, <filename>.vcproj</filename>
+        when using Visual Studio versions between 2002 and 2008,
+        and <filename>.dsp</filename> when using Visual Studio 6.0.
       </para>
     </listitem>
   </varlistentry>
@@ -5986,8 +6326,8 @@ no default value.
     </term>
     <listitem><para>
         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.
+        Visual C++ project file. The default is to have Visual
+        Studio invoke &SCons; with any specified rebuild targets.
 
       </para>
     </listitem>
@@ -5997,8 +6337,8 @@ no default value.
       <envar>MSVSSCONS</envar>
     </term>
     <listitem><para>
-        The SCons used in generated Microsoft Visual Studio project
-        files. The default is the version of SCons being used to
+        The &SCons; used in generated Microsoft Visual C++ project
+        files. The default is the version of &SCons; being used to
         generate the project file.
       </para>
     </listitem>
@@ -6008,8 +6348,8 @@ no default value.
       <envar>MSVSSCONSCOM</envar>
     </term>
     <listitem><para>
-        The default SCons command used in generated Microsoft Visual
-        Studio project files.
+        The default &SCons; command used in generated Microsoft Visual
+        C++ project files.
       </para>
     </listitem>
   </varlistentry>
@@ -6019,10 +6359,10 @@ no default value.
     </term>
     <listitem><para>
         The sconscript file (that is, &SConstruct; or &SConscript;
-        file) that will be invoked by Visual Studio project files
+        file) that will be invoked by Visual C++ project files
         (through the &cv-link-MSVSSCONSCOM; variable). The default
         is the same sconscript file that contains the call to
-        &b-MSVSProject; to build the project file.
+        &b-link-MSVSProject; to build the project file.
       </para>
     </listitem>
   </varlistentry>
@@ -6031,7 +6371,7 @@ no default value.
       <envar>MSVSSCONSFLAGS</envar>
     </term>
     <listitem><para>
-        The SCons flags used in generated Microsoft Visual Studio project files.
+        The &SCons; flags used in generated Microsoft Visual C++ project files.
       </para>
     </listitem>
   </varlistentry>
@@ -6049,9 +6389,8 @@ no default value.
     <listitem><para>
         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.
+        when using Visual Studio version 7.x (.NET 2002) and later,
+        and <filename>.dsw</filename> when using Visual Studio 6.0.
       </para>
     </listitem>
   </varlistentry>
@@ -6475,9 +6814,9 @@ If this is not set, then &cv-link-PCHCOM; (the command line) is displayed.
       <envar>PCHPDBFLAGS</envar>
     </term>
     <listitem><para>
-A construction variable that, when expanded,
+A &consvar; that, when expanded,
 adds the <option>/yD</option> flag to the command line
-only if the &cv-link-PDB; construction variable is set.
+only if the &cv-link-PDB; &consvar; is set.
 </para>
 </listitem>
   </varlistentry>
@@ -6909,51 +7248,63 @@ The prefix used for PostScript file names.
 </para>
 </listitem>
   </varlistentry>
-  <varlistentry id="cv-QT_AUTOSCAN">
+  <varlistentry id="cv-QT3_AUTOSCAN">
     <term>
-      <envar>QT_AUTOSCAN</envar>
+      <envar>QT3_AUTOSCAN</envar>
     </term>
     <listitem><para>
 Turn off scanning for mocable files. Use the &b-link-Moc; Builder to explicitly
 specify files to run <command>moc</command> on.
 </para>
+<para>
+<emphasis>Changed in 4.5.0</emphasis>: renamed from QT_AUTOSCAN.
+</para>
 </listitem>
   </varlistentry>
-  <varlistentry id="cv-QT_BINPATH">
+  <varlistentry id="cv-QT3_BINPATH">
     <term>
-      <envar>QT_BINPATH</envar>
+      <envar>QT3_BINPATH</envar>
     </term>
     <listitem><para>
 The path where the Qt binaries are installed.
-The default value is '&cv-link-QTDIR;<filename>/bin</filename>'.
+The default value is '&cv-link-QT3DIR;<filename>/bin</filename>'.
+</para>
+<para>
+<emphasis>Changed in 4.5.0</emphasis>: renamed from QT_BINPATH.
 </para>
 </listitem>
   </varlistentry>
-  <varlistentry id="cv-QT_CPPPATH">
+  <varlistentry id="cv-QT3_CPPPATH">
     <term>
-      <envar>QT_CPPPATH</envar>
+      <envar>QT3_CPPPATH</envar>
     </term>
     <listitem><para>
 The path where the Qt header files are installed.
-The default value is '&cv-link-QTDIR;/include'.
+The default value is '&cv-link-QT3DIR;/include'.
 Note: If you set this variable to <constant>None</constant>,
 the tool won't change the &cv-link-CPPPATH;
 construction variable.
 </para>
+<para>
+<emphasis>Changed in 4.5.0</emphasis>: renamed from QT_CPPPATH.
+</para>
 </listitem>
   </varlistentry>
-  <varlistentry id="cv-QT_DEBUG">
+  <varlistentry id="cv-QT3_DEBUG">
     <term>
-      <envar>QT_DEBUG</envar>
+      <envar>QT3_DEBUG</envar>
     </term>
     <listitem><para>
 Prints lots of debugging information while scanning for moc files.
 </para>
+<para>
+<emphasis>Changed in 4.5.0</emphasis>: renamed from QT_DEBUG.
+</para>
 </listitem>
   </varlistentry>
-  <varlistentry id="cv-QT_LIB">
+  <varlistentry id="cv-QT3_LIB">
     <term>
-      <envar>QT_LIB</envar>
+      <envar>QT3_LIB</envar>
     </term>
     <listitem><para>
 Default value is <literal>'qt'</literal>.
@@ -6961,33 +7312,39 @@ You may want to set this to <literal>'qt-mt'</literal>.
 Note: If you set this variable to <constant>None</constant>,
 the tool won't change the &cv-link-LIBS; variable.
 </para>
+<para>
+<emphasis>Changed in 4.5.0</emphasis>: renamed from QT_LIB.
+</para>
 </listitem>
   </varlistentry>
-  <varlistentry id="cv-QT_LIBPATH">
+  <varlistentry id="cv-QT3_LIBPATH">
     <term>
-      <envar>QT_LIBPATH</envar>
+      <envar>QT3_LIBPATH</envar>
     </term>
     <listitem><para>
 The path where the Qt libraries are installed.
-The default value is '&cv-link-QTDIR;<filename>/lib</filename>'.
+The default value is '&cv-link-QT3DIR;<filename>/lib</filename>'.
 Note: If you set this variable to <constant>None</constant>,
 the tool won't change the &cv-link-LIBPATH;
 construction variable.
 </para>
+<para>
+<emphasis>Changed in 4.5.0</emphasis>: renamed from QT_LIBPATH.
+</para>
 </listitem>
   </varlistentry>
-  <varlistentry id="cv-QT_MOC">
+  <varlistentry id="cv-QT3_MOC">
     <term>
-      <envar>QT_MOC</envar>
+      <envar>QT3_MOC</envar>
     </term>
     <listitem><para>
-Default value is '&cv-link-QT_BINPATH;<filename>/moc</filename>'.
+Default value is '&cv-link-QT3_BINPATH;<filename>/moc</filename>'.
 </para>
 </listitem>
   </varlistentry>
-  <varlistentry id="cv-QT_MOCCXXPREFIX">
+  <varlistentry id="cv-QT3_MOCCXXPREFIX">
     <term>
-      <envar>QT_MOCCXXPREFIX</envar>
+      <envar>QT3_MOCCXXPREFIX</envar>
     </term>
     <listitem><para>
 Default value is <literal>''</literal>.
@@ -6995,204 +7352,264 @@ Prefix for <command>moc</command> output files when source is a C++ file.
 </para>
 </listitem>
   </varlistentry>
-  <varlistentry id="cv-QT_MOCCXXSUFFIX">
+  <varlistentry id="cv-QT3_MOCCXXSUFFIX">
     <term>
-      <envar>QT_MOCCXXSUFFIX</envar>
+      <envar>QT3_MOCCXXSUFFIX</envar>
     </term>
     <listitem><para>
 Default value is <literal>'.moc'</literal>.
 Suffix for <command>moc</command> output files when source is a C++ file.
 </para>
+<para>
+<emphasis>Changed in 4.5.0</emphasis>: renamed from QT_MOCCXXSUFFIX.
+</para>
 </listitem>
   </varlistentry>
-  <varlistentry id="cv-QT_MOCFROMCXXCOM">
+  <varlistentry id="cv-QT3_MOCFROMCXXCOM">
     <term>
-      <envar>QT_MOCFROMCXXCOM</envar>
+      <envar>QT3_MOCFROMCXXCOM</envar>
     </term>
     <listitem><para>
 Command to generate a moc file from a C++ file.
 </para>
+<para>
+<emphasis>Changed in 4.5.0</emphasis>: renamed from QT_MOCFROMCXXCOM.
+</para>
 </listitem>
   </varlistentry>
-  <varlistentry id="cv-QT_MOCFROMCXXCOMSTR">
+  <varlistentry id="cv-QT3_MOCFROMCXXCOMSTR">
     <term>
-      <envar>QT_MOCFROMCXXCOMSTR</envar>
+      <envar>QT3_MOCFROMCXXCOMSTR</envar>
     </term>
     <listitem><para>
 The string displayed when generating a moc file from a C++ file.
-If this is not set, then &cv-link-QT_MOCFROMCXXCOM; (the command line) is displayed.
+If this is not set, then &cv-link-QT3_MOCFROMCXXCOM; (the command line) is displayed.
+</para>
+<para>
+<emphasis>Changed in 4.5.0</emphasis>: renamed from QT_MOCFROMCXXCOMSTR.
 </para>
 </listitem>
   </varlistentry>
-  <varlistentry id="cv-QT_MOCFROMCXXFLAGS">
+  <varlistentry id="cv-QT3_MOCFROMCXXFLAGS">
     <term>
-      <envar>QT_MOCFROMCXXFLAGS</envar>
+      <envar>QT3_MOCFROMCXXFLAGS</envar>
     </term>
     <listitem><para>
 Default value is <literal>'-i'</literal>.
 These flags are passed to <command>moc</command> when moccing a C++ file.
 </para>
+<para>
+<emphasis>Changed in 4.5.0</emphasis>: renamed from QT_MOCFROMCXXFLAGS.
+</para>
 </listitem>
   </varlistentry>
-  <varlistentry id="cv-QT_MOCFROMHCOM">
+  <varlistentry id="cv-QT3_MOCFROMHCOM">
     <term>
-      <envar>QT_MOCFROMHCOM</envar>
+      <envar>QT3_MOCFROMHCOM</envar>
     </term>
     <listitem><para>
 Command to generate a moc file from a header.
 </para>
+<para>
+<emphasis>Changed in 4.5.0</emphasis>: renamed from QT_MOCFROMSHCOM.
+</para>
 </listitem>
   </varlistentry>
-  <varlistentry id="cv-QT_MOCFROMHCOMSTR">
+  <varlistentry id="cv-QT3_MOCFROMHCOMSTR">
     <term>
-      <envar>QT_MOCFROMHCOMSTR</envar>
+      <envar>QT3_MOCFROMHCOMSTR</envar>
     </term>
     <listitem><para>
 The string displayed when generating a moc file from a C++ file.
-If this is not set, then &cv-link-QT_MOCFROMHCOM; (the command line) is displayed.
+If this is not set, then &cv-link-QT3_MOCFROMHCOM; (the command line) is displayed.
+</para>
+<para>
+<emphasis>Changed in 4.5.0</emphasis>: renamed from QT_MOCFROMSHCOMSTR.
 </para>
 </listitem>
   </varlistentry>
-  <varlistentry id="cv-QT_MOCFROMHFLAGS">
+  <varlistentry id="cv-QT3_MOCFROMHFLAGS">
     <term>
-      <envar>QT_MOCFROMHFLAGS</envar>
+      <envar>QT3_MOCFROMHFLAGS</envar>
     </term>
     <listitem><para>
 Default value is <literal>''</literal>. These flags are passed to <command>moc</command>
 when moccing a header file.
 </para>
+<para>
+<emphasis>Changed in 4.5.0</emphasis>: renamed from QT_MOCFROMSHFLAGS.
+</para>
 </listitem>
   </varlistentry>
-  <varlistentry id="cv-QT_MOCHPREFIX">
+  <varlistentry id="cv-QT3_MOCHPREFIX">
     <term>
-      <envar>QT_MOCHPREFIX</envar>
+      <envar>QT3_MOCHPREFIX</envar>
     </term>
     <listitem><para>
 Default value is <literal>'moc_'</literal>.
 Prefix for <command>moc</command> output files when source is a header.
 </para>
+<para>
+<emphasis>Changed in 4.5.0</emphasis>: renamed from QT_MOCHPREFIX.
+</para>
 </listitem>
   </varlistentry>
-  <varlistentry id="cv-QT_MOCHSUFFIX">
+  <varlistentry id="cv-QT3_MOCHSUFFIX">
     <term>
-      <envar>QT_MOCHSUFFIX</envar>
+      <envar>QT3_MOCHSUFFIX</envar>
     </term>
     <listitem><para>
 Default value is '&cv-link-CXXFILESUFFIX;'.
 Suffix for moc output files when source is a header.
 </para>
+<para>
+<emphasis>Changed in 4.5.0</emphasis>: renamed from QT_MOCHSUFFIX.
+</para>
 </listitem>
   </varlistentry>
-  <varlistentry id="cv-QT_UIC">
+  <varlistentry id="cv-QT3_UIC">
     <term>
-      <envar>QT_UIC</envar>
+      <envar>QT3_UIC</envar>
     </term>
     <listitem><para>
-Default value is '&cv-link-QT_BINPATH;<filename>/uic</filename>'.
+Default value is '&cv-link-QT3_BINPATH;<filename>/uic</filename>'.
+</para>
+<para>
+<emphasis>Changed in 4.5.0</emphasis>: renamed from QT_UIC.
 </para>
 </listitem>
   </varlistentry>
-  <varlistentry id="cv-QT_UICCOM">
+  <varlistentry id="cv-QT3_UICCOM">
     <term>
-      <envar>QT_UICCOM</envar>
+      <envar>QT3_UICCOM</envar>
     </term>
     <listitem><para>
 Command to generate header files from <filename>.ui</filename> files.
 </para>
+<para>
+<emphasis>Changed in 4.5.0</emphasis>: renamed from QT_UICCOM.
+</para>
 </listitem>
   </varlistentry>
-  <varlistentry id="cv-QT_UICCOMSTR">
+  <varlistentry id="cv-QT3_UICCOMSTR">
     <term>
-      <envar>QT_UICCOMSTR</envar>
+      <envar>QT3_UICCOMSTR</envar>
     </term>
     <listitem><para>
 The string displayed when generating header files from <filename>.ui</filename> files.
-If this is not set, then &cv-link-QT_UICCOM; (the command line) is displayed.
+If this is not set, then &cv-link-QT3_UICCOM; (the command line) is displayed.
+</para>
+<para>
+<emphasis>Changed in 4.5.0</emphasis>: renamed from QT_UICCOMSTR.
 </para>
 </listitem>
   </varlistentry>
-  <varlistentry id="cv-QT_UICDECLFLAGS">
+  <varlistentry id="cv-QT3_UICDECLFLAGS">
     <term>
-      <envar>QT_UICDECLFLAGS</envar>
+      <envar>QT3_UICDECLFLAGS</envar>
     </term>
     <listitem><para>
 Default value is ''. These flags are passed to <command>uic</command>
 when creating a header file from a <filename>.ui</filename> file.
 </para>
+<para>
+<emphasis>Changed in 4.5.0</emphasis>: renamed from QT_UICDECLFLAGS.
+</para>
 </listitem>
   </varlistentry>
-  <varlistentry id="cv-QT_UICDECLPREFIX">
+  <varlistentry id="cv-QT3_UICDECLPREFIX">
     <term>
-      <envar>QT_UICDECLPREFIX</envar>
+      <envar>QT3_UICDECLPREFIX</envar>
     </term>
     <listitem><para>
 Default value is <literal>''</literal>.
 Prefix for <command>uic</command> generated header files.
 </para>
+<para>
+<emphasis>Changed in 4.5.0</emphasis>: renamed from QT_UICDECLPREFIX.
+</para>
 </listitem>
   </varlistentry>
-  <varlistentry id="cv-QT_UICDECLSUFFIX">
+  <varlistentry id="cv-QT3_UICDECLSUFFIX">
     <term>
-      <envar>QT_UICDECLSUFFIX</envar>
+      <envar>QT3_UICDECLSUFFIX</envar>
     </term>
     <listitem><para>
 Default value is <literal>'.h'</literal>.
 Suffix for <command>uic</command> generated header files.
 </para>
+<para>
+<emphasis>Changed in 4.5.0</emphasis>: renamed from QT_UICDECLSUFFIX.
+</para>
 </listitem>
   </varlistentry>
-  <varlistentry id="cv-QT_UICIMPLFLAGS">
+  <varlistentry id="cv-QT3_UICIMPLFLAGS">
     <term>
-      <envar>QT_UICIMPLFLAGS</envar>
+      <envar>QT3_UICIMPLFLAGS</envar>
     </term>
     <listitem><para>
 Default value is <literal>''</literal>.
 These flags are passed to <command>uic</command> when creating a C++
 file from a <filename>.ui</filename> file.
 </para>
+<para>
+<emphasis>Changed in 4.5.0</emphasis>: renamed from QT_UICIMPFLAGS.
+</para>
 </listitem>
   </varlistentry>
-  <varlistentry id="cv-QT_UICIMPLPREFIX">
+  <varlistentry id="cv-QT3_UICIMPLPREFIX">
     <term>
-      <envar>QT_UICIMPLPREFIX</envar>
+      <envar>QT3_UICIMPLPREFIX</envar>
     </term>
     <listitem><para>
 Default value is <literal>'uic_'</literal>.
 Prefix for uic generated implementation files.
 </para>
+<para>
+<emphasis>Changed in 4.5.0</emphasis>: renamed from QT_UICIMPLPREFIX.
+</para>
 </listitem>
   </varlistentry>
-  <varlistentry id="cv-QT_UICIMPLSUFFIX">
+  <varlistentry id="cv-QT3_UICIMPLSUFFIX">
     <term>
-      <envar>QT_UICIMPLSUFFIX</envar>
+      <envar>QT3_UICIMPLSUFFIX</envar>
     </term>
     <listitem><para>
 Default value is '&cv-link-CXXFILESUFFIX;'. Suffix for uic generated implementation
 files.
 </para>
+<para>
+<emphasis>Changed in 4.5.0</emphasis>: renamed from QT_UICIMPLSUFFIX.
+</para>
 </listitem>
   </varlistentry>
-  <varlistentry id="cv-QT_UISUFFIX">
+  <varlistentry id="cv-QT3_UISUFFIX">
     <term>
-      <envar>QT_UISUFFIX</envar>
+      <envar>QT3_UISUFFIX</envar>
     </term>
     <listitem><para>
 Default value is <literal>'.ui'</literal>.
 Suffix of designer input files.
 </para>
+<para>
+<emphasis>Changed in 4.5.0</emphasis>: renamed from QT_UISUFFIX.
+</para>
 </listitem>
   </varlistentry>
-  <varlistentry id="cv-QTDIR">
+  <varlistentry id="cv-QT3DIR">
     <term>
-      <envar>QTDIR</envar>
+      <envar>QT3DIR</envar>
     </term>
     <listitem><para>
 The path to the Qt installation to build against.
 If not already set,
-&t-link-qt; tool tries to obtain this from
+&t-link-qt3; tool tries to obtain this from
 <varname>os.environ</varname>;
 if not found there, it tries to make a guess.
 </para>
+<para>
+<emphasis>Changed in 4.5.0</emphasis>: renamed from QTDIR.
+</para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-RANLIB">
@@ -7281,7 +7698,7 @@ The flags passed to the resource compiler by the &b-link-RES; builder.
       <envar>RCINCFLAGS</envar>
     </term>
     <listitem><para>
-An automatically-generated construction variable
+An automatically-generated &consvar;
 containing the command-line options
 for specifying directories to be searched
 by the resource compiler.
@@ -7301,7 +7718,7 @@ of each directory in &cv-link-CPPPATH;.
 The prefix (flag) used to specify an include directory
 on the resource compiler command line.
 This will be prepended to the beginning of each directory
-in the &cv-link-CPPPATH; construction variable
+in the &cv-link-CPPPATH; &consvar;
 when the &cv-link-RCINCFLAGS; variable is expanded.
 </para>
 </listitem>
@@ -7314,7 +7731,7 @@ when the &cv-link-RCINCFLAGS; variable is expanded.
 The suffix used to specify an include directory
 on the resource compiler command line.
 This will be appended to the end of each directory
-in the &cv-link-CPPPATH; construction variable
+in the &cv-link-CPPPATH; &consvar;
 when the &cv-link-RCINCFLAGS; variable is expanded.
 </para>
 </listitem>
@@ -7411,7 +7828,9 @@ If this is not set, then &cv-link-RMICCOM; (the command line) is displayed.
 </para>
 
 <example_commands>
-env = Environment(RMICCOMSTR = "Generating stub/skeleton class files $TARGETS from $SOURCES")
+env = Environment(
+    RMICCOMSTR="Generating stub/skeleton class files $TARGETS from $SOURCES"
+)
 </example_commands>
 </listitem>
   </varlistentry>
@@ -7574,11 +7993,11 @@ for more information.
       <envar>SCONS_HOME</envar>
     </term>
     <listitem><para>
-        The (optional) path to the SCons library directory,
+        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 &cv-link-MSVSSCONS; command line executed from Microsoft
-        Visual Studio project files.
+        Visual C++ project files.
       </para>
     </listitem>
   </varlistentry>
@@ -7790,21 +8209,39 @@ construction variable for more information.
       <envar>SHELL_ENV_GENERATORS</envar>
     </term>
     <listitem><para>
-Must be a list (or an iterable) containing functions where each function generates or
-alters the environment dictionary which will be used
-when executing the &cv-link-SPAWN; function. The functions will initially 
-be passed a reference of the current execution environment (e.g. env['ENV']), 
-and each called while iterating the list. Each function must return a dictionary
-which will then be passed to the next function iterated. The return dictionary 
-should contain keys which represent the environment variables and their respective
-values.
+A hook allowing the execution environment to be modified prior
+to the actual execution of a command line from an action
+via the spawner function defined by &cv-link-SPAWN;.
+Allows substitution based on targets and sources,
+as well as values from the &consenv;,
+adding extra environment variables, etc.
+    </para>
 
-This primary purpose of this construction variable is to give the user the ability
-to substitute execution environment variables based on env, targets, and sources. 
-If desired, the user can completely customize the execution environment for particular
-targets.
+    <para>
+The value must be a list (or other iterable)
+of functions which each generate or
+alter the execution environment dictionary.
+The first function will be passed a copy of the initial execution environment
+(&cv-link-ENV; in the current &consenv;);
+the dictionary returned by that function is passed to the next,
+until the iterable is exhausted and the result returned
+for use by the command spawner.
+The original execution environment is not modified.
     </para>
 
+    <para>
+Each function provided in &cv-SHELL_ENV_GENERATORS; must accept four
+arguments and return a dictionary:
+<varname>env</varname> is the &consenv; for this action;
+<varname>target</varname> is the list of targets associated with this action;
+<varname>source</varname> is the list of sources associated with this action;
+and <varname>shell_env</varname> is the current dictionary after iterating
+any previous &cv-SHELL_ENV_GENERATORS; functions
+(this can be compared to the original execution environment,
+which is available as <literal>env['ENV']</literal>, to detect any changes).
+    </para>
+
+    <para>Example:</para>
     <example_commands>
 def custom_shell_env(env, target, source, shell_env):
     """customize shell_env if desired"""
@@ -7815,24 +8252,7 @@ def custom_shell_env(env, target, source, shell_env):
 env["SHELL_ENV_GENERATORS"] = [custom_shell_env]
     </example_commands>
 
-    <para>
-      <varname>env</varname>
-The SCons construction environment from which the
-execution environment can be derived from.
-    </para>
-    <para>
-    <varname>target</varname>
-The list of targets associated with this action.
-    </para>
-    <para>
-    <varname>source</varname>
-The list of sources associated with this action.
-    </para>
-    <para>
-    <varname>shell_env</varname>
-The current shell_env after iterating other SHELL_ENV_GENERATORS functions. This can be compared
-to the passed env['ENV'] to detect any changes.
-    </para>
+  <para><emphasis>Available since 4.4</emphasis></para>
   </listitem>
   </varlistentry>
   <varlistentry id="cv-SHF03">
diff --git a/doc/generated/variables.mod b/doc/generated/variables.mod
index ceb58acaf..c10e52033 100644
--- a/doc/generated/variables.mod
+++ b/doc/generated/variables.mod
@@ -184,6 +184,7 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE.  DO NOT EDIT.
 <!ENTITY cv-F95PPCOMSTR "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$F95PPCOMSTR</envar>">
 <!ENTITY cv-F95PPFILESUFFIXES "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$F95PPFILESUFFIXES</envar>">
 <!ENTITY cv-File "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$File</envar>">
+<!ENTITY cv-FILE_ENCODING "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$FILE_ENCODING</envar>">
 <!ENTITY cv-FORTRAN "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$FORTRAN</envar>">
 <!ENTITY cv-FORTRANCOM "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$FORTRANCOM</envar>">
 <!ENTITY cv-FORTRANCOMMONFLAGS "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$FORTRANCOMMONFLAGS</envar>">
@@ -245,6 +246,7 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE.  DO NOT EDIT.
 <!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-JAVAPROCESSORPATH "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$JAVAPROCESSORPATH</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>">
@@ -419,34 +421,34 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE.  DO NOT EDIT.
 <!ENTITY cv-PSCOMSTR "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$PSCOMSTR</envar>">
 <!ENTITY cv-PSPREFIX "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$PSPREFIX</envar>">
 <!ENTITY cv-PSSUFFIX "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$PSSUFFIX</envar>">
-<!ENTITY cv-QT_AUTOSCAN "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$QT_AUTOSCAN</envar>">
-<!ENTITY cv-QT_BINPATH "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$QT_BINPATH</envar>">
-<!ENTITY cv-QT_CPPPATH "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$QT_CPPPATH</envar>">
-<!ENTITY cv-QT_DEBUG "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$QT_DEBUG</envar>">
-<!ENTITY cv-QT_LIB "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$QT_LIB</envar>">
-<!ENTITY cv-QT_LIBPATH "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$QT_LIBPATH</envar>">
-<!ENTITY cv-QT_MOC "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$QT_MOC</envar>">
-<!ENTITY cv-QT_MOCCXXPREFIX "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$QT_MOCCXXPREFIX</envar>">
-<!ENTITY cv-QT_MOCCXXSUFFIX "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$QT_MOCCXXSUFFIX</envar>">
-<!ENTITY cv-QT_MOCFROMCXXCOM "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$QT_MOCFROMCXXCOM</envar>">
-<!ENTITY cv-QT_MOCFROMCXXCOMSTR "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$QT_MOCFROMCXXCOMSTR</envar>">
-<!ENTITY cv-QT_MOCFROMCXXFLAGS "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$QT_MOCFROMCXXFLAGS</envar>">
-<!ENTITY cv-QT_MOCFROMHCOM "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$QT_MOCFROMHCOM</envar>">
-<!ENTITY cv-QT_MOCFROMHCOMSTR "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$QT_MOCFROMHCOMSTR</envar>">
-<!ENTITY cv-QT_MOCFROMHFLAGS "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$QT_MOCFROMHFLAGS</envar>">
-<!ENTITY cv-QT_MOCHPREFIX "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$QT_MOCHPREFIX</envar>">
-<!ENTITY cv-QT_MOCHSUFFIX "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$QT_MOCHSUFFIX</envar>">
-<!ENTITY cv-QT_UIC "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$QT_UIC</envar>">
-<!ENTITY cv-QT_UICCOM "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$QT_UICCOM</envar>">
-<!ENTITY cv-QT_UICCOMSTR "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$QT_UICCOMSTR</envar>">
-<!ENTITY cv-QT_UICDECLFLAGS "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$QT_UICDECLFLAGS</envar>">
-<!ENTITY cv-QT_UICDECLPREFIX "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$QT_UICDECLPREFIX</envar>">
-<!ENTITY cv-QT_UICDECLSUFFIX "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$QT_UICDECLSUFFIX</envar>">
-<!ENTITY cv-QT_UICIMPLFLAGS "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$QT_UICIMPLFLAGS</envar>">
-<!ENTITY cv-QT_UICIMPLPREFIX "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$QT_UICIMPLPREFIX</envar>">
-<!ENTITY cv-QT_UICIMPLSUFFIX "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$QT_UICIMPLSUFFIX</envar>">
-<!ENTITY cv-QT_UISUFFIX "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$QT_UISUFFIX</envar>">
-<!ENTITY cv-QTDIR "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$QTDIR</envar>">
+<!ENTITY cv-QT3_AUTOSCAN "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$QT3_AUTOSCAN</envar>">
+<!ENTITY cv-QT3_BINPATH "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$QT3_BINPATH</envar>">
+<!ENTITY cv-QT3_CPPPATH "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$QT3_CPPPATH</envar>">
+<!ENTITY cv-QT3_DEBUG "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$QT3_DEBUG</envar>">
+<!ENTITY cv-QT3_LIB "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$QT3_LIB</envar>">
+<!ENTITY cv-QT3_LIBPATH "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$QT3_LIBPATH</envar>">
+<!ENTITY cv-QT3_MOC "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$QT3_MOC</envar>">
+<!ENTITY cv-QT3_MOCCXXPREFIX "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$QT3_MOCCXXPREFIX</envar>">
+<!ENTITY cv-QT3_MOCCXXSUFFIX "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$QT3_MOCCXXSUFFIX</envar>">
+<!ENTITY cv-QT3_MOCFROMCXXCOM "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$QT3_MOCFROMCXXCOM</envar>">
+<!ENTITY cv-QT3_MOCFROMCXXCOMSTR "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$QT3_MOCFROMCXXCOMSTR</envar>">
+<!ENTITY cv-QT3_MOCFROMCXXFLAGS "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$QT3_MOCFROMCXXFLAGS</envar>">
+<!ENTITY cv-QT3_MOCFROMHCOM "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$QT3_MOCFROMHCOM</envar>">
+<!ENTITY cv-QT3_MOCFROMHCOMSTR "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$QT3_MOCFROMHCOMSTR</envar>">
+<!ENTITY cv-QT3_MOCFROMHFLAGS "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$QT3_MOCFROMHFLAGS</envar>">
+<!ENTITY cv-QT3_MOCHPREFIX "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$QT3_MOCHPREFIX</envar>">
+<!ENTITY cv-QT3_MOCHSUFFIX "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$QT3_MOCHSUFFIX</envar>">
+<!ENTITY cv-QT3_UIC "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$QT3_UIC</envar>">
+<!ENTITY cv-QT3_UICCOM "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$QT3_UICCOM</envar>">
+<!ENTITY cv-QT3_UICCOMSTR "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$QT3_UICCOMSTR</envar>">
+<!ENTITY cv-QT3_UICDECLFLAGS "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$QT3_UICDECLFLAGS</envar>">
+<!ENTITY cv-QT3_UICDECLPREFIX "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$QT3_UICDECLPREFIX</envar>">
+<!ENTITY cv-QT3_UICDECLSUFFIX "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$QT3_UICDECLSUFFIX</envar>">
+<!ENTITY cv-QT3_UICIMPLFLAGS "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$QT3_UICIMPLFLAGS</envar>">
+<!ENTITY cv-QT3_UICIMPLPREFIX "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$QT3_UICIMPLPREFIX</envar>">
+<!ENTITY cv-QT3_UICIMPLSUFFIX "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$QT3_UICIMPLSUFFIX</envar>">
+<!ENTITY cv-QT3_UISUFFIX "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$QT3_UISUFFIX</envar>">
+<!ENTITY cv-QT3DIR "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$QT3DIR</envar>">
 <!ENTITY cv-RANLIB "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$RANLIB</envar>">
 <!ENTITY cv-RANLIBCOM "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$RANLIBCOM</envar>">
 <!ENTITY cv-RANLIBCOMSTR "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$RANLIBCOMSTR</envar>">
@@ -858,6 +860,7 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE.  DO NOT EDIT.
 <!ENTITY cv-link-F95PPCOMSTR "<link linkend='cv-F95PPCOMSTR' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$F95PPCOMSTR</envar></link>">
 <!ENTITY cv-link-F95PPFILESUFFIXES "<link linkend='cv-F95PPFILESUFFIXES' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$F95PPFILESUFFIXES</envar></link>">
 <!ENTITY cv-link-File "<link linkend='cv-File' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$File</envar></link>">
+<!ENTITY cv-link-FILE_ENCODING "<link linkend='cv-FILE_ENCODING' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$FILE_ENCODING</envar></link>">
 <!ENTITY cv-link-FORTRAN "<link linkend='cv-FORTRAN' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$FORTRAN</envar></link>">
 <!ENTITY cv-link-FORTRANCOM "<link linkend='cv-FORTRANCOM' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$FORTRANCOM</envar></link>">
 <!ENTITY cv-link-FORTRANCOMMONFLAGS "<link linkend='cv-FORTRANCOMMONFLAGS' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$FORTRANCOMMONFLAGS</envar></link>">
@@ -919,6 +922,7 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE.  DO NOT EDIT.
 <!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-JAVAPROCESSORPATH "<link linkend='cv-JAVAPROCESSORPATH' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$JAVAPROCESSORPATH</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>">
@@ -1093,34 +1097,34 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE.  DO NOT EDIT.
 <!ENTITY cv-link-PSCOMSTR "<link linkend='cv-PSCOMSTR' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$PSCOMSTR</envar></link>">
 <!ENTITY cv-link-PSPREFIX "<link linkend='cv-PSPREFIX' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$PSPREFIX</envar></link>">
 <!ENTITY cv-link-PSSUFFIX "<link linkend='cv-PSSUFFIX' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$PSSUFFIX</envar></link>">
-<!ENTITY cv-link-QT_AUTOSCAN "<link linkend='cv-QT_AUTOSCAN' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$QT_AUTOSCAN</envar></link>">
-<!ENTITY cv-link-QT_BINPATH "<link linkend='cv-QT_BINPATH' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$QT_BINPATH</envar></link>">
-<!ENTITY cv-link-QT_CPPPATH "<link linkend='cv-QT_CPPPATH' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$QT_CPPPATH</envar></link>">
-<!ENTITY cv-link-QT_DEBUG "<link linkend='cv-QT_DEBUG' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$QT_DEBUG</envar></link>">
-<!ENTITY cv-link-QT_LIB "<link linkend='cv-QT_LIB' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$QT_LIB</envar></link>">
-<!ENTITY cv-link-QT_LIBPATH "<link linkend='cv-QT_LIBPATH' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$QT_LIBPATH</envar></link>">
-<!ENTITY cv-link-QT_MOC "<link linkend='cv-QT_MOC' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$QT_MOC</envar></link>">
-<!ENTITY cv-link-QT_MOCCXXPREFIX "<link linkend='cv-QT_MOCCXXPREFIX' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$QT_MOCCXXPREFIX</envar></link>">
-<!ENTITY cv-link-QT_MOCCXXSUFFIX "<link linkend='cv-QT_MOCCXXSUFFIX' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$QT_MOCCXXSUFFIX</envar></link>">
-<!ENTITY cv-link-QT_MOCFROMCXXCOM "<link linkend='cv-QT_MOCFROMCXXCOM' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$QT_MOCFROMCXXCOM</envar></link>">
-<!ENTITY cv-link-QT_MOCFROMCXXCOMSTR "<link linkend='cv-QT_MOCFROMCXXCOMSTR' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$QT_MOCFROMCXXCOMSTR</envar></link>">
-<!ENTITY cv-link-QT_MOCFROMCXXFLAGS "<link linkend='cv-QT_MOCFROMCXXFLAGS' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$QT_MOCFROMCXXFLAGS</envar></link>">
-<!ENTITY cv-link-QT_MOCFROMHCOM "<link linkend='cv-QT_MOCFROMHCOM' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$QT_MOCFROMHCOM</envar></link>">
-<!ENTITY cv-link-QT_MOCFROMHCOMSTR "<link linkend='cv-QT_MOCFROMHCOMSTR' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$QT_MOCFROMHCOMSTR</envar></link>">
-<!ENTITY cv-link-QT_MOCFROMHFLAGS "<link linkend='cv-QT_MOCFROMHFLAGS' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$QT_MOCFROMHFLAGS</envar></link>">
-<!ENTITY cv-link-QT_MOCHPREFIX "<link linkend='cv-QT_MOCHPREFIX' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$QT_MOCHPREFIX</envar></link>">
-<!ENTITY cv-link-QT_MOCHSUFFIX "<link linkend='cv-QT_MOCHSUFFIX' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$QT_MOCHSUFFIX</envar></link>">
-<!ENTITY cv-link-QT_UIC "<link linkend='cv-QT_UIC' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$QT_UIC</envar></link>">
-<!ENTITY cv-link-QT_UICCOM "<link linkend='cv-QT_UICCOM' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$QT_UICCOM</envar></link>">
-<!ENTITY cv-link-QT_UICCOMSTR "<link linkend='cv-QT_UICCOMSTR' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$QT_UICCOMSTR</envar></link>">
-<!ENTITY cv-link-QT_UICDECLFLAGS "<link linkend='cv-QT_UICDECLFLAGS' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$QT_UICDECLFLAGS</envar></link>">
-<!ENTITY cv-link-QT_UICDECLPREFIX "<link linkend='cv-QT_UICDECLPREFIX' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$QT_UICDECLPREFIX</envar></link>">
-<!ENTITY cv-link-QT_UICDECLSUFFIX "<link linkend='cv-QT_UICDECLSUFFIX' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$QT_UICDECLSUFFIX</envar></link>">
-<!ENTITY cv-link-QT_UICIMPLFLAGS "<link linkend='cv-QT_UICIMPLFLAGS' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$QT_UICIMPLFLAGS</envar></link>">
-<!ENTITY cv-link-QT_UICIMPLPREFIX "<link linkend='cv-QT_UICIMPLPREFIX' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$QT_UICIMPLPREFIX</envar></link>">
-<!ENTITY cv-link-QT_UICIMPLSUFFIX "<link linkend='cv-QT_UICIMPLSUFFIX' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$QT_UICIMPLSUFFIX</envar></link>">
-<!ENTITY cv-link-QT_UISUFFIX "<link linkend='cv-QT_UISUFFIX' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$QT_UISUFFIX</envar></link>">
-<!ENTITY cv-link-QTDIR "<link linkend='cv-QTDIR' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$QTDIR</envar></link>">
+<!ENTITY cv-link-QT3_AUTOSCAN "<link linkend='cv-QT3_AUTOSCAN' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$QT3_AUTOSCAN</envar></link>">
+<!ENTITY cv-link-QT3_BINPATH "<link linkend='cv-QT3_BINPATH' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$QT3_BINPATH</envar></link>">
+<!ENTITY cv-link-QT3_CPPPATH "<link linkend='cv-QT3_CPPPATH' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$QT3_CPPPATH</envar></link>">
+<!ENTITY cv-link-QT3_DEBUG "<link linkend='cv-QT3_DEBUG' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$QT3_DEBUG</envar></link>">
+<!ENTITY cv-link-QT3_LIB "<link linkend='cv-QT3_LIB' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$QT3_LIB</envar></link>">
+<!ENTITY cv-link-QT3_LIBPATH "<link linkend='cv-QT3_LIBPATH' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$QT3_LIBPATH</envar></link>">
+<!ENTITY cv-link-QT3_MOC "<link linkend='cv-QT3_MOC' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$QT3_MOC</envar></link>">
+<!ENTITY cv-link-QT3_MOCCXXPREFIX "<link linkend='cv-QT3_MOCCXXPREFIX' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$QT3_MOCCXXPREFIX</envar></link>">
+<!ENTITY cv-link-QT3_MOCCXXSUFFIX "<link linkend='cv-QT3_MOCCXXSUFFIX' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$QT3_MOCCXXSUFFIX</envar></link>">
+<!ENTITY cv-link-QT3_MOCFROMCXXCOM "<link linkend='cv-QT3_MOCFROMCXXCOM' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$QT3_MOCFROMCXXCOM</envar></link>">
+<!ENTITY cv-link-QT3_MOCFROMCXXCOMSTR "<link linkend='cv-QT3_MOCFROMCXXCOMSTR' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$QT3_MOCFROMCXXCOMSTR</envar></link>">
+<!ENTITY cv-link-QT3_MOCFROMCXXFLAGS "<link linkend='cv-QT3_MOCFROMCXXFLAGS' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$QT3_MOCFROMCXXFLAGS</envar></link>">
+<!ENTITY cv-link-QT3_MOCFROMHCOM "<link linkend='cv-QT3_MOCFROMHCOM' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$QT3_MOCFROMHCOM</envar></link>">
+<!ENTITY cv-link-QT3_MOCFROMHCOMSTR "<link linkend='cv-QT3_MOCFROMHCOMSTR' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$QT3_MOCFROMHCOMSTR</envar></link>">
+<!ENTITY cv-link-QT3_MOCFROMHFLAGS "<link linkend='cv-QT3_MOCFROMHFLAGS' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$QT3_MOCFROMHFLAGS</envar></link>">
+<!ENTITY cv-link-QT3_MOCHPREFIX "<link linkend='cv-QT3_MOCHPREFIX' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$QT3_MOCHPREFIX</envar></link>">
+<!ENTITY cv-link-QT3_MOCHSUFFIX "<link linkend='cv-QT3_MOCHSUFFIX' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$QT3_MOCHSUFFIX</envar></link>">
+<!ENTITY cv-link-QT3_UIC "<link linkend='cv-QT3_UIC' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$QT3_UIC</envar></link>">
+<!ENTITY cv-link-QT3_UICCOM "<link linkend='cv-QT3_UICCOM' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$QT3_UICCOM</envar></link>">
+<!ENTITY cv-link-QT3_UICCOMSTR "<link linkend='cv-QT3_UICCOMSTR' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$QT3_UICCOMSTR</envar></link>">
+<!ENTITY cv-link-QT3_UICDECLFLAGS "<link linkend='cv-QT3_UICDECLFLAGS' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$QT3_UICDECLFLAGS</envar></link>">
+<!ENTITY cv-link-QT3_UICDECLPREFIX "<link linkend='cv-QT3_UICDECLPREFIX' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$QT3_UICDECLPREFIX</envar></link>">
+<!ENTITY cv-link-QT3_UICDECLSUFFIX "<link linkend='cv-QT3_UICDECLSUFFIX' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$QT3_UICDECLSUFFIX</envar></link>">
+<!ENTITY cv-link-QT3_UICIMPLFLAGS "<link linkend='cv-QT3_UICIMPLFLAGS' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$QT3_UICIMPLFLAGS</envar></link>">
+<!ENTITY cv-link-QT3_UICIMPLPREFIX "<link linkend='cv-QT3_UICIMPLPREFIX' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$QT3_UICIMPLPREFIX</envar></link>">
+<!ENTITY cv-link-QT3_UICIMPLSUFFIX "<link linkend='cv-QT3_UICIMPLSUFFIX' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$QT3_UICIMPLSUFFIX</envar></link>">
+<!ENTITY cv-link-QT3_UISUFFIX "<link linkend='cv-QT3_UISUFFIX' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$QT3_UISUFFIX</envar></link>">
+<!ENTITY cv-link-QT3DIR "<link linkend='cv-QT3DIR' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$QT3DIR</envar></link>">
 <!ENTITY cv-link-RANLIB "<link linkend='cv-RANLIB' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$RANLIB</envar></link>">
 <!ENTITY cv-link-RANLIBCOM "<link linkend='cv-RANLIBCOM' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$RANLIBCOM</envar></link>">
 <!ENTITY cv-link-RANLIBCOMSTR "<link linkend='cv-RANLIBCOMSTR' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$RANLIBCOMSTR</envar></link>">