fixed a few typos and changed all references to c++ project file to be MSVC (entity) project file

Author: bdbaddog

SCons/Tool/msvc.xml

@@ -409,7 +409,7 @@ Values that do not look like a valid compiler version
 To have the desired effect, &cv-MSVC_VERSION; must be set by the
 time compiler discovery takes place.
 If the default tools list
-or an excplicit tools list including &t-link-msvc; is used,
+or an explicit tools list including &t-link-msvc; is used,
 discovery takes place as the &consenv; is created,
 so passing it as an argument in the the &f-link-Environment; call
 is the effective solution.
@@ -427,7 +427,7 @@ Note that it is not necessary to install Visual Studio
 to build with &SCons; (for example, you can install only
 Build Tools), but if Visual Studio is installed,
 additional builders such as &b-link-MSVSSolution; and
-&b-link-MSVSProject; become avaialable and will
+&b-link-MSVSProject; become available and will
 correspond to the indicated versions.
 </para>
 

SCons/Tool/msvs.xml

@@ -239,7 +239,7 @@ This file is processed by the bin/SConsDoc.py module
               The name of the file that Visual Studio 7 and
               later will run and debug. This appears as the
               value of the <parameter>Output</parameter> field in the
-              resulting C++ project file. If this is not
+              resulting &MSVC; project file. If this is not
               specified, the default is the same as the specified
               <parameter>buildtarget</parameter> value.
             </para>
@@ -651,7 +651,7 @@ env.MSVSSolution(
     <summary>
       <para>
         The string placed in a generated
-        C++ project file as the value of the
+        &MSVC; 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>
@@ -660,7 +660,7 @@ env.MSVSSolution(
     <summary>
       <para>
         The path name placed in a generated
-        C++ project file as the value of the
+        &MSVC; project file as the value of the
         <literal>SccAuxPath</literal> attribute if the
         <envar>MSVS_SCC_PROVIDER</envar> &consvar; is
         also set. There is no default value.
@@ -672,7 +672,7 @@ env.MSVSSolution(
         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 C++ project
+        relative paths of the generated &MSVC; 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
@@ -692,7 +692,7 @@ env.MSVSSolution(
   </cvar> <cvar name="MSVS_SCC_PROJECT_NAME">
     <summary>
       <para>
-        The project name placed in a generated C++
+        The project name placed in a generated &MSVC;
         project file as the value of the
         <literal>SccProjectName</literal> attribute if the
         <envar>MSVS_SCC_PROVIDER</envar> &consvar;
@@ -706,7 +706,7 @@ env.MSVSSolution(
   </cvar> <cvar name="MSVS_SCC_PROVIDER">
     <summary>
       <para>
-        The string placed in a generated C++
+        The string placed in a generated &MSVC;
         project file as the value of the
         <literal>SccProvider</literal> attribute. The string is
         also placed in the <literal>SccProvider0</literal> attribute
@@ -742,7 +742,7 @@ env.MSVSSolution(
   <cvar name="MSVSBUILDCOM">
     <summary>
       <para>
-        The build command line placed in a generated C++
+        The build command line placed in a generated &MSVC;
         project file. The default is to have Visual Studio
         invoke &SCons; with any specified build targets.
       </para>
@@ -751,7 +751,7 @@ env.MSVSSolution(
   <cvar name="MSVSCLEANCOM">
     <summary>
       <para>
-        The clean command line placed in a generated C++
+        The clean command line placed in a generated &MSVC;
         project file. The default is to have Visual Studio
         invoke &SCons; with the <option>-c</option> option to remove
         any specified targets.
@@ -760,21 +760,21 @@ env.MSVSSolution(
   </cvar> <cvar name="MSVSENCODING">
     <summary>
       <para>
-        The encoding string placed in a generated C++
+        The encoding string placed in a generated &MSVC;
         project file. The default is encoding
         <literal>Windows-1252</literal>.
       </para>
     </summary>
   </cvar>
   <cvar name="MSVSPROJECTCOM">
     <summary>
-      <para>The action used to generate C++ project files.</para>
+      <para>The action used to generate &MSVC; project files.</para>
     </summary>
   </cvar>
   <cvar name="MSVSPROJECTSUFFIX">
     <summary>
       <para>
-        The suffix used for C++ project (DSP)
+        The suffix used for &MSVC; project (DSP)
         files. The default value is
         <filename>.vcxproj</filename> when using Visual Studio 2010
         and later, <filename>.vcproj</filename>
@@ -786,7 +786,7 @@ env.MSVSSolution(
   <cvar name="MSVSREBUILDCOM">
     <summary>
       <para>
-        The rebuild command line placed in a generated C++
+        The rebuild command line placed in a generated &MSVC;
         project file. The default is to have Visual
         Studio invoke &SCons; with any specified rebuild targets.
 
@@ -796,7 +796,7 @@ env.MSVSSolution(
   <cvar name="MSVSSCONS">
     <summary>
       <para>
-        The &SCons; used in generated C++ project
+        The &SCons; used in generated &MSVC; project
         files. The default is the version of &SCons; being used to
         generate the project file.
       </para>
@@ -805,22 +805,22 @@ env.MSVSSolution(
   <cvar name="MSVSSCONSFLAGS">
     <summary>
       <para>
-        The &SCons; flags used in generated C++ project files.
+        The &SCons; flags used in generated &MSVC; project files.
       </para>
     </summary>
   </cvar>
   <cvar name="MSVSSCONSCOM">
     <summary>
       <para>
-        The default &SCons; command used in generated C++ project files.
+        The default &SCons; command used in generated &MSVC; project files.
       </para>
     </summary>
   </cvar>
   <cvar name="MSVSSCONSCRIPT">
     <summary>
       <para>
         The sconscript file (that is, &SConstruct; or &SConscript;
-        file) that will be invoked by C++ project files
+        file) that will be invoked by &MSVC; project files
         (through the &cv-link-MSVSSCONSCOM; variable). The default
         is the same sconscript file that contains the call to
         &b-link-MSVSProject; to build the project file.

doc/generated/builders.gen

@@ -836,11 +836,12 @@ Compile files for languages defined in <filename>LINGUAS</filename> file
     <term><function>MSVSProject</function>()</term>
     <term><replaceable>env</replaceable>.<methodname>MSVSProject</methodname>()</term>
     <listitem><para>
-        Build a Microsoft Visual C++ project file and solution file.
+        Build a &MSVC; project file and solution file.
       </para>
       <para>
-        Builds a C++ project file based on the
-        version of Visual Studio (or to be more precise, of MSBuild)
+        Builds a &MSVC; project file based on the
+        version of Visual Studio (or to be more precise, of
+        <application>MSBuild</application>)
         that is configured: either the latest installed version,
         or the version specified by
         &cv-link-MSVC_VERSION; in the current &consenv;.
@@ -852,10 +853,10 @@ Compile files for languages defined in <filename>LINGUAS</filename> file
         Note there are multiple versioning schemes involved in
         the Microsoft compilation environment -
         see the description of &cv-link-MSVC_VERSION; for equivalences.
-        &SCons; does not know how to construct project files for
-        other languages (such as <filename>.csproj</filename> for C#,
-        <filename>.vbproj</filename> for Visual Basic or 
-        <filename>.pyproject</filename> for Python)).
+        Note &SCons; does not know how to construct project files for
+        other languages (e.g. <filename>.csproj</filename> for C#,
+        <filename>.vbproj</filename> for Visual Basic or
+        <filename>.pyproject</filename> for Python).
         </para>
       <para>
         For the <filename>.vcxproj</filename> file, the underlying
@@ -864,15 +865,15 @@ Compile files for languages defined in <filename>LINGUAS</filename> file
         https://learn.microsoft.com/en-us/cpp/build/reference/vcxproj-file-structure</ulink>.
         The generated solution file enables Visual Studio to
         understand the project structure, and allows building it
-        using MSBuild to call back to &SCons;.
+        using <application>MSBuild</application> to call back to &SCons;.
         The project file encodes a toolset version that has been
         selected by &SCons; as described above. Since recent Visual
         Studio versions support multiple concurrent toolsets,
         use &cv-link-MSVC_VERSION; to select the desired one if
         it does not match the &SCons; default.
         The project file also includes entries which describe
         how to call &SCons; to build the project from within Visual Studio
-        (or from an MSBuild command line).
+        (or from an <application>MSBuild</application> command line).
         In some situations &SCons; may generate this incorrectly -
         notably when using the <emphasis>scons-local</emphasis>
         distribution, which is not installed in a way that that
@@ -907,7 +908,8 @@ Compile files for languages defined in <filename>LINGUAS</filename> file
         (for example if you generate files for inclusion by using the
         &f-link-Glob; function, the results should be converted to
         a list of strings before passing them to &b-MSVSProject;).
-        This is because Visual Studio and MSBuild know nothing about &SCons;
+        This is because Visual Studio and
+        <application>MSBuild</application> know nothing about &SCons;
         Node types.
         Each of the filename lists are individually optional, but at
         least one list must be specified for the resulting project file to
@@ -1032,7 +1034,7 @@ Compile files for languages defined in <filename>LINGUAS</filename> file
               The name of the file that Visual Studio 7 and
               later will run and debug. This appears as the
               value of the <parameter>Output</parameter> field in the
-              resulting Visual C++ project file. If this is not
+              resulting &MSVC; project file. If this is not
               specified, the default is the same as the specified
               <parameter>buildtarget</parameter> value.
             </para>
@@ -1051,7 +1053,7 @@ Compile files for languages defined in <filename>LINGUAS</filename> file
         than the directory of the &SConstruct; file, users will not be able to
         double-click on the file name in compilation error messages
         displayed in the Visual Studio console output window. This can
-        be remedied by adding the Visual C/C++ <option>/FC</option>
+        be remedied by adding the &MSVC; <option>/FC</option>
         compiler option to the &cv-link-CCFLAGS; variable so that
         the compiler will print the full path name of any files that
         cause compilation errors.
@@ -1067,7 +1069,8 @@ Compile files for languages defined in <filename>LINGUAS</filename> file
         of the build.
       </para>
       <para>
-        If the project file is used to drive MSBuild (such as selecting
+        If the project file is used to drive
+        <application>MSBuild</application> (such as selecting
         "build" from the Visual Studio interface) you lose the direct
         control of target selection and command-line options you would
         have if launching the build directly from &SCons;,
@@ -1078,7 +1081,8 @@ Compile files for languages defined in <filename>LINGUAS</filename> file
         targets, arguments, defines, flags and paths for different variants.
       </para>
       <para>
-        If the build is divided into a solution with multiple MSBuild
+        If the build is divided into a solution with multiple
+        <application>MSBuild</application>
         projects the mapping is further strained.  In this case,
         it is important not to set Visual Studio to do parallel builds,
         as it will then launch the separate project builds in parallel,
@@ -1325,7 +1329,8 @@ env.MSVSProject(
               into the solution file.
               Note that these filenames need to be specified as strings,
               NOT as &SCons; File Nodes.
-              This is because the solution file will be interpreted by MSBuild
+              This is because the solution file will be interpreted by
+              <application>MSBuild</application>
               and by Visual Studio, which know nothing about &SCons; Node types.
             </para>
           </listitem>
@@ -1537,7 +1542,7 @@ the top directory of the project.
     <term><function>PCH</function>()</term>
     <term><replaceable>env</replaceable>.<methodname>PCH</methodname>()</term>
     <listitem><para>
-Builds a Microsoft Visual C++ precompiled header.
+Builds a &MSVC; precompiled header.
 Calling this builder
 returns a list of two target nodes: the PCH as the first element,
 and the object file as the second element.
@@ -1553,13 +1558,12 @@ env['PCH'] = env.PCH('StdAfx.cpp')[0]
 
 <note>
 <para>
-This builder is specific to the PCH implementation
-in  Microsoft Visual C++.
+This builder is specific to the PCH implementation in  &MSVC;.
 Other compiler chains also implement precompiled header support,
 but &b-PCH; does not work with them at this time.
 As a result, the builder is only generated into the
 construction environment when
-Microsoft Visual C++ is being used as the compiler.
+&MSVC; is being used as the compiler.
 </para>
 <para>
 The builder only works correctly in a C++ project.
@@ -2074,9 +2078,9 @@ env.Program(target='foo', source=['foo.o', 'bar.c', 'baz.f'])
     <term><function>RES</function>()</term>
     <term><replaceable>env</replaceable>.<methodname>RES</methodname>()</term>
     <listitem><para>
-Builds a Microsoft Visual C++ resource file.
+Builds a &MSVC; resource file.
 This builder method is only provided
-when Microsoft Visual C++ or MinGW is being used as the compiler. The
+when &MSVC; or MinGW is being used as the compiler. The
 <filename>.res</filename>
 (or
 <filename>.o</filename>

doc/generated/examples/caching_ex-random_1.xml

@@ -1,8 +1,8 @@
 <screen xmlns="http://www.scons.org/dbxsd/v1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
-cc -o f2.o -c f2.c
 cc -o f3.o -c f3.c
 cc -o f5.o -c f5.c
-cc -o f1.o -c f1.c
 cc -o f4.o -c f4.c
+cc -o f2.o -c f2.c
+cc -o f1.o -c f1.c
 cc -o prog f1.o f2.o f3.o f4.o f5.o
 </screen>

doc/generated/examples/troubleshoot_explain1_3.xml

@@ -2,5 +2,5 @@
 cp file.in file.oout
 
 scons: warning: Cannot find target file.out after building
-File "/Users/bdbaddog/devel/scons/git/as_scons/scripts/scons.py", line 97, in <module>
+File "/Users/bdbaddog/devel/scons/git/mwichmann/scripts/scons.py", line 97, in <module>
 </screen>

doc/generated/examples/troubleshoot_stacktrace_2.xml

@@ -1,13 +1,13 @@
 <screen xmlns="http://www.scons.org/dbxsd/v1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q --debug=stacktrace</userinput>
 scons: *** [prog.o] Source `prog.c' not found, needed by target `prog.o'.
 scons: internal stack trace:
-  File "SCons/Taskmaster/Job.py", line 219, in start
+  File "SCons/Taskmaster/Job.py", line 671, in _work
     task.prepare()
   File "SCons/Script/Main.py", line 201, in prepare
     return SCons.Taskmaster.OutOfDateTask.prepare(self)
            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   File "SCons/Taskmaster/__init__.py", line 195, in prepare
     executor.prepare()
-  File "SCons/Executor.py", line 418, in prepare
+  File "SCons/Executor.py", line 420, in prepare
     raise SCons.Errors.StopError(msg % (s, self.batches[0].targets[0]))
 </screen>