summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2024-03-19 14:09:54 (GMT)
committerKitware Robot <kwrobot@kitware.com>2024-03-19 14:10:15 (GMT)
commitb877fb49ce1a44ed0b6769ea82da7899fa2905eb (patch)
tree6225d6784c23c3017e93160fc7a7c079552dedf7 /Help
parent88d2dd0735cf221e7b3a52af7968762a2ecbfd50 (diff)
parenteceb368ccc1f2f8f33b852bf0099f680416696ef (diff)
downloadCMake-b877fb49ce1a44ed0b6769ea82da7899fa2905eb.zip
CMake-b877fb49ce1a44ed0b6769ea82da7899fa2905eb.tar.gz
CMake-b877fb49ce1a44ed0b6769ea82da7899fa2905eb.tar.bz2
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 <kwrobot@kitware.com> Merge-request: !9353
Diffstat (limited to 'Help')
-rw-r--r--Help/command/if.rst2
-rw-r--r--Help/manual/cmake-configure-log.7.rst2
-rw-r--r--Help/policy/CMP0156.rst6
3 files changed, 5 insertions, 5 deletions
diff --git a/Help/command/if.rst b/Help/command/if.rst
index a4ccd97..de25ad3 100644
--- a/Help/command/if.rst
+++ b/Help/command/if.rst
@@ -180,7 +180,7 @@ File Operations
.. note::
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>)
diff --git a/Help/manual/cmake-configure-log.7.rst b/Help/manual/cmake-configure-log.7.rst
index 4d64506..cb6cb90 100644
--- a/Help/manual/cmake-configure-log.7.rst
+++ b/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
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``
A YAML block sequence of nodes corresponding to events logged during
diff --git a/Help/policy/CMP0156.rst b/Help/policy/CMP0156.rst
index 6fa0f04..d2ce291 100644
--- a/Help/policy/CMP0156.rst
+++ b/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.
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
can be resolved by an object file contained in a previously processed archive
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
-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,
which on Windows platforms can change DLL load order.
CMake 3.29 and above prefer to apply different strategies based on linker
capabilities. So, when targeting Apple and Windows platforms, all
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
that have not been updated to expect the latter behavior.