浏览代码

Merge topic 'doc-release-3.29-typos' into release-3.29

eceb368ccc Help: Fix typos in 3.29 docs
31fb693d06 Help: Fix typos and grammar in pre-3.29 docs

Acked-by: Kitware Robot <[email protected]>
Merge-request: !9353
Brad King 1 年之前
父节点
当前提交
b877fb49ce

+ 1 - 1
Help/command/if.rst

@@ -180,7 +180,7 @@ File Operations
 
 
   .. note::
   .. note::
     Prefer ``if(IS_READABLE)`` to check file readability.  ``if(EXISTS)``
     Prefer ``if(IS_READABLE)`` to check file readability.  ``if(EXISTS)``
-    may be changed in the future to to only check file existence.
+    may be changed in the future to only check file existence.
 
 
 .. signature:: if(IS_READABLE <path-to-file-or-directory>)
 .. signature:: if(IS_READABLE <path-to-file-or-directory>)
 
 

+ 1 - 1
Help/manual/cmake-configure-log.7.rst

@@ -56,7 +56,7 @@ step finished normally, ends with a ``...`` document marker line:
 A new document is appended to the log every time CMake configures
 A new document is appended to the log every time CMake configures
 the build tree and logs new events.
 the build tree and logs new events.
 
 
-The keys of the each document root mapping are:
+The keys of each document root mapping are:
 
 
 ``events``
 ``events``
   A YAML block sequence of nodes corresponding to events logged during
   A YAML block sequence of nodes corresponding to events logged during

+ 3 - 3
Help/policy/CMP0156.rst

@@ -17,20 +17,20 @@ Handling mutually dependent archives may be awkward when using a traditional
 linker. Archive files may have to be specified multiple times.
 linker. Archive files may have to be specified multiple times.
 
 
 Some linkers (for instance Apple or Windows linkers, as well as ``LLVM LLD``)
 Some linkers (for instance Apple or Windows linkers, as well as ``LLVM LLD``)
-records all symbols found in objects and archives as it iterates over command
+record all symbols found in objects and archives as they iterate over command
 line arguments. When one of these linkers encounters an undefined symbol that
 line arguments. When one of these linkers encounters an undefined symbol that
 can be resolved by an object file contained in a previously processed archive
 can be resolved by an object file contained in a previously processed archive
 file, it immediately extracts and links it into the output object.
 file, it immediately extracts and links it into the output object.
 
 
 CMake 3.28 and below may generate link lines that repeat static libraries as
 CMake 3.28 and below may generate link lines that repeat static libraries as
-a traditional linker would need, even when using a linker does not need it.
+a traditional linker would need, even when using a linker that does not need it.
 They may also de-duplicate shared libraries by keeping their last occurrence,
 They may also de-duplicate shared libraries by keeping their last occurrence,
 which on Windows platforms can change DLL load order.
 which on Windows platforms can change DLL load order.
 
 
 CMake 3.29 and above prefer to apply different strategies based on linker
 CMake 3.29 and above prefer to apply different strategies based on linker
 capabilities.  So, when targeting Apple and Windows platforms, all
 capabilities.  So, when targeting Apple and Windows platforms, all
 libraries are de-duplicated.  Moreover, on Windows platforms, libraries
 libraries are de-duplicated.  Moreover, on Windows platforms, libraries
-are de-duplicated by keeping their fist occurrence, thus respecting the
+are de-duplicated by keeping their first occurrence, thus respecting the
 project-specified order.  This policy provides compatibility with projects
 project-specified order.  This policy provides compatibility with projects
 that have not been updated to expect the latter behavior.
 that have not been updated to expect the latter behavior.
 
 

+ 1 - 1
Modules/CSharpUtilities.cmake

@@ -133,7 +133,7 @@ Helper functions which are used by the above ones
     Name of the variable in which the list of keys is stored
     Name of the variable in which the list of keys is stored
 
 
   ``<fileN>``
   ``<fileN>``
-    filename(s) as given to to CSharp target using :command:`add_library`
+    filename(s) as given to CSharp target using :command:`add_library`
     or :command:`add_executable`
     or :command:`add_executable`
 
 
   In some way the function applies a canonicalization to the source names.
   In some way the function applies a canonicalization to the source names.

+ 1 - 1
Modules/Internal/CPack/CPackRPM.cmake

@@ -861,7 +861,7 @@ function(cpack_rpm_generate_package)
 
 
   # If rpmbuild is found
   # If rpmbuild is found
   # we try to discover alien since we may be on non RPM distro like Debian.
   # we try to discover alien since we may be on non RPM distro like Debian.
-  # In this case we may try to to use more advanced features
+  # In this case we may try to use more advanced features
   # like generating RPM directly from DEB using alien.
   # like generating RPM directly from DEB using alien.
   # FIXME feature not finished (yet)
   # FIXME feature not finished (yet)
   find_program(ALIEN_EXECUTABLE alien)
   find_program(ALIEN_EXECUTABLE alien)