PR #3289: add generated docs

The three generated doc files, builders.gen, tools,gen
and variables.gen are added to stay in sync with the
msvs.xml change.

Signed-off-by: Mats Wichmann <mats@linux.com>

3 files changed, 544 insertions, 434 deletions

diff --git a/doc/generated/builders.gen b/doc/generated/builders.gen
index 680f72f..6f03cd3 100644
--- a/doc/generated/builders.gen
+++ b/doc/generated/builders.gen
@@ -838,148 +838,192 @@ Compile files for languages defined in <filename>LINGUAS</filename> file
     <term>
       <function>env.MSVSProject()</function>
     </term>
-    <listitem> <para xmlns="http://www.scons.org/dbxsd/v1.0"> Builds a Microsoft Visual Studio project
-file, and by default builds a solution file as well. </para> <para xmlns="http://www.scons.org/dbxsd/v1.0"> This
-builds a Visual Studio project file, based on the version of Visual Studio
-that is configured (either the latest installed version, or the version
-specified by <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-MSVS_VERSION"><envar>$MSVS_VERSION</envar></link> in the Environment constructor). For
-Visual Studio 6, it will generate a <filename>.dsp</filename> file. For Visual
-Studio 7 (.NET) and later versions, it will generate a
-<filename>.vcproj</filename> file. </para> <para xmlns="http://www.scons.org/dbxsd/v1.0"> By default, this also
-generates a solution file for the specified project, a
-<filename>.dsw</filename> file for Visual Studio 6 or a
-<filename>.sln</filename> file for Visual Studio 7 (.NET). This behavior may
-be disabled by specifying <literal>auto_build_solution=0</literal> when you
-call <function xmlns="http://www.scons.org/dbxsd/v1.0">MSVSProject</function>, in which case you presumably want to build the solution
-file(s) by calling the <function xmlns="http://www.scons.org/dbxsd/v1.0">MSVSSolution</function> Builder (see below). </para> <para xmlns="http://www.scons.org/dbxsd/v1.0">
-The <function xmlns="http://www.scons.org/dbxsd/v1.0">MSVSProject</function> builder takes several lists of filenames to be placed into
-the project file. These are currently limited to <literal>srcs</literal>,
-<literal>incs</literal>, <literal>localincs</literal>,
-<literal>resources</literal>, and <literal>misc</literal>. These are pretty
-self-explanatory, but it should be noted that these lists are added to the
-<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SOURCES"><envar>$SOURCES</envar></link> construction variable as strings, NOT as SCons File Nodes.
-This is because they represent file names to be added to the project file, not
-the source files used to build the project file. </para> <para xmlns="http://www.scons.org/dbxsd/v1.0"> The above
-filename lists are all optional, although at least one must be specified for
-the resulting project file to be non-empty. </para> <para xmlns="http://www.scons.org/dbxsd/v1.0"> In addition to the
-above lists of values, the following values may be specified:
-</para><variablelist xmlns="http://www.scons.org/dbxsd/v1.0">
-    <varlistentry>
-      <term>target</term>
-
-      <listitem>
-        <para>The name of the target <filename>.dsp</filename> or
-        <filename>.vcproj</filename> file. The correct suffix for the version
-        of Visual Studio must be used, but the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-MSVSPROJECTSUFFIX"><envar>$MSVSPROJECTSUFFIX</envar></link>
-        construction variable will be defined to the correct value (see
-        example below).</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>variant</term>
-
-      <listitem>
-        <para>The name of this particular variant. For Visual Studio 7
-        projects, this can also be a list of variant names. These are
-        typically things like "Debug" or "Release", but really can be anything
-        you want. For Visual Studio 7 projects, they may also specify a target
-        platform separated from the variant name by a <literal>|</literal>
-        (vertical pipe) character: <literal>Debug|Xbox</literal>. The default
-        target platform is Win32. Multiple calls to <function xmlns="http://www.scons.org/dbxsd/v1.0">MSVSProject</function> with
-        different variants are allowed; all variants will be added to the
-        project file with their appropriate build targets and
-        sources.</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>cmdargs</term>
-
-      <listitem>
-        <para>Additional command line arguments for the different
-        variants. The number of <literal>cmdargs</literal> entries must match
-        the number of <literal>variant</literal> entries, or be empty (not
-        specified). If you give only one, it will automatically be propagated
-        to all variants.</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>buildtarget</term>
-
-      <listitem>
-        <para>An optional string, node, or list of strings or nodes (one
-        per build variant), to tell the Visual Studio debugger what output
-        target to use in what build variant. The number of
-        <literal>buildtarget</literal> entries must match the number of
-        <literal>variant</literal> entries.</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>runfile</term>
-
-      <listitem>
-        <para>The name of the file that Visual Studio 7 and later will
-        run and debug. This appears as the value of the
-        <literal>Output</literal> field in the resulting Visual Studio project
-        file. If this is not specified, the default is the same as the
-        specified <literal>buildtarget</literal> value.</para>
-      </listitem>
-    </varlistentry>
-  </variablelist><para xmlns="http://www.scons.org/dbxsd/v1.0"> Note that because <application xmlns="http://www.scons.org/dbxsd/v1.0">SCons</application> always executes its build
-commands from the directory in which the <filename xmlns="http://www.scons.org/dbxsd/v1.0">SConstruct</filename> file is located, if you
-generate a project file in a different directory than the <filename xmlns="http://www.scons.org/dbxsd/v1.0">SConstruct</filename>
-directory, users will not be able to double-click on the file name in
-compilation error messages displayed in the Visual Studio console output
-window. This can be remedied by adding the Visual C/C++ <literal>/FC</literal>
-compiler option to the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-CCFLAGS"><envar>$CCFLAGS</envar></link> variable so that the compiler will
-print the full path name of any files that cause compilation errors. </para>
-<para xmlns="http://www.scons.org/dbxsd/v1.0"> Example usage: </para>
-    <example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
+    <listitem>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">
+        Builds a Microsoft Visual Studio project file, and by default
+        builds a solution file as well.
+      </para>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">
+        This builds a Visual Studio project file, based on the
+        version of Visual Studio that is configured (either the
+        latest installed version, or the version specified by
+        <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-MSVS_VERSION"><envar>$MSVS_VERSION</envar></link> in the Environment constructor). For
+        Visual Studio 6, it will generate a <filename>.dsp</filename>
+        file. For Visual Studio 7 (.NET) and later versions, it will
+        generate a <filename>.vcproj</filename> file.
+      </para>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">
+        By default, this also generates a solution file for the
+        specified project, a <filename>.dsw</filename> file for
+        Visual Studio 6 or a <filename>.sln</filename> file for
+        Visual Studio 7 (.NET). This behavior may be disabled by
+        specifying <literal>auto_build_solution=0</literal> when you
+        call <function xmlns="http://www.scons.org/dbxsd/v1.0">MSVSProject</function>, in which case you presumably want to
+        build the solution file(s) by calling the <function xmlns="http://www.scons.org/dbxsd/v1.0">MSVSSolution</function>
+        Builder (see below).
+      </para>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">
+        The <function xmlns="http://www.scons.org/dbxsd/v1.0">MSVSProject</function> builder takes several lists of filenames
+        to be placed into the project file. These are currently
+        limited to <literal>srcs</literal>, <literal>incs</literal>,
+        <literal>localincs</literal>, <literal>resources</literal>, and
+        <literal>misc</literal>. These are pretty self-explanatory,
+        but it should be noted that these lists are added to the
+        <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SOURCES"><envar>$SOURCES</envar></link> construction variable as strings, NOT as
+        SCons File Nodes.  This is because they represent file names
+        to be added to the project file, not the source files used
+        to build the project file.
+      </para>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">
+        The above filename lists are all optional, although at least
+        one must be specified for the resulting project file to
+        be non-empty.
+      </para>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">
+        In addition to the above lists of values, the following values
+        may be specified:
+      </para>
+      <variablelist xmlns="http://www.scons.org/dbxsd/v1.0">
+        <varlistentry>
+          <term>target</term>
+          <listitem>
+            <para>
+              The name of the target <filename>.dsp</filename>
+              or <filename>.vcproj</filename> file.
+              The correct suffix for the version of Visual Studio
+              must be used, but the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-MSVSPROJECTSUFFIX"><envar>$MSVSPROJECTSUFFIX</envar></link>
+              construction variable will be defined to the correct
+              value (see example below).
+            </para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>variant</term>
+          <listitem>
+            <para>
+              The name of this particular variant. For Visual Studio 7
+              projects, this can also be a list of variant names. These
+              are typically things like "Debug" or "Release", but
+              really can be anything you want. For Visual Studio
+              7 projects, they may also specify a target platform
+              separated from the variant name by a <literal>|</literal>
+              (vertical pipe) character: <literal>Debug|Xbox</literal>.
+              The default target platform is Win32. Multiple calls
+              to <function xmlns="http://www.scons.org/dbxsd/v1.0">MSVSProject</function> with different variants are allowed;
+              all variants will be added to the project file with
+              their appropriate build targets and sources.
+            </para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>cmdargs</term>
+          <listitem>
+            <para>
+              Additional command line arguments
+              for the different variants. The number of
+              <literal>cmdargs</literal> entries must match the number
+              of <literal>variant</literal> entries, or be empty (not
+              specified). If you give only one, it will automatically
+              be propagated to all variants.
+            </para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>buildtarget</term>
+          <listitem>
+            <para>
+              An optional string, node, or list of strings
+              or nodes (one per build variant), to tell
+              the Visual Studio debugger what output target
+              to use in what build variant. The number of
+              <literal>buildtarget</literal> entries must match the
+              number of <literal>variant</literal> entries.
+            </para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>runfile</term>
+          <listitem>
+            <para>
+              The name of the file that Visual Studio 7 and
+              later will run and debug. This appears as the
+              value of the <literal>Output</literal> field in the
+              resulting Visual Studio project file. If this is not
+              specified, the default is the same as the specified
+              <literal>buildtarget</literal> value.
+            </para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">
+        Note that because <application xmlns="http://www.scons.org/dbxsd/v1.0">SCons</application> always executes its build commands
+        from the directory in which the <filename xmlns="http://www.scons.org/dbxsd/v1.0">SConstruct</filename> file is located,
+        if you generate a project file in a different directory
+        than the <filename xmlns="http://www.scons.org/dbxsd/v1.0">SConstruct</filename> directory, users will not be able to
+        double-click on the file name in compilation error messages
+        displayed in the Visual Studio console output window. This can
+        be remedied by adding the Visual C/C++ <literal>/FC</literal>
+        compiler option to the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-CCFLAGS"><envar>$CCFLAGS</envar></link> variable so that
+        the compiler will print the full path name of any files that
+        cause compilation errors.
+      </para>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">Example usage:</para>
+      <example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 barsrcs = ['bar.cpp']
 barincs = ['bar.h']
 barlocalincs = ['StdAfx.h']
 barresources = ['bar.rc','resource.h']
 barmisc = ['bar_readme.txt']
 
-dll = env.SharedLibrary(target = 'bar.dll',
-                        source = barsrcs)
+dll = env.SharedLibrary(target='bar.dll',
+                        source=barsrcs)
 buildtarget = [s for s in dll if str(s).endswith('dll')]
-env.MSVSProject(target = 'Bar' + env['MSVSPROJECTSUFFIX'],
-                srcs = barsrcs,
-                incs = barincs,
-                localincs = barlocalincs,
-                resources = barresources,
-                misc = barmisc,
-                buildtarget = buildtarget,
-                variant = 'Release')
-</example_commands>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">Starting with version 2.4 of
-SCons it's also possible to specify the optional argument
-<parameter>DebugSettings</parameter>, which creates files for debugging under
-Visual Studio:</para><variablelist xmlns="http://www.scons.org/dbxsd/v1.0">
-    <varlistentry>
-      <term>DebugSettings</term>
-
-      <listitem>
-        <para>A dictionary of debug settings that get written to the
-        <filename>.vcproj.user</filename> or the
-        <filename>.vcxproj.user</filename> file, depending on the version
-        installed. As it is done for cmdargs (see above), you can specify a
-        <parameter>DebugSettings</parameter> dictionary per variant. If you
-        give only one, it will be propagated to all variants.</para>
-      </listitem>
-    </varlistentry>
-  </variablelist><para xmlns="http://www.scons.org/dbxsd/v1.0">Currently, only Visual Studio v9.0 and Visual Studio
-version v11 are implemented, for other versions no file is generated. To
-generate the user file, you just need to add a
-<parameter>DebugSettings</parameter> dictionary to the environment with the
-right parameters for your MSVS version. If the dictionary is empty, or does
-not contain any good value, no file will be generated.</para><para xmlns="http://www.scons.org/dbxsd/v1.0">Following
-is a more contrived example, involving the setup of a project for variants and
-DebugSettings:</para><example_commands xmlns="http://www.scons.org/dbxsd/v1.0"># Assuming you store your defaults in a file
+env.MSVSProject(target='Bar' + env['MSVSPROJECTSUFFIX'],
+                srcs=barsrcs,
+                incs=barincs,
+                localincs=barlocalincs,
+                resources=barresources,
+                misc=barmisc,
+                buildtarget=buildtarget,
+                variant='Release')
+      </example_commands>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">
+        Starting with version 2.4 of SCons it is
+        also possible to specify the optional argument
+        <parameter>DebugSettings</parameter>, which creates files
+        for debugging under Visual Studio:
+      </para>
+      <variablelist xmlns="http://www.scons.org/dbxsd/v1.0">
+        <varlistentry>
+          <term>DebugSettings</term>
+          <listitem>
+            <para>
+              A dictionary of debug settings that get written
+              to the <filename>.vcproj.user</filename> or the
+              <filename>.vcxproj.user</filename> file, depending on the
+              version installed. As it is done for cmdargs (see above),
+              you can specify a <parameter>DebugSettings</parameter>
+              dictionary per variant. If you give only one, it will
+              be propagated to all variants.
+            </para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">
+        Currently, only Visual Studio v9.0 and Visual Studio
+        version v11 are implemented, for other versions no file
+        is generated. To generate the user file, you just need to
+        add a <parameter>DebugSettings</parameter> dictionary to the
+        environment with the right parameters for your MSVS version. If
+        the dictionary is empty, or does not contain any good value,
+        no file will be generated.
+      </para>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">
+        Following is a more contrived example, involving the setup
+        of a project for variants and DebugSettings:
+      </para>
+      <example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
+# Assuming you store your defaults in a file
 vars = Variables('variables.py')
 msvcver = vars.args.get('vc', '9')
 
@@ -988,7 +1032,7 @@ if msvcver == '9' or msvcver == '11':
   env = Environment(MSVC_VERSION=msvcver+'.0', MSVC_BATCH=False)
 else:
   env = Environment()
-    
+
 AddOption('--userfile', action='store_true', dest='userfile', default=False,
           help="Create Visual Studio Project user file")
 
@@ -1023,10 +1067,10 @@ V9DebugSettings = {
 }
 
 #
-# 2. Because there are a lot of different options depending on the Microsoft 
-# Visual Studio version, if you use more than one version you have to 
-# define a dictionary per version, for instance if you want to create a user 
-# file to launch a specific application for testing your dll with Microsoft 
+# 2. Because there are a lot of different options depending on the Microsoft
+# Visual Studio version, if you use more than one version you have to
+# define a dictionary per version, for instance if you want to create a user
+# file to launch a specific application for testing your dll with Microsoft
 # Visual Studio 2012 (v11):
 #
 V10DebugSettings = {
@@ -1058,7 +1102,7 @@ V10DebugSettings = {
 }
 
 #
-# 3. Select the dictionary you want depending on the version of visual Studio 
+# 3. Select the dictionary you want depending on the version of visual Studio
 # Files you want to generate.
 #
 if not env.GetOption('userfile'):
@@ -1067,7 +1111,7 @@ elif env.get('MSVC_VERSION', None) == '9.0':
     dbgSettings = V9DebugSettings
 elif env.get('MSVC_VERSION', None) == '11.0':
     dbgSettings = V10DebugSettings
-else:    
+else:
     dbgSettings = None
 
 #
@@ -1079,20 +1123,21 @@ barlocalincs = ['StdAfx.h']
 barresources = ['bar.rc','resource.h']
 barmisc = ['ReadMe.txt']
 
-dll = env.SharedLibrary(target = 'bar.dll',
-                        source = barsrcs)
-
-env.MSVSProject(target = 'Bar' + env['MSVSPROJECTSUFFIX'],
-                srcs = barsrcs,
-                incs = barincs,
-                localincs = barlocalincs,
-                resources = barresources,
-                misc = barmisc,
-                buildtarget = [dll[0]] * 2,
-                variant = ('Debug|Win32', 'Release|Win32'),
-                cmdargs = 'vc=%s' %  msvcver,
-                DebugSettings = (dbgSettings, {}))
-</example_commands> </listitem>
+dll = env.SharedLibrary(target='bar.dll',
+                        source=barsrcs)
+
+env.MSVSProject(target='Bar' + env['MSVSPROJECTSUFFIX'],
+                srcs=barsrcs,
+                incs=barincs,
+                localincs=barlocalincs,
+                resources=barresources,
+                misc=barmisc,
+                buildtarget=[dll[0]] * 2,
+                variant=('Debug|Win32', 'Release|Win32'),
+                cmdargs='vc=%s' %  msvcver,
+                DebugSettings=(dbgSettings, {}))
+      </example_commands>
+    </listitem>
   </varlistentry>
   <varlistentry id="b-MSVSSolution">
     <term>
@@ -1101,54 +1146,60 @@ env.MSVSProject(target = 'Bar' + env['MSVSPROJECTSUFFIX'],
     <term>
       <function>env.MSVSSolution()</function>
     </term>
-    <listitem> <para xmlns="http://www.scons.org/dbxsd/v1.0">Builds a Microsoft Visual Studio solution
-file. </para> <para xmlns="http://www.scons.org/dbxsd/v1.0">This builds a Visual Studio solution file, based on the
-version of Visual Studio that is configured (either the latest installed
-version, or the version specified by <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-MSVS_VERSION"><envar>$MSVS_VERSION</envar></link> in the
-construction environment). For Visual Studio 6, it will generate a
-<filename>.dsw</filename> file. For Visual Studio 7 (.NET), it will generate a
-<filename>.sln</filename> file. </para> <para xmlns="http://www.scons.org/dbxsd/v1.0"> The following values must be
-specified: </para><variablelist xmlns="http://www.scons.org/dbxsd/v1.0">
-    <varlistentry>
-      <term>target</term>
-
-      <listitem>
-        <para>The name of the target .dsw or .sln file. The correct
-        suffix for the version of Visual Studio must be used, but the value
-        <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-MSVSSOLUTIONSUFFIX"><envar>$MSVSSOLUTIONSUFFIX</envar></link> will be defined to the correct value (see
-        example below).</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>variant</term>
-
-      <listitem>
-        <para>The name of this particular variant, or a list of variant
-        names (the latter is only supported for MSVS 7 solutions). These are
-        typically things like "Debug" or "Release", but really can be anything
-        you want. For MSVS 7 they may also specify target platform, like this
-        "Debug|Xbox". Default platform is Win32.</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>projects</term>
-
-      <listitem>
-        <para>A list of project file names, or Project nodes returned by
-        calls to the <function xmlns="http://www.scons.org/dbxsd/v1.0">MSVSProject</function> Builder, to be placed into the solution
-        file. It should be noted that these file names are NOT added to the
-        $SOURCES environment variable in form of files, but rather as strings.
-        This is because they represent file names to be added to the solution
-        file, not the source files used to build the solution
-        file.</para>
-      </listitem>
-    </varlistentry>
-  </variablelist> <para xmlns="http://www.scons.org/dbxsd/v1.0"> Example Usage: </para> <example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
-env.MSVSSolution(target = 'Bar' + env['MSVSSOLUTIONSUFFIX'], projects = ['bar'
-+ env['MSVSPROJECTSUFFIX']], variant = 'Release')
-</example_commands></listitem>
+    <listitem>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">Builds a Microsoft Visual Studio solution file.</para>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">
+        This builds a Visual Studio solution file, based on the
+        version of Visual Studio that is configured (either the
+        latest installed version, or the version specified by
+        <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-MSVS_VERSION"><envar>$MSVS_VERSION</envar></link> in the construction environment). For
+        Visual Studio 6, it will generate a <filename>.dsw</filename>
+        file. For Visual Studio 7 (.NET), it will generate a
+        <filename>.sln</filename> file.
+      </para>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">The following values must be specified:</para>
+      <variablelist xmlns="http://www.scons.org/dbxsd/v1.0">
+        <varlistentry>
+          <term>target</term>
+          <listitem>
+            <para>
+              The name of the target .dsw or .sln file. The correct
+              suffix for the version of Visual Studio must be used,
+              but the value <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-MSVSSOLUTIONSUFFIX"><envar>$MSVSSOLUTIONSUFFIX</envar></link> will be
+              defined to the correct value (see example below).
+            </para>
+          </listitem>
+        </varlistentry> <varlistentry>
+          <term>variant</term> <listitem>
+            <para>
+              The name of this particular variant, or a list of
+              variant names (the latter is only supported for MSVS
+              7 solutions). These are typically things like "Debug"
+              or "Release", but really can be anything you want. For
+              MSVS 7 they may also specify target platform, like this
+              "Debug|Xbox". Default platform is Win32.
+            </para>
+          </listitem>
+        </varlistentry> <varlistentry>
+          <term>projects</term> <listitem>
+            <para>
+              A list of project file names, or Project nodes returned
+              by calls to the <function xmlns="http://www.scons.org/dbxsd/v1.0">MSVSProject</function> Builder, to be placed
+              into the solution file. It should be noted that these
+              file names are NOT added to the $SOURCES environment
+              variable in form of files, but rather as strings.
+              This is because they represent file names to be added
+              to the solution file, not the source files used to
+              build the solution file.
+            </para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">Example Usage:</para>
+      <example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
+env.MSVSSolution(target='Bar' + env['MSVSSOLUTIONSUFFIX'], projects=['bar' + env['MSVSPROJECTSUFFIX']], variant='Release')
+      </example_commands>
+    </listitem>
   </varlistentry>
   <varlistentry id="b-Object">
     <term>
diff --git a/doc/generated/tools.gen b/doc/generated/tools.gen
index 7661110..88bd11a 100644
--- a/doc/generated/tools.gen
+++ b/doc/generated/tools.gen
@@ -750,8 +750,9 @@ Sets construction variables for the Microsoft Visual C/C++ compiler.
   </varlistentry>
   <varlistentry id="t-msvs">
     <term>msvs</term>
-    <listitem> <para xmlns="http://www.scons.org/dbxsd/v1.0">
-Sets construction variables for Microsoft Visual Studio. </para> <para>Sets:  &cv-link-MSVSBUILDCOM;, &cv-link-MSVSCLEANCOM;, &cv-link-MSVSENCODING;, &cv-link-MSVSPROJECTCOM;, &cv-link-MSVSREBUILDCOM;, &cv-link-MSVSSCONS;, &cv-link-MSVSSCONSCOM;, &cv-link-MSVSSCONSCRIPT;, &cv-link-MSVSSCONSFLAGS;, &cv-link-MSVSSOLUTIONCOM;.</para></listitem>
+    <listitem>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">Sets construction variables for Microsoft Visual Studio.</para>
+    <para>Sets:  &cv-link-MSVSBUILDCOM;, &cv-link-MSVSCLEANCOM;, &cv-link-MSVSENCODING;, &cv-link-MSVSPROJECTCOM;, &cv-link-MSVSREBUILDCOM;, &cv-link-MSVSSCONS;, &cv-link-MSVSSCONSCOM;, &cv-link-MSVSSCONSCRIPT;, &cv-link-MSVSSCONSFLAGS;, &cv-link-MSVSSOLUTIONCOM;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-mwcc">
     <term>mwcc</term>
@@ -778,19 +779,19 @@ Sets construction variables for the
 </para>
 <para>Sets:  &cv-link-AS;, &cv-link-ASCOM;, &cv-link-ASFLAGS;, &cv-link-ASPPCOM;, &cv-link-ASPPFLAGS;.</para><para>Uses:  &cv-link-ASCOMSTR;, &cv-link-ASPPCOMSTR;.</para></listitem>
   </varlistentry>
-  <varlistentry id="t-packaging">
-    <term>packaging</term>
+  <varlistentry id="t-Packaging">
+    <term>Packaging</term>
     <listitem>
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
-A framework for building binary and source packages.
+Sets construction variables for the <function xmlns="http://www.scons.org/dbxsd/v1.0">Package</function> Builder.
 </para>
 </listitem>
   </varlistentry>
-  <varlistentry id="t-Packaging">
-    <term>Packaging</term>
+  <varlistentry id="t-packaging">
+    <term>packaging</term>
     <listitem>
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
-Sets construction variables for the <function xmlns="http://www.scons.org/dbxsd/v1.0">Package</function> Builder.
+A framework for building binary and source packages.
 </para>
 </listitem>
   </varlistentry>
diff --git a/doc/generated/variables.gen b/doc/generated/variables.gen
index 4e84fbc..194fb72 100644
--- a/doc/generated/variables.gen
+++ b/doc/generated/variables.gen
@@ -3032,15 +3032,6 @@ is <quote><literal>-dNOPAUSE -dBATCH -sDEVICE=pdfwrite</literal></quote>
     <term>HOST_ARCH</term>
     <listitem>
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
-        The name of the host hardware architecture used to create the Environment.
-        If a platform is specified when creating the Environment, then
-        that Platform's logic will handle setting this value.
-        This value is immutable, and should not be changed by the user after
-        the Environment is initialized.
-        Currently only set for Win32.
-</para>
-    
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Sets the host architecture for Visual Studio compiler. If not set,
 default to the detected host architecture: note that this may depend
 on the python you are using.
@@ -3056,7 +3047,16 @@ Valid values are the same as for <envar xmlns="http://www.scons.org/dbxsd/v1.0">
 This is currently only used on Windows, but in the future it will be
 used on other OSes as well.
 </para>
-</listitem>
+
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+        The name of the host hardware architecture used to create the Environment.
+        If a platform is specified when creating the Environment, then
+        that Platform's logic will handle setting this value.
+        This value is immutable, and should not be changed by the user after
+        the Environment is initialized.
+        Currently only set for Win32.
+</para>
+    </listitem>
   </varlistentry>
   <varlistentry id="cv-HOST_OS">
     <term>HOST_OS</term>
@@ -3298,7 +3298,7 @@ The command line used to call the Java archive tool.
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
 The string displayed when the Java archive tool
 is called
-If this is not set, then <envar xmlns="http://www.scons.org/dbxsd/v1.0">$JARCOM</envar> (the command line) is displayed.
+If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-JARCOM"><envar>$JARCOM</envar></link> (the command line) is displayed.
 </para>
 
 <example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
@@ -3308,7 +3308,7 @@ env = Environment(JARCOMSTR = "JARchiving $SOURCES into $TARGET")
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
 The string displayed when the Java archive tool
 is called
-If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-JARCOM"><envar>$JARCOM</envar></link> (the command line) is displayed.
+If this is not set, then <envar xmlns="http://www.scons.org/dbxsd/v1.0">$JARCOM</envar> (the command line) is displayed.
 </para>
 
 <example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
@@ -4511,254 +4511,308 @@ Versions ending in <literal>Exp</literal> refer to "Express" or
   </varlistentry>
   <varlistentry id="cv-MSVS">
     <term>MSVS</term>
-    <listitem> <para xmlns="http://www.scons.org/dbxsd/v1.0">
-When the Microsoft Visual Studio tools are initialized, they set up this
-dictionary with the following keys: </para><variablelist xmlns="http://www.scons.org/dbxsd/v1.0">
-    <varlistentry>
-      <term>VERSION</term>
-
-      <listitem>
-        <para>the version of MSVS being used (can be set via
-        <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-MSVS_VERSION"><envar>$MSVS_VERSION</envar></link>)</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>VERSIONS</term>
-
-      <listitem>
-        <para>the available versions of MSVS installed</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>VCINSTALLDIR</term>
-
-      <listitem>
-        <para>installed directory of Visual C++</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>VSINSTALLDIR</term>
-
-      <listitem>
-        <para>installed directory of Visual Studio</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>FRAMEWORKDIR</term>
-
-      <listitem>
-        <para>installed directory of the .NET framework</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>FRAMEWORKVERSIONS</term>
-
-      <listitem>
-        <para>list of installed versions of the .NET framework, sorted
-        latest to oldest.</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>FRAMEWORKVERSION</term>
-
-      <listitem>
-        <para>latest installed version of the .NET
-        framework</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>FRAMEWORKSDKDIR</term>
-
-      <listitem>
-        <para>installed location of the .NET SDK.</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>PLATFORMSDKDIR</term>
-
-      <listitem>
-        <para>installed location of the Platform SDK.</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>PLATFORMSDK_MODULES</term>
-
-      <listitem>
-        <para>dictionary of installed Platform SDK modules, where the
-        dictionary keys are keywords for the various modules, and the values
-        are 2-tuples where the first is the release date, and the second is
-        the version number.</para>
-      </listitem>
-    </varlistentry>
-  </variablelist><para xmlns="http://www.scons.org/dbxsd/v1.0">If a value isn't set, it wasn't available in the
-registry.</para></listitem>
+    <listitem>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">
+        When the Microsoft Visual Studio tools are initialized,
+        they set up this dictionary with the following keys:
+      </para>
+      <variablelist xmlns="http://www.scons.org/dbxsd/v1.0">
+        <varlistentry>
+          <term>VERSION</term> <listitem>
+            <para>the version of MSVS being used (can be set via
+            <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-MSVS_VERSION"><envar>$MSVS_VERSION</envar></link>)</para>
+          </listitem>
+        </varlistentry> <varlistentry>
+          <term>VERSIONS</term> <listitem>
+            <para>the available versions of MSVS installed</para>
+          </listitem>
+        </varlistentry> <varlistentry>
+          <term>VCINSTALLDIR</term> <listitem>
+            <para>installed directory of Visual C++</para>
+          </listitem>
+        </varlistentry> <varlistentry>
+          <term>VSINSTALLDIR</term> <listitem>
+            <para>installed directory of Visual Studio</para>
+          </listitem>
+        </varlistentry> <varlistentry>
+          <term>FRAMEWORKDIR</term> <listitem>
+            <para>installed directory of the .NET framework</para>
+          </listitem>
+        </varlistentry> <varlistentry>
+          <term>FRAMEWORKVERSIONS</term> <listitem>
+            <para>
+              list of installed versions of the .NET framework,
+              sorted latest to oldest.
+            </para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>FRAMEWORKVERSION</term>
+          <listitem>
+            <para>latest installed version of the .NET framework</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>FRAMEWORKSDKDIR</term>
+          <listitem>
+            <para>installed location of the .NET SDK.</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>PLATFORMSDKDIR</term>
+          <listitem>
+            <para>installed location of the Platform SDK.</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>PLATFORMSDK_MODULES</term>
+          <listitem>
+            <para>
+              dictionary of installed Platform SDK modules, where the
+              dictionary keys are keywords for the various modules,
+              and the values are 2-tuples where the first is the
+              release date, and the second is the version number.
+            </para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">If a value is not set, it was not available in the registry.</para>
+    </listitem>
   </varlistentry>
   <varlistentry id="cv-MSVS_ARCH">
     <term>MSVS_ARCH</term>
-    <listitem> <para xmlns="http://www.scons.org/dbxsd/v1.0">Sets
-the architecture for which the generated project(s) should build. </para>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">The default value is <literal>x86</literal>. <literal>amd64</literal> is
-also supported by <application xmlns="http://www.scons.org/dbxsd/v1.0">SCons</application> for some Visual Studio versions. Trying to set
-<envar xmlns="http://www.scons.org/dbxsd/v1.0">$MSVS_ARCH</envar> to an architecture that's not supported for a given Visual
-Studio version will generate an error. </para> </listitem>
+    <listitem>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">Sets the architecture for which the generated project(s)
+      should build.</para> <para xmlns="http://www.scons.org/dbxsd/v1.0">
+        The default value is <literal>x86</literal>.
+        <literal>amd64</literal> is also supported by <application xmlns="http://www.scons.org/dbxsd/v1.0">SCons</application> for
+        some Visual Studio versions. Trying to set <envar xmlns="http://www.scons.org/dbxsd/v1.0">$MSVS_ARCH</envar>
+        to an architecture that's not supported for a given Visual
+        Studio version will generate an error.
+      </para>
+    </listitem>
   </varlistentry>
   <varlistentry id="cv-MSVS_PROJECT_GUID">
     <term>MSVS_PROJECT_GUID</term>
-    <listitem> <para xmlns="http://www.scons.org/dbxsd/v1.0">The string placed in a generated
+    <listitem>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">
+        The string placed in a generated
 Microsoft Visual Studio project file as the value of the
-<literal>ProjectGUID</literal> attribute. There is no default value. If not
-defined, a new GUID is generated. </para> </listitem>
+        <literal>ProjectGUID</literal> attribute. There is no default
+        value. If not
+defined, a new GUID is generated.
+
+      </para>
+    </listitem>
   </varlistentry>
   <varlistentry id="cv-MSVS_SCC_AUX_PATH">
     <term>MSVS_SCC_AUX_PATH</term>
-    <listitem> <para xmlns="http://www.scons.org/dbxsd/v1.0">The path name placed in a generated
+    <listitem>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">
+        The path name placed in a generated
 Microsoft Visual Studio project file as the value of the
-<literal>SccAuxPath</literal> attribute if the
-<envar>MSVS_SCC_PROVIDER</envar> construction variable is also set. There is
-no default value. </para> </listitem>
+        <literal>SccAuxPath</literal> attribute if the
+        <envar>MSVS_SCC_PROVIDER</envar> construction variable is
+        also set. There is
+no default value.
+
+      </para>
+    </listitem>
   </varlistentry>
   <varlistentry id="cv-MSVS_SCC_CONNECTION_ROOT">
     <term>MSVS_SCC_CONNECTION_ROOT</term>
-    <listitem> <para xmlns="http://www.scons.org/dbxsd/v1.0">The root path of projects in
-your SCC workspace, i.e the path under which all project and solution files
-will be generated. It is used as a reference path from which the relative
-paths of the generated Microsoft Visual Studio project and solution files are
-computed. The relative project file path is placed as the value of the
-<literal>SccLocalPath</literal> attribute of the project file and as the
-values of the
-<literal>SccProjectFilePathRelativizedFromConnection[i]</literal> (where [i]
-ranges from 0 to the number of projects in the solution) attributes of the
-<literal>GlobalSection(SourceCodeControl)</literal> section of the Microsoft
-Visual Studio solution file. Similarly the relative solution file path is
-placed as the values of the <literal>SccLocalPath[i]</literal> (where [i]
-ranges from 0 to the number of projects in the solution) attributes of the
-<literal>GlobalSection(SourceCodeControl)</literal> section of the Microsoft
-Visual Studio solution file. This is used only if the
-<envar>MSVS_SCC_PROVIDER</envar> construction variable is also set. The
-default value is the current working directory. </para> </listitem>
+    <listitem>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">
+        The root path of projects in your SCC workspace, i.e the
+        path under which all project and solution files will be
+        generated. It is used as a reference path from which the
+        relative paths of the generated Microsoft Visual Studio project
+        and solution files are computed. The relative project file path
+        is placed as the value of the <literal>SccLocalPath</literal>
+        attribute of the project file and as the values of the
+        <literal>SccProjectFilePathRelativizedFromConnection[i]</literal>
+        (where [i] ranges from 0 to the number of projects in the solution)
+        attributes of the <literal>GlobalSection(SourceCodeControl)</literal>
+        section of the Microsoft Visual Studio solution file. Similarly
+        the relative solution file path is placed as the values of the
+        <literal>SccLocalPath[i]</literal> (where [i] ranges from 0
+        to the number of projects in the solution) attributes of the
+        <literal>GlobalSection(SourceCodeControl)</literal> section of
+        the Microsoft Visual Studio solution file. This is used only if
+        the <envar>MSVS_SCC_PROVIDER</envar> construction variable is
+        also set. The default value is the current working directory.
+      </para>
+    </listitem>
   </varlistentry>
   <varlistentry id="cv-MSVS_SCC_PROJECT_NAME">
     <term>MSVS_SCC_PROJECT_NAME</term>
-    <listitem> <para xmlns="http://www.scons.org/dbxsd/v1.0">The project name placed in
-a generated Microsoft Visual Studio project file as the value of the
-<literal>SccProjectName</literal> attribute if the
-<envar>MSVS_SCC_PROVIDER</envar> construction variable is also set. In this
-case the string is also placed in the <literal>SccProjectName0</literal>
-attribute of the <literal>GlobalSection(SourceCodeControl)</literal> section
-of the Microsoft Visual Studio solution file. There is no default value.
-</para> </listitem>
+    <listitem>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">
+        The project name placed in a generated Microsoft
+        Visual Studio project file as the value of the
+        <literal>SccProjectName</literal> attribute if the
+        <envar>MSVS_SCC_PROVIDER</envar> construction variable
+        is also set. In this case the string is also placed in
+        the <literal>SccProjectName0</literal> attribute of the
+        <literal>GlobalSection(SourceCodeControl)</literal> section
+        of the Microsoft Visual Studio solution file. There is no
+        default value.
+      </para>
+    </listitem>
   </varlistentry>
   <varlistentry id="cv-MSVS_SCC_PROVIDER">
     <term>MSVS_SCC_PROVIDER</term>
-    <listitem> <para xmlns="http://www.scons.org/dbxsd/v1.0">The
-string placed in a generated Microsoft Visual Studio project file as the value
-of the <literal>SccProvider</literal> attribute. The string is also placed in
-the <literal>SccProvider0</literal> attribute of the
-<literal>GlobalSection(SourceCodeControl)</literal> section of the Microsoft
-Visual Studio solution file. There is no default value. </para> </listitem>
+    <listitem>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">
+        The string placed in a generated Microsoft
+        Visual Studio project file as the value of the
+        <literal>SccProvider</literal> attribute. The string is
+        also placed in the <literal>SccProvider0</literal> attribute
+        of the <literal>GlobalSection(SourceCodeControl)</literal>
+        section of the Microsoft Visual Studio solution file. There
+        is no default value.
+      </para>
+    </listitem>
   </varlistentry>
   <varlistentry id="cv-MSVS_VERSION">
     <term>MSVS_VERSION</term>
-    <listitem> <para xmlns="http://www.scons.org/dbxsd/v1.0">Sets the preferred version
-of Microsoft Visual Studio to use. </para> <para xmlns="http://www.scons.org/dbxsd/v1.0">If <envar xmlns="http://www.scons.org/dbxsd/v1.0">$MSVS_VERSION</envar> is not
-set, <application xmlns="http://www.scons.org/dbxsd/v1.0">SCons</application> will (by default) select the latest version of Visual Studio
-installed on your system. So, if you have version 6 and version 7 (MSVS .NET)
-installed, it will prefer version 7. You can override this by specifying the
-<envar>MSVS_VERSION</envar> variable in the Environment initialization,
-setting it to the appropriate version ('6.0' or '7.0', for example). If the
-specified version isn't installed, tool initialization will fail. </para>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">This is obsolete: use <envar xmlns="http://www.scons.org/dbxsd/v1.0">$MSVC_VERSION</envar> instead. If <envar xmlns="http://www.scons.org/dbxsd/v1.0">$MSVS_VERSION</envar> is
-set and <envar xmlns="http://www.scons.org/dbxsd/v1.0">$MSVC_VERSION</envar> is not, <envar xmlns="http://www.scons.org/dbxsd/v1.0">$MSVC_VERSION</envar> will be set automatically
-to <envar xmlns="http://www.scons.org/dbxsd/v1.0">$MSVS_VERSION</envar>. If both are set to different values, scons will raise an
-error. </para> </listitem>
+    <listitem>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">Sets the preferred version of Microsoft Visual Studio to use.</para>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">
+        If <envar xmlns="http://www.scons.org/dbxsd/v1.0">$MSVS_VERSION</envar> is not set, <application xmlns="http://www.scons.org/dbxsd/v1.0">SCons</application> will (by default)
+        select the latest version of Visual Studio installed on your
+        system. So, if you have version 6 and version 7 (MSVS .NET)
+        installed, it will prefer version 7. You can override this by
+        specifying the <envar>MSVS_VERSION</envar> variable in the
+        Environment initialization, setting it to the appropriate
+        version ('6.0' or '7.0', for example). If the specified
+        version isn't installed, tool initialization will fail.
+      </para>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">
+        This is obsolete: use <envar xmlns="http://www.scons.org/dbxsd/v1.0">$MSVC_VERSION</envar> instead. If
+        <envar xmlns="http://www.scons.org/dbxsd/v1.0">$MSVS_VERSION</envar> is set and <envar xmlns="http://www.scons.org/dbxsd/v1.0">$MSVC_VERSION</envar> is
+        not, <envar xmlns="http://www.scons.org/dbxsd/v1.0">$MSVC_VERSION</envar> will be set automatically to
+        <envar xmlns="http://www.scons.org/dbxsd/v1.0">$MSVS_VERSION</envar>. If both are set to different values,
+        scons will raise an error.
+      </para>
+    </listitem>
   </varlistentry>
   <varlistentry id="cv-MSVSBUILDCOM">
     <term>MSVSBUILDCOM</term>
     <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">The build command line placed in a generated Microsoft Visual Studio
-project file. The default is to have Visual Studio invoke SCons with any
-specified build targets. </para> </listitem>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">
+        The build command line placed in a generated Microsoft Visual
+        Studio project file. The default is to have Visual Studio
+        invoke SCons with any specified build targets.
+      </para>
+    </listitem>
   </varlistentry>
   <varlistentry id="cv-MSVSCLEANCOM">
     <term>MSVSCLEANCOM</term>
-    <listitem> <para xmlns="http://www.scons.org/dbxsd/v1.0">The clean command line placed in a generated Microsoft Visual
-Studio project file. The default is to have Visual Studio invoke SCons with
-the -c option to remove any specified targets. </para> </listitem>
+    <listitem>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">
+        The clean command line placed in a generated Microsoft Visual
+        Studio project file. The default is to have Visual Studio
+        invoke SCons with the -c option to remove any specified
+        targets.
+      </para>
+    </listitem>
   </varlistentry>
   <varlistentry id="cv-MSVSENCODING">
     <term>MSVSENCODING</term>
-    <listitem> <para xmlns="http://www.scons.org/dbxsd/v1.0">The encoding string placed in a
-generated Microsoft Visual Studio project file. The default is encoding
-<literal>Windows-1252</literal>. </para> </listitem>
+    <listitem>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">
+        The encoding string placed in a generated Microsoft
+        Visual Studio project file. The default is encoding
+        <literal>Windows-1252</literal>.
+      </para>
+    </listitem>
   </varlistentry>
   <varlistentry id="cv-MSVSPROJECTCOM">
     <term>MSVSPROJECTCOM</term>
-    <listitem> <para xmlns="http://www.scons.org/dbxsd/v1.0">The action used to generate Microsoft
-Visual Studio project files. </para> </listitem>
+    <listitem>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">The action used to generate Microsoft Visual Studio project files.</para>
+    </listitem>
   </varlistentry>
   <varlistentry id="cv-MSVSPROJECTSUFFIX">
     <term>MSVSPROJECTSUFFIX</term>
-    <listitem> <para xmlns="http://www.scons.org/dbxsd/v1.0">The suffix used for Microsoft Visual
-Studio project (DSP) files. The default value is <filename>.vcproj</filename>
-when using Visual Studio version 7.x (.NET) or later version, and
-<filename>.dsp</filename> when using earlier versions of Visual Studio.
-</para> </listitem>
+    <listitem>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">
+        The suffix used for Microsoft Visual Studio project (DSP)
+        files. The default value is <filename>.vcproj</filename>
+        when using Visual Studio version 7.x (.NET) or later version,
+        and <filename>.dsp</filename> when using earlier versions of
+        Visual Studio.
+      </para>
+    </listitem>
   </varlistentry>
   <varlistentry id="cv-MSVSREBUILDCOM">
     <term>MSVSREBUILDCOM</term>
-    <listitem> <para xmlns="http://www.scons.org/dbxsd/v1.0">The
-rebuild command line placed in a generated Microsoft Visual Studio project
-file. The default is to have Visual Studio invoke SCons with any specified
-rebuild targets. </para> </listitem>
+    <listitem>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">
+        The rebuild command line placed in a generated Microsoft
+        Visual Studio project file. The default is to have Visual
+        Studio invoke SCons with any specified rebuild targets.
+
+      </para>
+    </listitem>
   </varlistentry>
   <varlistentry id="cv-MSVSSCONS">
     <term>MSVSSCONS</term>
     <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">The SCons used in generated Microsoft Visual Studio project files. The
-default is the version of SCons being used to generate the project file.
-</para> </listitem>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">
+        The SCons used in generated Microsoft Visual Studio project
+        files. The default is the version of SCons being used to
+        generate the project file.
+      </para>
+    </listitem>
   </varlistentry>
   <varlistentry id="cv-MSVSSCONSCOM">
     <term>MSVSSCONSCOM</term>
-    <listitem> <para xmlns="http://www.scons.org/dbxsd/v1.0">The default
-SCons command used in generated Microsoft Visual Studio project files. </para>
-</listitem>
+    <listitem>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">
+        The default SCons command used in generated Microsoft Visual
+        Studio project files.
+      </para>
+    </listitem>
   </varlistentry>
   <varlistentry id="cv-MSVSSCONSCRIPT">
     <term>MSVSSCONSCRIPT</term>
-    <listitem> <para xmlns="http://www.scons.org/dbxsd/v1.0">The sconscript
-file (that is, <filename xmlns="http://www.scons.org/dbxsd/v1.0">SConstruct</filename> or <filename xmlns="http://www.scons.org/dbxsd/v1.0">SConscript</filename> file) that will be invoked by
-Visual Studio project files (through the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-MSVSSCONSCOM"><envar>$MSVSSCONSCOM</envar></link> variable). The
-default is the same sconscript file that contains the call to <function xmlns="http://www.scons.org/dbxsd/v1.0">MSVSProject</function>
-to build the project file. </para> </listitem>
+    <listitem>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">
+        The sconscript file (that is, <filename xmlns="http://www.scons.org/dbxsd/v1.0">SConstruct</filename> or <filename xmlns="http://www.scons.org/dbxsd/v1.0">SConscript</filename>
+        file) that will be invoked by Visual Studio project files
+        (through the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-MSVSSCONSCOM"><envar>$MSVSSCONSCOM</envar></link> variable). The default
+        is the same sconscript file that contains the call to
+        <function xmlns="http://www.scons.org/dbxsd/v1.0">MSVSProject</function> to build the project file.
+      </para>
+    </listitem>
   </varlistentry>
   <varlistentry id="cv-MSVSSCONSFLAGS">
     <term>MSVSSCONSFLAGS</term>
-    <listitem> <para xmlns="http://www.scons.org/dbxsd/v1.0">The
-SCons flags used in generated Microsoft Visual Studio project files. </para>
-</listitem>
+    <listitem>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">
+        The SCons flags used in generated Microsoft Visual Studio project files.
+      </para>
+    </listitem>
   </varlistentry>
   <varlistentry id="cv-MSVSSOLUTIONCOM">
     <term>MSVSSOLUTIONCOM</term>
-    <listitem> <para xmlns="http://www.scons.org/dbxsd/v1.0">The action used to generate Microsoft
-Visual Studio solution files. </para> </listitem>
+    <listitem>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">The action used to generate Microsoft Visual Studio solution files.</para>
+    </listitem>
   </varlistentry>
   <varlistentry id="cv-MSVSSOLUTIONSUFFIX">
     <term>MSVSSOLUTIONSUFFIX</term>
-    <listitem> <para xmlns="http://www.scons.org/dbxsd/v1.0">The suffix used for Microsoft
-Visual Studio solution (DSW) files. The default value is
-<filename>.sln</filename> when using Visual Studio version 7.x (.NET), and
-<filename>.dsw</filename> when using earlier versions of Visual Studio.
-</para> </listitem>
+    <listitem>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">
+        The suffix used for Microsoft Visual Studio solution (DSW)
+        files. The default value is <filename>.sln</filename>
+        when using Visual Studio version 7.x (.NET), and
+        <filename>.dsw</filename> when using earlier versions of
+        Visual Studio.
+      </para>
+    </listitem>
   </varlistentry>
   <varlistentry id="cv-MT">
     <term>MT</term>
@@ -5973,11 +6027,15 @@ below, for more information.
   </varlistentry>
   <varlistentry id="cv-SCONS_HOME">
     <term>SCONS_HOME</term>
-    <listitem> <para xmlns="http://www.scons.org/dbxsd/v1.0">The
-(optional) path to the SCons library directory, initialized from the external
-environment. If set, this is used to construct a shorter and more efficient
-search path in the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-MSVSSCONS"><envar>$MSVSSCONS</envar></link> command line executed from Microsoft
-Visual Studio project files. </para> </listitem>
+    <listitem>
+      <para xmlns="http://www.scons.org/dbxsd/v1.0">
+        The (optional) path to the SCons library directory,
+        initialized from the external environment. If set, this is
+        used to construct a shorter and more efficient search path in
+        the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-MSVSSCONS"><envar>$MSVSSCONS</envar></link> command line executed from Microsoft
+        Visual Studio project files.
+      </para>
+    </listitem>
   </varlistentry>
   <varlistentry id="cv-SHCC">
     <term>SHCC</term>
@@ -6720,6 +6778,16 @@ Example <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHLIBVERSION">
 </para>
 </listitem>
   </varlistentry>
+  <varlistentry id="cv-SHLIBVERSIONFLAGS">
+    <term>SHLIBVERSIONFLAGS</term>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+Extra flags added to <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHLINKCOM"><envar>$SHLINKCOM</envar></link> when building versioned
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-SharedLibrary"><function>SharedLibrary</function></link>. These flags are only used when <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHLIBVERSION"><envar>$SHLIBVERSION</envar></link> is
+set.
+</para>
+</listitem>
+  </varlistentry>
   <varlistentry id="cv-_SHLIBVERSIONFLAGS">
     <term>_SHLIBVERSIONFLAGS</term>
     <listitem>
@@ -6733,16 +6801,6 @@ and some extra dynamically generated options (such as
 </para>
 </listitem>
   </varlistentry>
-  <varlistentry id="cv-SHLIBVERSIONFLAGS">
-    <term>SHLIBVERSIONFLAGS</term>
-    <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-Extra flags added to <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHLINKCOM"><envar>$SHLINKCOM</envar></link> when building versioned
-<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-SharedLibrary"><function>SharedLibrary</function></link>. These flags are only used when <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHLIBVERSION"><envar>$SHLIBVERSION</envar></link> is
-set.
-</para>
-</listitem>
-  </varlistentry>
   <varlistentry id="cv-SHLINK">
     <term>SHLINK</term>
     <listitem>
@@ -7206,13 +7264,6 @@ that may not be set or used in a construction environment.
     <term>TARGET_ARCH</term>
     <listitem>
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
-        The name of the target hardware architecture for the compiled objects
-        created by this Environment.
-        This defaults to the value of HOST_ARCH, and the user can override it.
-        Currently only set for Win32.
-</para>
-    
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Sets the target architecture for Visual Studio compiler (i.e. the arch
 of the binaries generated by the compiler). If not set, default to
 <envar xmlns="http://www.scons.org/dbxsd/v1.0">$HOST_ARCH</envar>, or, if that is unset, to the architecture of the
@@ -7243,7 +7294,14 @@ and <literal>ia64</literal> (Itanium).
 For example, if you want to compile 64-bit binaries, you would set
 <literal>TARGET_ARCH='x86_64'</literal> in your SCons environment.
 </para>
-</listitem>
+
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+        The name of the target hardware architecture for the compiled objects
+        created by this Environment.
+        This defaults to the value of HOST_ARCH, and the user can override it.
+        Currently only set for Win32.
+</para>
+    </listitem>
   </varlistentry>
   <varlistentry id="cv-TARGET_OS">
     <term>TARGET_OS</term>