diff options
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/cpack_gen/packagemaker.rst | 2 | ||||
| -rw-r--r-- | Help/cpack_gen/productbuild.rst | 2 | ||||
| -rw-r--r-- | Help/dev/review.rst | 2 | ||||
| -rw-r--r-- | Help/guide/tutorial/index.rst | 2 | ||||
| -rw-r--r-- | Help/manual/cmake-generator-expressions.7.rst | 2 | ||||
| -rw-r--r-- | Help/manual/cmake.1.rst | 4 | ||||
| -rw-r--r-- | Help/manual/ctest.1.rst | 2 | ||||
| -rw-r--r-- | Help/policy/CMP0092.rst | 2 | ||||
| -rw-r--r-- | Help/release/3.1.rst | 2 | ||||
| -rw-r--r-- | Help/release/3.3.rst | 2 |
10 files changed, 11 insertions, 11 deletions
diff --git a/Help/cpack_gen/packagemaker.rst b/Help/cpack_gen/packagemaker.rst index c2a450e..357eb73 100644 --- a/Help/cpack_gen/packagemaker.rst +++ b/Help/cpack_gen/packagemaker.rst @@ -29,7 +29,7 @@ macOS using PackageMaker: .. variable:: CPACK_PACKAGEMAKER_BACKGROUND - Adds a background to Distribtion XML if specified. The value contains the + Adds a background to Distribution XML if specified. The value contains the path to image in ``Resources`` directory. .. variable:: CPACK_PACKAGEMAKER_BACKGROUND_ALIGNMENT diff --git a/Help/cpack_gen/productbuild.rst b/Help/cpack_gen/productbuild.rst index 82b79ae..fd99e5a 100644 --- a/Help/cpack_gen/productbuild.rst +++ b/Help/cpack_gen/productbuild.rst @@ -68,7 +68,7 @@ macOS using ProductBuild: .. variable:: CPACK_PRODUCTBUILD_BACKGROUND - Adds a background to Distribtion XML if specified. The value contains the + Adds a background to Distribution XML if specified. The value contains the path to image in ``Resources`` directory. .. variable:: CPACK_PRODUCTBUILD_BACKGROUND_ALIGNMENT diff --git a/Help/dev/review.rst b/Help/dev/review.rst index 6c7e92c..f2a91c0 100644 --- a/Help/dev/review.rst +++ b/Help/dev/review.rst @@ -260,7 +260,7 @@ This may be generated with If the commit is a fix for the mentioned commit, consider using a ``Fixes:`` trailer in the commit message with the specified format. This trailer should not be word-wrapped. Note that if there is also an issue for what is being -fixed, it is preferrable to link to the issue instead. +fixed, it is preferable to link to the issue instead. If relevant, add the first release tag of CMake containing the commit after the ``<date>``, i.e., ``commit <shorthash> (<subject>, <date>, <tag>)``. diff --git a/Help/guide/tutorial/index.rst b/Help/guide/tutorial/index.rst index e42b4f0..ac5e46b 100644 --- a/Help/guide/tutorial/index.rst +++ b/Help/guide/tutorial/index.rst @@ -359,7 +359,7 @@ executables. For example: The CMake variable :variable:`CMAKE_INSTALL_PREFIX` is used to determine the root of where the files will be installed. If using the ``cmake --install`` -command, the installation prefix can be overidden via the ``--prefix`` +command, the installation prefix can be overridden via the ``--prefix`` argument. For example: .. code-block:: console diff --git a/Help/manual/cmake-generator-expressions.7.rst b/Help/manual/cmake-generator-expressions.7.rst index 935f557..c7f6b27 100644 --- a/Help/manual/cmake-generator-expressions.7.rst +++ b/Help/manual/cmake-generator-expressions.7.rst @@ -106,7 +106,7 @@ Variable Queries ``$<TARGET_EXISTS:target>`` ``1`` if ``target`` exists, else ``0``. ``$<CONFIG:cfgs>`` - ``1`` if config is any one of the entires in ``cfgs``, else ``0``. This is a + ``1`` if config is any one of the entries in ``cfgs``, else ``0``. This is a case-insensitive comparison. The mapping in :prop_tgt:`MAP_IMPORTED_CONFIG_<CONFIG>` is also considered by this expression when it is evaluated on a property on an :prop_tgt:`IMPORTED` diff --git a/Help/manual/cmake.1.rst b/Help/manual/cmake.1.rst index 544f6ea..c5e0aae 100644 --- a/Help/manual/cmake.1.rst +++ b/Help/manual/cmake.1.rst @@ -359,7 +359,7 @@ Options This flag tells CMake to warn about other files as well. ``--profiling-output=<path>`` - Used in conjuction with ``--profiling-format`` to output to a given path. + Used in conjunction with ``--profiling-format`` to output to a given path. ``--profiling-format=<file>`` Enable the output of profiling data of CMake script in the given format. @@ -570,7 +570,7 @@ Available commands are: ``compare_files [--ignore-eol] <file1> <file2>`` Check if ``<file1>`` is same as ``<file2>``. If files are the same, then returns ``0``, if not it returns ``1``. In case of invalid - arguments, it retruns 2. The ``--ignore-eol`` option + arguments, it returns 2. The ``--ignore-eol`` option implies line-wise comparison and ignores LF/CRLF differences. ``copy <file>... <destination>`` diff --git a/Help/manual/ctest.1.rst b/Help/manual/ctest.1.rst index d3ab75a..b5bb1c1 100644 --- a/Help/manual/ctest.1.rst +++ b/Help/manual/ctest.1.rst @@ -1333,7 +1333,7 @@ Resource Allocation =================== CTest provides a mechanism for tests to specify the resources that they need -in a fine-grained way, and for users to specify the resources availiable on +in a fine-grained way, and for users to specify the resources available on the running machine. This allows CTest to internally keep track of which resources are in use and which are free, scheduling tests in a way that prevents them from trying to claim resources that are not available. diff --git a/Help/policy/CMP0092.rst b/Help/policy/CMP0092.rst index 66e3f3de..2f39830 100644 --- a/Help/policy/CMP0092.rst +++ b/Help/policy/CMP0092.rst @@ -18,7 +18,7 @@ CMake 3.15 and above prefer to leave out warning flags from the value of This policy provides compatibility with projects that have not been updated to expect the lack of warning flags. The policy setting takes effect as of the first :command:`project` or :command:`enable_language` command that -initializes :variable:`CMAKE_<LANG>_FLAGS` for a given lanuage ``<LANG>``. +initializes :variable:`CMAKE_<LANG>_FLAGS` for a given language ``<LANG>``. .. note:: diff --git a/Help/release/3.1.rst b/Help/release/3.1.rst index 8bea28f..3f4712b 100644 --- a/Help/release/3.1.rst +++ b/Help/release/3.1.rst @@ -83,7 +83,7 @@ Commands :manual:`generator expression <cmake-generator-expressions(7)>`. * The :command:`string` command learned a new ``UUID`` subcommand - to generate a univerally unique identifier. + to generate a universally unique identifier. * New :command:`target_compile_features` command allows populating the :prop_tgt:`COMPILE_FEATURES` target property, just like any other diff --git a/Help/release/3.3.rst b/Help/release/3.3.rst index 6657e8d..44f4e19 100644 --- a/Help/release/3.3.rst +++ b/Help/release/3.3.rst @@ -196,7 +196,7 @@ CPack :prop_inst:`CPACK_START_MENU_SHORTCUTS`, :prop_inst:`CPACK_DESKTOP_SHORTCUTS` and :prop_inst:`CPACK_STARTUP_SHORTCUTS` installed file properties which can - be used to install shorcuts in the Start Menu, on the Desktop and + be used to install shortcuts in the Start Menu, on the Desktop and in the Startup Folder respectively. Other |