Pārlūkot izejas kodu

Merge branch 'backport-3.21-vs2022' into release-3.21

Merge-request: !6640
Brad King 4 gadi atpakaļ
vecāks
revīzija
69c6994023
2 mainītis faili ar 4 papildinājumiem un 4 dzēšanām
  1. 2 2
      Help/generator/Visual Studio 17 2022.rst
  2. 2 2
      Help/release/3.21.rst

+ 2 - 2
Help/generator/Visual Studio 17 2022.rst

@@ -7,7 +7,7 @@ Generates Visual Studio 17 (VS 2022) project files.
 
 
 .. warning::
 .. warning::
 
 
-  This is experimental and based on "Visual Studio 2022 Preview 5".
+  This is experimental and based on "Visual Studio 2022 Release Candidate".
   As of this version of CMake, VS 2022 has not been released.
   As of this version of CMake, VS 2022 has not been released.
 
 
 Project Types
 Project Types
@@ -51,7 +51,7 @@ name (architecture).  For example:
 Toolset Selection
 Toolset Selection
 ^^^^^^^^^^^^^^^^^
 ^^^^^^^^^^^^^^^^^
 
 
-The ``v143`` toolset that comes with VS 17 2022 Preview 5 is selected by
+The ``v143`` toolset that comes with VS 17 2022 Release Candidate is selected by
 default.  The :variable:`CMAKE_GENERATOR_TOOLSET` option may be set, perhaps
 default.  The :variable:`CMAKE_GENERATOR_TOOLSET` option may be set, perhaps
 via the :manual:`cmake(1)` ``-T`` option, to specify another toolset.
 via the :manual:`cmake(1)` ``-T`` option, to specify another toolset.
 
 

+ 2 - 2
Help/release/3.21.rst

@@ -27,8 +27,8 @@ Generators
 ----------
 ----------
 
 
 * The :generator:`Visual Studio 17 2022` generator was added.  This is
 * The :generator:`Visual Studio 17 2022` generator was added.  This is
-  experimental and based on "Visual Studio 2022 Preview 5" because this
-  version of VS has not been released.
+  experimental and based on "Visual Studio 2022 Release Candidate" because
+  this version of VS has not been released.
 
 
 * The :ref:`Makefile Generators` and the :generator:`Ninja` generator
 * The :ref:`Makefile Generators` and the :generator:`Ninja` generator
   learned to add linker launcher tools along with the linker for ``C``,
   learned to add linker launcher tools along with the linker for ``C``,