Merged in LaurentMarchelli/scons (pull request #209), implementation of Visual Studio users files

7 files changed, 551 insertions, 556 deletions

diff --git a/doc/SConscript b/doc/SConscript
index 7880ba37..35eb380f 100644
--- a/doc/SConscript
+++ b/doc/SConscript
@@ -28,25 +28,43 @@ import os.path
 import re
 import sys
 import glob
-import SConsDoc
-import SConsExamples
+
 import bootstrap
 
 Import('build_dir', 'env', 'whereis', 'revaction')
 
-env = env.Clone()
+#
+# -- Check prerequisites for building the documentation ---
+#
+skip_doc = False
 
-build = os.path.join(build_dir, 'doc')
+try:
+    import SConsDoc
+    import SConsExamples
+except ImportError as exc:
+    print("doc: SConsDoc failed to import, the error was:")
+    print("         ImportError: %s" % exc)
+    print("     Please make sure that python-libxml2 or python-lxml is installed.")
+    skip_doc = True
 
 fop = whereis('fop')
 xep = whereis('xep')
+
+if not fop and not xep:
+    print "doc: No PDF renderer found (fop|xep)!"
+    skip_doc = True
+
+#
+# --- Configure build
+#
+env = env.Clone()
+
+build = os.path.join(build_dir, 'doc')
+
 epydoc_cli = whereis('epydoc')
 gs = whereis('gs')
 lynx = whereis('lynx')
 
-#
-#
-#
 dist_doc_tar_gz = '$DISTDIR/scons-doc-${VERSION}.tar.gz'
 
 tar_deps = []
@@ -55,7 +73,9 @@ tar_list = []
 orig_env = env
 env = orig_env.Clone(SCONS_PY = File('#src/script/scons.py').rfile())
 
-
+#
+# --- Helpers ---
+#
 def writeVersionXml(verfile, date, ver, rev):
     """ Helper function: Write a version.xml file. """
     try:
@@ -75,28 +95,49 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE.  DO NOT EDIT.
 <!ENTITY buildrevision "%s">
 """ % (date, ver, rev))
 
+
+# The names of the target files for the MAN pages
+man_page_list = ['scons.1','scons-time.1','sconsign.1']
+
+# Template for the MAN page texts when we can't properly
+# create them because the skip_doc flag is set (required
+# modules/tools aren't installed in the current system)
+man_replace_tpl = """.TH "%(uctitle)s" "1" "%(today)s" "SCons %(version)s" "SCons %(version)s"
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.nh
+.ad l
+.SH "NOTE"
+%(title)s \- This is a replacement file, stemming from an incomplete
+packaging process without the required doc modules installed. Please 
+update the system and try running bootstrap.py again.
+"""
+
 #
-# Check whether we have all tools installed for
-# building the documentation.
+# --- Processing ---
 #
-skip_doc = False
-try:
-    import libxml2
-    import libxslt
-except:
-    try:
-        import lxml
-    except:
-        print "doc: Neither libxml2 nor lxml Python bindings found!"
-        print "     Please install one of the packages python-libxml2 or python-lxml."
-        skip_doc = True
-        
-if not fop and not xep:
-    print "doc: No PDF renderer found (fop|xep)!"
-    skip_doc = True
-    
 if skip_doc:
     print "doc: ...skipping building User Guide."
+    print "     ...creating fake MAN pages."
+
+    # Since the top-level SConstruct requires the MAN
+    # pages to exist for the basic packaging, we create simple
+    # stub texts here as replacement...
+    scdir = os.path.join(build, 'man')
+    if not os.path.isdir(scdir):
+        os.makedirs(scdir)
+    
+    import datetime
+    today = datetime.date.today().strftime("%m/%d/%Y")
+    version = env.subst('$VERSION')
+    for m in man_page_list:
+        man, _ = os.path.splitext(m)
+        fman = open(os.path.join(scdir, m), "w")
+        fman.write(man_replace_tpl % {'uctitle' : man.upper().replace("-", "\\-"),
+                                      'today' : today,
+                                      'title' : man,
+                                      'version' : version})
+        fman.close()
 else:
     if not lynx:
         print "doc: Warning, lynx is not installed...created release packages won't be complete!"
@@ -275,9 +316,6 @@ else:
             'man' : (['man','epub','text'], [], [])
            }
            
-    # The names of the target files for the MAN pages
-    man_page_list = ['scons.1','scons-time.1','sconsign.1']
-    
     #
     # We have to tell SCons to scan the top-level XML files which
     # get included by the document XML files in the subdirectories.
diff --git a/doc/generated/builders.gen b/doc/generated/builders.gen
index 3d534b07..259fe790 100644
--- a/doc/generated/builders.gen
+++ b/doc/generated/builders.gen
@@ -832,161 +832,105 @@ 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>
-
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-<literal>target</literal>:
-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>
-
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-<literal>variant</literal>:
-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>
-
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-<literal>buildtarget</literal>:
-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>
-
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-<literal>runfile</literal>:
-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 resutling Visual Studio project file.
-If this is not specified,
-the default is the same as the specified
-<literal>buildtarget</literal>
-value.
-</para>
-
-<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'],
+    <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']
@@ -1004,7 +948,143 @@ env.MSVSProject(target = 'Bar' + env['MSVSPROJECTSUFFIX'],
                 buildtarget = dll,
                 variant = 'Release')
 </example_commands>
-</listitem>
+<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
+vars = Variables('variables.py')
+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)
+else:
+  env = Environment()
+    
+AddOption('--userfile', action='store_true', dest='userfile', default=False,
+          help="Create Visual Studio Project user file")
+
+#
+# 1. Configure your Debug Setting dictionary with options you want in the list
+# of allowed options, for instance if you want to create a user file to launch
+# a specific application for testing your dll with Microsoft Visual Studio 2008 (v9):
+#
+V9DebugSettings = {
+    '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,
+}
+
+#
+# 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 = {
+    '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,
+}
+
+#
+# 3. Select the dictionary you want depending on the version of visual Studio 
+# Files you want to generate.
+#
+if not env.GetOption('userfile'):
+    dbgSettings = None
+elif env.get('MSVC_VERSION', None) == '9.0':
+    dbgSettings = V9DebugSettings
+elif env.get('MSVC_VERSION', None) == '11.0':
+    dbgSettings = V10DebugSettings
+else:    
+    dbgSettings = None
+
+#
+# 4. Add the dictionary to the DebugSettings keyword.
+#
+barsrcs = ['bar.cpp', 'dllmain.cpp', 'stdafx.cpp']
+barincs = ['targetver.h']
+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>
   </varlistentry>
   <varlistentry id="b-MSVSSolution">
     <term>
@@ -1013,70 +1093,54 @@ 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>
-
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-<literal>target</literal>:
-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>
-
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-<literal>variant</literal>:
-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>
-
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-<literal>projects</literal>:
-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>
-
-<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 aea2aa62..db894759 100644
--- a/doc/generated/tools.gen
+++ b/doc/generated/tools.gen
@@ -744,11 +744,8 @@ 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>
diff --git a/doc/generated/variables.gen b/doc/generated/variables.gen
index d0077582..120b4a3d 100644
--- a/doc/generated/variables.gen
+++ b/doc/generated/variables.gen
@@ -4156,355 +4156,254 @@ 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>
-
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-<envar>VERSION</envar>:
-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>
-
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-<envar>VERSIONS</envar>:
-the available versions of MSVS installed
-</para>
-
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-<envar>VCINSTALLDIR</envar>:
-installed directory of Visual C++
-</para>
-
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-<envar>VSINSTALLDIR</envar>:
-installed directory of Visual Studio
-</para>
-
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-<envar>FRAMEWORKDIR</envar>:
-installed directory of the .NET framework
-</para>
-
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-<envar>FRAMEWORKVERSIONS</envar>:
-list of installed versions of the .NET framework, sorted latest to oldest.
-</para>
-
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-<envar>FRAMEWORKVERSION</envar>:
-latest installed version of the .NET framework
-</para>
-
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-<envar>FRAMEWORKSDKDIR</envar>:
-installed location of the .NET SDK.
-</para>
-
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-<envar>PLATFORMSDKDIR</envar>:
-installed location of the Platform SDK.
-</para>
-
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-<envar>PLATFORMSDK_MODULES</envar>:
-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>
-
-<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 isn't set, it wasn't 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 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>
+    <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>
   </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 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>
+    <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>
   </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> <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> <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>
@@ -5850,17 +5749,11 @@ to check out editable files from SCCS.
   </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>
diff --git a/doc/man/scons-time.xml b/doc/man/scons-time.xml
index a1ecadf7..e0fa6b17 100644
--- a/doc/man/scons-time.xml
+++ b/doc/man/scons-time.xml
@@ -32,7 +32,8 @@
 <refmeta>
 <refentrytitle>SCONS-TIME</refentrytitle>
 <manvolnum>1</manvolnum>
-<refmiscinfo class='source'>__MONTH_YEAR__</refmiscinfo>
+<refmiscinfo class='source'>SCons __VERSION__</refmiscinfo>
+<refmiscinfo class='manual'>SCons __VERSION__</refmiscinfo>
 </refmeta>
 <refnamediv id='name'>
 <refname>scons-time</refname>
diff --git a/doc/man/scons.xml b/doc/man/scons.xml
index 55f2d634..08a942b9 100644
--- a/doc/man/scons.xml
+++ b/doc/man/scons.xml
@@ -75,7 +75,8 @@
 <refmeta>
 <refentrytitle>SCONS</refentrytitle>
 <manvolnum>1</manvolnum>
-<refmiscinfo class='source'>__MONTH_YEAR__</refmiscinfo>
+<refmiscinfo class='source'>SCons __VERSION__</refmiscinfo>
+<refmiscinfo class='manual'>SCons __VERSION__</refmiscinfo>
 </refmeta>
 <refnamediv id='name'>
 <refname>scons</refname>
diff --git a/doc/man/sconsign.xml b/doc/man/sconsign.xml
index ca99db6c..44a1e5f1 100644
--- a/doc/man/sconsign.xml
+++ b/doc/man/sconsign.xml
@@ -32,7 +32,8 @@
 <refmeta>
 <refentrytitle>SCONSIGN</refentrytitle>
 <manvolnum>1</manvolnum>
-<refmiscinfo class='source'>__MONTH_YEAR__</refmiscinfo>
+<refmiscinfo class='source'>SCons __VERSION__</refmiscinfo>
+<refmiscinfo class='manual'>SCons __VERSION__</refmiscinfo>
 </refmeta>
 <refnamediv id='name'>
 <refname>sconsign</refname>