Merge topic 'doc-misc-trivial-cleanups'

321eb0c33d Help: Tasking compiler supports compile warning as error
f8b3b24915 Help: Minor grammar, typo and formatting cleanups
3de30134f1 Help: Re-sort property, variable and compiler id lists

Acked-by: Kitware Robot <[email protected]>
Merge-request: !7769

Help/command/try_compile.rst

@@ -315,8 +315,9 @@ a build configuration.
   the generated project (unless overridden by an explicit option).
 
 .. versionchanged:: 3.14
-  For the :generator:`Green Hills MULTI` generator the GHS toolset and target
-  system customization cache variables are also propagated into the test project.
+  For the :generator:`Green Hills MULTI` generator, the GHS toolset and target
+  system customization cache variables are also propagated into the test
+  project.
 
 .. versionadded:: 3.24
   The :variable:`CMAKE_TRY_COMPILE_NO_PLATFORM_VARIABLES` variable may be
@@ -324,5 +325,5 @@ a build configuration.
 
 .. versionadded:: 3.25
   If :policy:`CMP0141` is set to ``NEW``, one can use
-  :variable:`CMAKE_MSVC_DEBUG_INFORMATION_FORMAT` to specify MSVC debug
+  :variable:`CMAKE_MSVC_DEBUG_INFORMATION_FORMAT` to specify the MSVC debug
   information format.

Help/manual/cmake-properties.7.rst

@@ -187,14 +187,14 @@ Properties on Targets
    /prop_tgt/CXX_EXTENSIONS
    /prop_tgt/CXX_MODULE_DIRS
    /prop_tgt/CXX_MODULE_DIRS_NAME
-   /prop_tgt/CXX_MODULE_SET
-   /prop_tgt/CXX_MODULE_SET_NAME
-   /prop_tgt/CXX_MODULE_SETS
    /prop_tgt/CXX_MODULE_HEADER_UNIT_DIRS
    /prop_tgt/CXX_MODULE_HEADER_UNIT_DIRS_NAME
    /prop_tgt/CXX_MODULE_HEADER_UNIT_SET
    /prop_tgt/CXX_MODULE_HEADER_UNIT_SET_NAME
    /prop_tgt/CXX_MODULE_HEADER_UNIT_SETS
+   /prop_tgt/CXX_MODULE_SET
+   /prop_tgt/CXX_MODULE_SET_NAME
+   /prop_tgt/CXX_MODULE_SETS
    /prop_tgt/CXX_STANDARD
    /prop_tgt/CXX_STANDARD_REQUIRED
    /prop_tgt/DEBUG_POSTFIX
@@ -274,8 +274,8 @@ Properties on Targets
    /prop_tgt/INTERFACE_COMPILE_DEFINITIONS
    /prop_tgt/INTERFACE_COMPILE_FEATURES
    /prop_tgt/INTERFACE_COMPILE_OPTIONS
-   /prop_tgt/INTERFACE_CXX_MODULE_SETS
    /prop_tgt/INTERFACE_CXX_MODULE_HEADER_UNIT_SETS
+   /prop_tgt/INTERFACE_CXX_MODULE_SETS
    /prop_tgt/INTERFACE_HEADER_SETS
    /prop_tgt/INTERFACE_HEADER_SETS_TO_VERIFY
    /prop_tgt/INTERFACE_INCLUDE_DIRECTORIES
@@ -357,8 +357,8 @@ Properties on Targets
    /prop_tgt/OSX_ARCHITECTURES_CONFIG
    /prop_tgt/OUTPUT_NAME
    /prop_tgt/OUTPUT_NAME_CONFIG
-   /prop_tgt/PCH_WARN_INVALID
    /prop_tgt/PCH_INSTANTIATE_TEMPLATES
+   /prop_tgt/PCH_WARN_INVALID
    /prop_tgt/PDB_NAME
    /prop_tgt/PDB_NAME_CONFIG
    /prop_tgt/PDB_OUTPUT_DIRECTORY
@@ -460,13 +460,16 @@ Properties on Targets
    /prop_tgt/XCODE_SCHEME_ARGUMENTS
    /prop_tgt/XCODE_SCHEME_DEBUG_AS_ROOT
    /prop_tgt/XCODE_SCHEME_DEBUG_DOCUMENT_VERSIONING
-   /prop_tgt/XCODE_SCHEME_ENABLE_GPU_FRAME_CAPTURE_MODE
    /prop_tgt/XCODE_SCHEME_DISABLE_MAIN_THREAD_CHECKER
    /prop_tgt/XCODE_SCHEME_DYNAMIC_LIBRARY_LOADS
    /prop_tgt/XCODE_SCHEME_DYNAMIC_LINKER_API_USAGE
+   /prop_tgt/XCODE_SCHEME_ENABLE_GPU_API_VALIDATION
+   /prop_tgt/XCODE_SCHEME_ENABLE_GPU_FRAME_CAPTURE_MODE
+   /prop_tgt/XCODE_SCHEME_ENABLE_GPU_SHADER_VALIDATION
    /prop_tgt/XCODE_SCHEME_ENVIRONMENT
    /prop_tgt/XCODE_SCHEME_EXECUTABLE
    /prop_tgt/XCODE_SCHEME_GUARD_MALLOC
+   /prop_tgt/XCODE_SCHEME_LAUNCH_CONFIGURATION
    /prop_tgt/XCODE_SCHEME_LAUNCH_MODE
    /prop_tgt/XCODE_SCHEME_MAIN_THREAD_CHECKER_STOP
    /prop_tgt/XCODE_SCHEME_MALLOC_GUARD_EDGES
@@ -476,9 +479,6 @@ Properties on Targets
    /prop_tgt/XCODE_SCHEME_THREAD_SANITIZER_STOP
    /prop_tgt/XCODE_SCHEME_UNDEFINED_BEHAVIOUR_SANITIZER
    /prop_tgt/XCODE_SCHEME_UNDEFINED_BEHAVIOUR_SANITIZER_STOP
-   /prop_tgt/XCODE_SCHEME_ENABLE_GPU_API_VALIDATION
-   /prop_tgt/XCODE_SCHEME_ENABLE_GPU_SHADER_VALIDATION
-   /prop_tgt/XCODE_SCHEME_LAUNCH_CONFIGURATION
    /prop_tgt/XCODE_SCHEME_WORKING_DIRECTORY
    /prop_tgt/XCODE_SCHEME_ZOMBIE_OBJECTS
    /prop_tgt/XCODE_XCCONFIG

Help/manual/cmake-variables.7.rst

@@ -128,9 +128,9 @@ Variables that Provide Information
    /variable/CMAKE_VS_PLATFORM_TOOLSET_CUDA_CUSTOM_DIR
    /variable/CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE
    /variable/CMAKE_VS_PLATFORM_TOOLSET_VERSION
-   /variable/CMAKE_VS_TARGET_FRAMEWORK_VERSION
    /variable/CMAKE_VS_TARGET_FRAMEWORK_IDENTIFIER
    /variable/CMAKE_VS_TARGET_FRAMEWORK_TARGETS_VERSION
+   /variable/CMAKE_VS_TARGET_FRAMEWORK_VERSION
    /variable/CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION
    /variable/CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION_MAXIMUM
    /variable/CMAKE_XCODE_BUILD_SYSTEM
@@ -207,9 +207,9 @@ Variables that Change Behavior
    /variable/CMAKE_FIND_ROOT_PATH_MODE_PACKAGE
    /variable/CMAKE_FIND_ROOT_PATH_MODE_PROGRAM
    /variable/CMAKE_FIND_USE_CMAKE_ENVIRONMENT_PATH
-   /variable/CMAKE_FIND_USE_INSTALL_PREFIX
    /variable/CMAKE_FIND_USE_CMAKE_PATH
    /variable/CMAKE_FIND_USE_CMAKE_SYSTEM_PATH
+   /variable/CMAKE_FIND_USE_INSTALL_PREFIX
    /variable/CMAKE_FIND_USE_PACKAGE_REGISTRY
    /variable/CMAKE_FIND_USE_PACKAGE_ROOT_PATH
    /variable/CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH
@@ -228,12 +228,12 @@ Variables that Change Behavior
    /variable/CMAKE_LIBRARY_PATH
    /variable/CMAKE_LINK_DIRECTORIES_BEFORE
    /variable/CMAKE_LINK_LIBRARIES_ONLY_TARGETS
-   /variable/CMAKE_MFC_FLAG
    /variable/CMAKE_MAXIMUM_RECURSION_DEPTH
    /variable/CMAKE_MESSAGE_CONTEXT
    /variable/CMAKE_MESSAGE_CONTEXT_SHOW
    /variable/CMAKE_MESSAGE_INDENT
    /variable/CMAKE_MESSAGE_LOG_LEVEL
+   /variable/CMAKE_MFC_FLAG
    /variable/CMAKE_MODULE_PATH
    /variable/CMAKE_POLICY_DEFAULT_CMPNNNN
    /variable/CMAKE_POLICY_WARNING_CMPNNNN
@@ -272,12 +272,15 @@ Variables that Change Behavior
    /variable/CMAKE_XCODE_SCHEME_ADDRESS_SANITIZER
    /variable/CMAKE_XCODE_SCHEME_ADDRESS_SANITIZER_USE_AFTER_RETURN
    /variable/CMAKE_XCODE_SCHEME_DEBUG_DOCUMENT_VERSIONING
-   /variable/CMAKE_XCODE_SCHEME_ENABLE_GPU_FRAME_CAPTURE_MODE
    /variable/CMAKE_XCODE_SCHEME_DISABLE_MAIN_THREAD_CHECKER
    /variable/CMAKE_XCODE_SCHEME_DYNAMIC_LIBRARY_LOADS
    /variable/CMAKE_XCODE_SCHEME_DYNAMIC_LINKER_API_USAGE
+   /variable/CMAKE_XCODE_SCHEME_ENABLE_GPU_API_VALIDATION
+   /variable/CMAKE_XCODE_SCHEME_ENABLE_GPU_FRAME_CAPTURE_MODE
+   /variable/CMAKE_XCODE_SCHEME_ENABLE_GPU_SHADER_VALIDATION
    /variable/CMAKE_XCODE_SCHEME_ENVIRONMENT
    /variable/CMAKE_XCODE_SCHEME_GUARD_MALLOC
+   /variable/CMAKE_XCODE_SCHEME_LAUNCH_CONFIGURATION
    /variable/CMAKE_XCODE_SCHEME_LAUNCH_MODE
    /variable/CMAKE_XCODE_SCHEME_MAIN_THREAD_CHECKER_STOP
    /variable/CMAKE_XCODE_SCHEME_MALLOC_GUARD_EDGES
@@ -287,9 +290,6 @@ Variables that Change Behavior
    /variable/CMAKE_XCODE_SCHEME_THREAD_SANITIZER_STOP
    /variable/CMAKE_XCODE_SCHEME_UNDEFINED_BEHAVIOUR_SANITIZER
    /variable/CMAKE_XCODE_SCHEME_UNDEFINED_BEHAVIOUR_SANITIZER_STOP
-   /variable/CMAKE_XCODE_SCHEME_LAUNCH_CONFIGURATION
-   /variable/CMAKE_XCODE_SCHEME_ENABLE_GPU_API_VALIDATION
-   /variable/CMAKE_XCODE_SCHEME_ENABLE_GPU_SHADER_VALIDATION
    /variable/CMAKE_XCODE_SCHEME_WORKING_DIRECTORY
    /variable/CMAKE_XCODE_SCHEME_ZOMBIE_OBJECTS
    /variable/CMAKE_XCODE_XCCONFIG
@@ -420,19 +420,19 @@ Variables that Control the Build
    /variable/CMAKE_DEBUG_POSTFIX
    /variable/CMAKE_DEFAULT_BUILD_TYPE
    /variable/CMAKE_DEFAULT_CONFIGS
-   /variable/CMAKE_DISABLE_PRECOMPILE_HEADERS
    /variable/CMAKE_DEPENDS_USE_COMPILER
+   /variable/CMAKE_DISABLE_PRECOMPILE_HEADERS
    /variable/CMAKE_ENABLE_EXPORTS
    /variable/CMAKE_EXE_LINKER_FLAGS
    /variable/CMAKE_EXE_LINKER_FLAGS_CONFIG
    /variable/CMAKE_EXE_LINKER_FLAGS_CONFIG_INIT
    /variable/CMAKE_EXE_LINKER_FLAGS_INIT
    /variable/CMAKE_FOLDER
-   /variable/CMAKE_FRAMEWORK
-   /variable/CMAKE_FRAMEWORK_MULTI_CONFIG_POSTFIX_CONFIG
    /variable/CMAKE_Fortran_FORMAT
    /variable/CMAKE_Fortran_MODULE_DIRECTORY
    /variable/CMAKE_Fortran_PREPROCESS
+   /variable/CMAKE_FRAMEWORK
+   /variable/CMAKE_FRAMEWORK_MULTI_CONFIG_POSTFIX_CONFIG
    /variable/CMAKE_GHS_NO_SOURCE_GROUP_FILE
    /variable/CMAKE_GLOBAL_AUTOGEN_TARGET
    /variable/CMAKE_GLOBAL_AUTOGEN_TARGET_NAME
@@ -453,14 +453,14 @@ Variables that Control the Build
    /variable/CMAKE_LANG_CPPCHECK
    /variable/CMAKE_LANG_CPPLINT
    /variable/CMAKE_LANG_INCLUDE_WHAT_YOU_USE
-   /variable/CMAKE_LANG_LINK_LIBRARY_USING_FEATURE
-   /variable/CMAKE_LANG_LINK_LIBRARY_USING_FEATURE_SUPPORTED
-   /variable/CMAKE_LANG_LINKER_LAUNCHER
    /variable/CMAKE_LANG_LINK_GROUP_USING_FEATURE
    /variable/CMAKE_LANG_LINK_GROUP_USING_FEATURE_SUPPORTED
    /variable/CMAKE_LANG_LINK_LIBRARY_FILE_FLAG
    /variable/CMAKE_LANG_LINK_LIBRARY_FLAG
+   /variable/CMAKE_LANG_LINK_LIBRARY_USING_FEATURE
+   /variable/CMAKE_LANG_LINK_LIBRARY_USING_FEATURE_SUPPORTED
    /variable/CMAKE_LANG_LINK_WHAT_YOU_USE_FLAG
+   /variable/CMAKE_LANG_LINKER_LAUNCHER
    /variable/CMAKE_LANG_VISIBILITY_PRESET
    /variable/CMAKE_LIBRARY_OUTPUT_DIRECTORY
    /variable/CMAKE_LIBRARY_OUTPUT_DIRECTORY_CONFIG
@@ -483,9 +483,9 @@ Variables that Control the Build
    /variable/CMAKE_MODULE_LINKER_FLAGS_CONFIG
    /variable/CMAKE_MODULE_LINKER_FLAGS_CONFIG_INIT
    /variable/CMAKE_MODULE_LINKER_FLAGS_INIT
-   /variable/CMAKE_MSVCIDE_RUN_PATH
    /variable/CMAKE_MSVC_DEBUG_INFORMATION_FORMAT
    /variable/CMAKE_MSVC_RUNTIME_LIBRARY
+   /variable/CMAKE_MSVCIDE_RUN_PATH
    /variable/CMAKE_NINJA_OUTPUT_PATH_PREFIX
    /variable/CMAKE_NO_BUILTIN_CHRPATH
    /variable/CMAKE_NO_SYSTEM_FROM_IMPORTED
@@ -493,8 +493,8 @@ Variables that Control the Build
    /variable/CMAKE_OSX_ARCHITECTURES
    /variable/CMAKE_OSX_DEPLOYMENT_TARGET
    /variable/CMAKE_OSX_SYSROOT
-   /variable/CMAKE_PCH_WARN_INVALID
    /variable/CMAKE_PCH_INSTANTIATE_TEMPLATES
+   /variable/CMAKE_PCH_WARN_INVALID
    /variable/CMAKE_PDB_OUTPUT_DIRECTORY
    /variable/CMAKE_PDB_OUTPUT_DIRECTORY_CONFIG
    /variable/CMAKE_PLATFORM_NO_VERSIONED_SONAME
@@ -548,6 +548,10 @@ Variables for Languages
 .. toctree::
    :maxdepth: 1
 
+   /variable/CMAKE_C_COMPILE_FEATURES
+   /variable/CMAKE_C_EXTENSIONS
+   /variable/CMAKE_C_STANDARD
+   /variable/CMAKE_C_STANDARD_REQUIRED
    /variable/CMAKE_COMPILER_IS_GNUCC
    /variable/CMAKE_COMPILER_IS_GNUCXX
    /variable/CMAKE_COMPILER_IS_GNUG77
@@ -562,10 +566,6 @@ Variables for Languages
    /variable/CMAKE_CXX_EXTENSIONS
    /variable/CMAKE_CXX_STANDARD
    /variable/CMAKE_CXX_STANDARD_REQUIRED
-   /variable/CMAKE_C_COMPILE_FEATURES
-   /variable/CMAKE_C_EXTENSIONS
-   /variable/CMAKE_C_STANDARD
-   /variable/CMAKE_C_STANDARD_REQUIRED
    /variable/CMAKE_Fortran_MODDIR_DEFAULT
    /variable/CMAKE_Fortran_MODDIR_FLAG
    /variable/CMAKE_Fortran_MODOUT_FLAG
@@ -583,6 +583,7 @@ Variables for Languages
    /variable/CMAKE_LANG_ARCHIVE_CREATE
    /variable/CMAKE_LANG_ARCHIVE_FINISH
    /variable/CMAKE_LANG_BYTE_ORDER
+   /variable/CMAKE_LANG_COMPILE_OBJECT
    /variable/CMAKE_LANG_COMPILER
    /variable/CMAKE_LANG_COMPILER_EXTERNAL_TOOLCHAIN
    /variable/CMAKE_LANG_COMPILER_ID
@@ -590,7 +591,6 @@ Variables for Languages
    /variable/CMAKE_LANG_COMPILER_PREDEFINES_COMMAND
    /variable/CMAKE_LANG_COMPILER_TARGET
    /variable/CMAKE_LANG_COMPILER_VERSION
-   /variable/CMAKE_LANG_COMPILE_OBJECT
    /variable/CMAKE_LANG_CREATE_SHARED_LIBRARY
    /variable/CMAKE_LANG_CREATE_SHARED_MODULE
    /variable/CMAKE_LANG_CREATE_STATIC_LIBRARY
@@ -663,12 +663,12 @@ Variables for CTest
    /variable/CTEST_CUSTOM_MAXIMUM_NUMBER_OF_ERRORS
    /variable/CTEST_CUSTOM_MAXIMUM_NUMBER_OF_WARNINGS
    /variable/CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE
-   /variable/CTEST_CUSTOM_TEST_OUTPUT_TRUNCATION
    /variable/CTEST_CUSTOM_MEMCHECK_IGNORE
    /variable/CTEST_CUSTOM_POST_MEMCHECK
    /variable/CTEST_CUSTOM_POST_TEST
    /variable/CTEST_CUSTOM_PRE_MEMCHECK
    /variable/CTEST_CUSTOM_PRE_TEST
+   /variable/CTEST_CUSTOM_TEST_OUTPUT_TRUNCATION
    /variable/CTEST_CUSTOM_TESTS_IGNORE
    /variable/CTEST_CUSTOM_WARNING_EXCEPTION
    /variable/CTEST_CUSTOM_WARNING_MATCH
@@ -704,9 +704,9 @@ Variables for CTest
    /variable/CTEST_SCP_COMMAND
    /variable/CTEST_SCRIPT_DIRECTORY
    /variable/CTEST_SITE
+   /variable/CTEST_SOURCE_DIRECTORY
    /variable/CTEST_SUBMIT_INACTIVITY_TIMEOUT
    /variable/CTEST_SUBMIT_URL
-   /variable/CTEST_SOURCE_DIRECTORY
    /variable/CTEST_SVN_COMMAND
    /variable/CTEST_SVN_OPTIONS
    /variable/CTEST_SVN_UPDATE_OPTIONS

Help/manual/cmake.1.rst

@@ -278,7 +278,7 @@ Options
 
 .. option:: --debug-trycompile
 
- Do not delete the the files and directories created for
+ Do not delete the files and directories created for
  :command:`try_compile` / :command:`try_run` calls.
  This is useful in debugging failed checks.
 

Help/policy/CMP0140.rst

@@ -7,7 +7,7 @@ The :command:`return` command checks its parameters.
 
 The ``OLD`` behavior for this policy is to ignore any parameters given to the
 command.
-The ``NEW`` behavior is to check validity of the parameters.
+The ``NEW`` behavior is to check the validity of the parameters.
 
 This policy was introduced in CMake version 3.25.
 CMake version |release| warns when the policy is not set and uses

Help/policy/CMP0141.rst

@@ -44,7 +44,7 @@ The ``OLD`` behavior for this policy is to place MSVC debug information
 format flags in the default :variable:`CMAKE_<LANG>_FLAGS_<CONFIG>` cache
 entries and ignore the :variable:`CMAKE_MSVC_DEBUG_INFORMATION_FORMAT`
 abstraction.  The ``NEW`` behavior for this policy is to *not* place MSVC
-debug information format flags flags in the default cache entries and use
+debug information format flags in the default cache entries and use
 the abstraction instead.
 
 This policy was introduced in CMake version 3.25.  Use the

Help/prop_tgt/COMPILE_WARNING_AS_ERROR.rst

@@ -26,10 +26,12 @@ implemented :variable:`compiler IDs <CMAKE_<LANG>_COMPILER_ID>` are:
 * ``NVIDIA`` (CUDA)
 * ``QCC``
 * ``SunPro``
+* ``Tasking``
 * ``TI``
 * ``VisualAge``
 * ``XL``
 * ``XLClang``
 
 This property is initialized by the value of the variable
-:variable:`CMAKE_COMPILE_WARNING_AS_ERROR` if it is set when a target is created.
+:variable:`CMAKE_COMPILE_WARNING_AS_ERROR` if it is set when a target is
+created.

Help/prop_tgt/CXX_MODULE_HEADER_UNIT_DIRS.rst

@@ -13,5 +13,5 @@ module header set (i.e. the file set with name and type
 This property is normally only set by :command:`target_sources(FILE_SET)`
 rather than being manipulated directly.
 
-See :prop_tgt:`CXX_MODULE_HEADER_UNIT_DIRS_<NAME>` for the list of base directories
-in other C++ module header sets.
+See :prop_tgt:`CXX_MODULE_HEADER_UNIT_DIRS_<NAME>` for the list of base
+directories in other C++ module header sets.

Help/prop_tgt/CXX_MODULE_SETS.rst

@@ -6,8 +6,8 @@ CXX_MODULE_SETS
   Experimental. Gated by ``CMAKE_EXPERIMENTAL_CXX_MODULE_CMAKE_API``
 
 Read-only list of the target's ``PRIVATE`` and ``PUBLIC`` C++ module sets (i.e.
-all file sets with the type ``CXX_MODULES``). Files listed in these file sets are
-treated as source files for the purpose of IDE integration.
+all file sets with the type ``CXX_MODULES``). Files listed in these file sets
+are treated as source files for the purpose of IDE integration.
 
 C++ module sets may be defined using the :command:`target_sources` command
 ``FILE_SET`` option with type ``CXX_MODULES``.

Help/prop_tgt/EXPORT_NO_SYSTEM.rst

@@ -4,8 +4,8 @@ EXPORT_NO_SYSTEM
 .. versionadded:: 3.25
 
 Specifies that :command:`install(EXPORT)` and :command:`export` commands will
-generate a imported target with :prop_tgt:`SYSTEM` property `OFF`.
+generate an imported target with :prop_tgt:`SYSTEM` property `OFF`.
 
 See the :prop_tgt:`NO_SYSTEM_FROM_IMPORTED` target property to set this
-behavior on the target consuming the include directories rather than
-providing them.
+behavior on the target *consuming* the include directories rather than the
+one *providing* them.

Help/prop_tgt/LANG_CLANG_TIDY.rst

@@ -18,7 +18,7 @@ command line.
 .. versionchanged:: 3.25
 
   If the specified ``clang-tidy`` command line includes the ``-p`` option,
-  it will invoked without ``--`` and the full compiler command line.
+  it will be invoked without ``--`` and the full compiler command line.
   ``clang-tidy`` will look up the source file in the specified compiler
   commands database.
 

Help/prop_tgt/MSVC_DEBUG_INFORMATION_FORMAT-VALUES.txt

@@ -8,8 +8,8 @@
   Compile with ``-ZI`` or equivalent flag(s) to produce a program
   database that supports the Edit and Continue feature.
 
-The value is ignored on non-MSVC compilers but an unsupported value will
+The value is ignored on non-MSVC compilers, but an unsupported value will
 be rejected as an error when using a compiler targeting the MSVC ABI.
 
-The value may also be the empty string (``""``) in which case no debug
+The value may also be the empty string (``""``), in which case no debug
 information format flag will be added explicitly by CMake.

Help/prop_tgt/MSVC_DEBUG_INFORMATION_FORMAT.rst

@@ -3,7 +3,7 @@ MSVC_DEBUG_INFORMATION_FORMAT
 
 .. versionadded:: 3.25
 
-Select debug information format targeting the MSVC ABI.
+Select debug information format when targeting the MSVC ABI.
 
 The allowed values are:
 

Help/variable/CMAKE_LANG_COMPILER_ID.rst

@@ -39,12 +39,12 @@ Value                           Name
 ``PathScale``                   PathScale
 ``SDCC``                        `Small Device C Compiler`_
 ``SunPro``                      Oracle Solaris Studio
+``Tasking``                     `Tasking Compiler Toolsets`_
 ``TI``                          Texas Instruments
 ``TinyCC``                      `Tiny C Compiler`_
 ``XL``, ``VisualAge``, ``zOS``  IBM XL
 ``XLClang``                     IBM Clang-based XL
 ``IBMClang``                    IBM LLVM-based Compiler
-``Tasking``                     `Tasking Compiler Toolsets`_
 =============================== ===============================================
 
 This variable is not guaranteed to be defined for all compilers or

Help/variable/CMAKE_TASKING_TOOLSET.rst

@@ -11,7 +11,7 @@ incompatible versioning schemes.  Set this variable in a
 the compiler and version correctly. If no toolset is specified,
 ``Standalone`` is assumed.
 
-Projects, that can be build with different architectures and/or toolsets, must
+Projects that can be built with different architectures and/or toolsets must
 take :variable:`CMAKE_TASKING_TOOLSET` and
 :variable:`CMAKE_<LANG>_COMPILER_ARCHITECTURE_ID` into account to qualify
 :variable:`CMAKE_<LANG>_COMPILER_VERSION`.