Browse Source

Help: Fix typos and formatting for 4.2 release

Craig Scott 2 weeks ago
parent
commit
730cad9cb6

+ 1 - 1
Help/command/string.rst

@@ -297,7 +297,7 @@ Manipulation
   .. versionadded:: 4.2
 
   Store in an ``<out-var>`` a regular expression matching the ``<input>``.
-  All characters that have special meaning in a regular expressions are
+  All characters that have special meaning in a regular expression are
   escaped, such that the output string can be used as part of a regular
   expression to match the input literally.
 

+ 4 - 3
Help/prop_sf/INSTALL_OBJECT_NAME.rst

@@ -8,8 +8,8 @@ file. An empty string value disables custom object naming. The value must be a
 relative path, and may not include special directory components (e.g.,
 ``..``).
 
-Note that the object name may not be used as-is in
-:prop_tgt:`INSTALL_OBJECT_NAME_STRATEGY` strategies, but instead changed as
+Note that the object name might not be used as-is in some
+:prop_tgt:`INSTALL_OBJECT_NAME_STRATEGY` strategies.  It may be changed as
 the strategy requires to fulfill its goals.
 
 This property supports
@@ -20,6 +20,7 @@ This property supports
    this property, collisions must be avoided in the project code. CMake has a
    number of source files it generates that also create object files that may
    collide with a given custom name. These include:
+
    * Generated PCH source files (``cmake_pch``)
-   * Generated Unity compilation files (``unity_``)
+   * Generated Unity compilation files (``unity_...``)
    * Qt autogen sources (``moc_compilations.cpp``)

+ 5 - 4
Help/prop_sf/OBJECT_NAME.rst

@@ -7,9 +7,9 @@ Set the object name (without the object extension) of the source file. An
 empty string value disables custom object naming. The value must be a relative
 path, and may not include special directory components (e.g., ``..``).
 
-Note that the object name may not be used as-is in
+Note that the object name might not be used as-is in
 :variable:`CMAKE_INTERMEDIATE_DIR_STRATEGY` and
-:prop_tgt:`INSTALL_OBJECT_NAME_STRATEGY` strategies, but instead changed as
+:prop_tgt:`INSTALL_OBJECT_NAME_STRATEGY` strategies.  It may be changed as
 the strategy requires to fulfill its goals.
 
 When installing objects, the :prop_sf:`INSTALL_OBJECT_NAME` property takes
@@ -24,10 +24,11 @@ allow for context-sensitive (i.e., configuration-dependent) expressions.
    this property, collisions must be avoided in the project code. CMake has a
    number of source files it generates that also create object files that may
    collide with a given custom name. These include:
+
    * Generated PCH source files (``cmake_pch``)
-   * Generated Unity compilation files (``unity_``)
+   * Generated Unity compilation files (``unity_...``)
    * Qt autogen sources (``moc_compilations.cpp``)
 
 .. note::
    The :generator:`FASTBuild` and :generator:`Xcode` generators do not support
-   this property and it is ignored.
+   this property and will ignore it.

+ 1 - 1
Modules/ExternalProject.cmake

@@ -686,7 +686,7 @@ overridden if required.
     )
 
   This snippet defines two environment variables when configuring the example
-  project. The ``SDKROOT`` environment variable is set to ``macosx`, while
+  project. The ``SDKROOT`` environment variable is set to ``macosx``, while
   the value of ``PKG_CONFIG_PATH`` is forwarded to the external project.
 
   Environment modifications work with ``LIST_SEPARATOR`` to replace the