Merge topic 'doc-CMP0134-fixes'

7dca3807f8 Help: Fix typos, grammar and formatting in CMP0134 policy docs

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

Help/command/FIND_XXX_REGISTRY_VIEW.txt

@@ -1,15 +1,15 @@
 Specify which registry views must be queried. This option is only meaningful
-on ``Windows`` platform and will be ignored on other ones. When not
-specified, |FIND_XXX_REGISTRY_VIEW_DEFAULT| view is used when :policy:`CMP0134`
-policy is ``NEW``. Refer to :policy:`CMP0134` policy for default view when
-policy is ``OLD`` or undefined.
+on ``Windows`` platforms and will be ignored on other ones. When not
+specified, the |FIND_XXX_REGISTRY_VIEW_DEFAULT| view is used when the
+:policy:`CMP0134` policy is ``NEW``. Refer to :policy:`CMP0134` for the
+default view when the policy is ``OLD``.
 
 ``64``
-  Query the 64bit registry. On ``32bit Windows``, returns always the string
+  Query the 64-bit registry. On 32-bit Windows, it always returns the string
   ``/REGISTRY-NOTFOUND``.
 
 ``32``
-  Query the 32bit registry.
+  Query the 32-bit registry.
 
 ``64_32``
   Query both views (``64`` and ``32``) and generate a path for each.
@@ -18,24 +18,24 @@ policy is ``OLD`` or undefined.
   Query both views (``32`` and ``64``) and generate a path for each.
 
 ``HOST``
-  Query the registry matching the architecture of the host: ``64`` on ``64bit
-  Windows`` and ``32`` on ``32bit Windows``.
+  Query the registry matching the architecture of the host: ``64`` on 64-bit
+  Windows and ``32`` on 32-bit Windows.
 
 ``TARGET``
-  Query the registry matching the architecture specified by
-  :variable:`CMAKE_SIZEOF_VOID_P` variable. If not defined, fallback to
+  Query the registry matching the architecture specified by the
+  :variable:`CMAKE_SIZEOF_VOID_P` variable. If not defined, fall back to
   ``HOST`` view.
 
 ``BOTH``
-  Query both views (``32`` and ``64``). The order depends of the following
-  rules: If :variable:`CMAKE_SIZEOF_VOID_P` variable is defined. Use the
-  following view depending of the content of this variable:
+  Query both views (``32`` and ``64``). The order depends on the following
+  rules: If the :variable:`CMAKE_SIZEOF_VOID_P` variable is defined, use the
+  following view depending on the content of this variable:
 
   * ``8``: ``64_32``
   * ``4``: ``32_64``
 
-  If :variable:`CMAKE_SIZEOF_VOID_P` variable is not defined, rely on
+  If the :variable:`CMAKE_SIZEOF_VOID_P` variable is not defined, rely on the
   architecture of the host:
 
-  * ``64bit``: ``64_32``
-  * ``32bit``: ``32``
+  * 64-bit: ``64_32``
+  * 32-bit: ``32``

Help/command/find_package.rst

@@ -142,9 +142,9 @@ should find all components, no components or some well-defined subset of the
 available components.
 
 .. versionadded:: 3.24
-  The ``REGISTRY_VIEW`` keyword enables to specify which registry views must be
-  queried. This keyword is only meaningful on ``Windows`` platform and will be
-  ignored on all other ones. Formally, it is up to the target package how to
+  The ``REGISTRY_VIEW`` keyword specifies which registry views should be
+  queried. This keyword is only meaningful on ``Windows`` platforms and will
+  be ignored on all others. Formally, it is up to the target package how to
   interpret the registry view information given to it.
 
 .. versionadded:: 3.24

Help/manual/cmake-policies.7.rst

@@ -63,7 +63,7 @@ Policies Introduced by CMake 3.24
    CMP0137: try_compile() passes platform variables in project mode. </policy/CMP0137>
    CMP0136: Watcom runtime library flags are selected by an abstraction. </policy/CMP0136>
    CMP0135: ExternalProject ignores timestamps in archives by default for the URL download method. </policy/CMP0135>
-   CMP0134: Fallback to \"HOST\" Windows registry view when \"TARGET\" view is not usable. </policy/CMP0134>
+   CMP0134: Fallback to "HOST" Windows registry view when "TARGET" view is not usable. </policy/CMP0134>
    CMP0133: The CPack module disables SLA by default in the CPack DragNDrop Generator. </policy/CMP0133>
    CMP0132: Do not set compiler environment variables on first run. </policy/CMP0132>
    CMP0131: LINK_LIBRARIES supports the LINK_ONLY generator expression. </policy/CMP0131>

Help/policy/CMP0134.rst

@@ -31,9 +31,6 @@ The ``NEW`` behavior for this policy is to use registry views ``TARGET`` and
 This policy was introduced in CMake version 3.24.  Use the
 :command:`cmake_policy` command to set this policy to ``OLD`` or ``NEW``
 explicitly. Unlike many policies, CMake version |release| does *not* warn
-by default when this policy is not set and simply uses ``OLD`` behavior.
-See documentation of the
-:variable:`CMAKE_POLICY_WARNING_CMP0133 <CMAKE_POLICY_WARNING_CMP<NNNN>>`
-variable to control the warning.
+when this policy is not set and simply uses ``OLD`` behavior.
 
 .. include:: DEPRECATED.txt