1 files changed, 13 insertions, 11 deletions

diff --git a/src/engine/SCons/Tool/msvs.xml b/src/engine/SCons/Tool/msvs.xml
index c16beaa..07fda0c 100644
--- a/src/engine/SCons/Tool/msvs.xml
+++ b/src/engine/SCons/Tool/msvs.xml
@@ -18,13 +18,13 @@ and by default builds a solution file as well.
 This builds a Visual Studio project file, based on the version of
 Visual Studio that is configured (either the latest installed version,
 or the version specified by
-&cv-MSVS_VERSION;
+&cv-link-MSVS_VERSION;
 in the Environment constructor).
 For Visual Studio 6, it will generate a
 <filename>.dsp</filename>
 file.
-For Visual Studio 7 (.NET), it will generate a
-<filename>.dsp</filename>
+For Visual Studio 7 (.NET) and later versions, it will generate a
+<filename>.vcproj</filename>
 file.
 
 By default,
@@ -56,7 +56,7 @@ These are currently limited to
 and
 <literal>misc</literal>.
 These are pretty self-explanatory, but it should be noted that these
-lists are added to the &cv-SOURCES; construction variable as strings,
+lists are added to the &cv-link-SOURCES; construction variable as strings,
 NOT as SCons File Nodes.  This is because they represent file
 names to be added to the project file, not the source files used to
 build the project file.
@@ -77,7 +77,7 @@ file.
 The correct
 suffix for the version of Visual Studio must be used,
 but the
-&cv-MSVSPROJECTSUFFIX;
+&cv-link-MSVSPROJECTSUFFIX;
 construction variable
 will be defined to the correct value (see example below).
 
@@ -154,7 +154,7 @@ 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
-&cv-MSVS_VERSION;
+&cv-link-MSVS_VERSION;
 in the construction environment).
 For Visual Studio 6, it will generate a
 <filename>.dsw</filename>
@@ -169,7 +169,7 @@ The following values must be specified:
 <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
-&cv-MSVSSOLUTIONSUFFIX;
+&cv-link-MSVSSOLUTIONSUFFIX;
 will be defined to the correct value (see example below).
 
 <literal>variant</literal>:
@@ -184,12 +184,13 @@ A list of project file names, or Project nodes returned by calls to the
 &b-MSVSProject;
 Builder,
 to be placed into the solution file.
-(NOTE: Currently only one project is supported per solution.)
 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.
 
+(NOTE: Currently only one project is supported per solution.)
+
 Example Usage:
 
 <example>
@@ -479,7 +480,8 @@ The action used to generate Microsoft Visual Studio project files.
 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),
+when using Visual Studio version 7.x (.NET)
+or later version,
 and
 <filename>.dsp</filename>
 when using earlier versions of Visual Studio.
@@ -528,7 +530,7 @@ file)
 that will be invoked by Visual Studio
 project files
 (through the
-&cv-MSVSSCONSCOM;
+&cv-link-MSVSSCONSCOM;
 variable).
 The default is the same sconscript file
 that contains the call to
@@ -561,7 +563,7 @@ The (optional) path to the SCons library directory,
 initialized from the external environment.
 If set, this is used to construct a shorter and more
 efficient search path in the
-&cv-MSVSSCONS;
+&cv-link-MSVSSCONS;
 command line executed
 from Microsoft Visual Studio project files.
 </summary>