Merge topic 'fix-typos-12975'

7ec2ebd fix the same typos as found by Debian in other places, too
d36d29f various typo and formatting fixes in manual pages (#12975)

7 files changed, 14 insertions, 14 deletions

diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index f76e91e..9b6329a 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -183,7 +183,7 @@
 #     The refered script file(s) will be read and directly
 #     put after the %pre or %preun section
 #     If CPACK_RPM_COMPONENT_INSTALL is set to ON the (un)install script for
-#     each component can be overriden with
+#     each component can be overridden with
 #     CPACK_RPM_<COMPONENT>_PRE_INSTALL_SCRIPT_FILE and
 #     CPACK_RPM_<COMPONENT>_PRE_UNINSTALL_SCRIPT_FILE
 #     One may verify which scriptlet has been included with
@@ -198,7 +198,7 @@
 #     The refered script file(s) will be read and directly
 #     put after the %post or %postun section
 #     If CPACK_RPM_COMPONENT_INSTALL is set to ON the (un)install script for
-#     each component can be overriden with
+#     each component can be overridden with
 #     CPACK_RPM_<COMPONENT>_POST_INSTALL_SCRIPT_FILE and
 #     CPACK_RPM_<COMPONENT>_POST_UNINSTALL_SCRIPT_FILE
 #     One may verify which scriptlet has been included with
@@ -209,7 +209,7 @@
 #  CPACK_RPM_<COMPONENT>_USER_FILELIST
 #     Mandatory : NO
 #     Default   : -
-#     May be used to explicitely specify %(<directive>) file line
+#     May be used to explicitly specify %(<directive>) file line
 #     in the spec file. Like %config(noreplace) or any other directive
 #     that be found in the %files section. Since CPackRPM is generating
 #     the list of files (and directories) the user specified files of
diff --git a/Modules/FeatureSummary.cmake b/Modules/FeatureSummary.cmake
index eb10cbc..cef647e 100644
--- a/Modules/FeatureSummary.cmake
+++ b/Modules/FeatureSummary.cmake
@@ -125,7 +125,7 @@
 #
 #   set_package_properties(LibXml2 PROPERTIES TYPE RECOMMENDED
 #                                             PURPOSE "Enables HTML-import in MyWordProcessor")
-# ...
+#   ...
 #   set_package_properties(LibXml2 PROPERTIES TYPE OPTIONAL
 #                                             PURPOSE "Enables odt-export in MyWordProcessor")
 #
diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake
index 4d91a92..9f8d575 100644
--- a/Modules/FindCUDA.cmake
+++ b/Modules/FindCUDA.cmake
@@ -906,7 +906,7 @@ macro(CUDA_WRAP_SRCS cuda_target format generated_files)
     message( FATAL_ERROR "Invalid format flag passed to CUDA_WRAP_SRCS: '${format}'.  Use OBJ or PTX.")
   endif()
 
-  # Set up all the command line flags here, so that they can be overriden on a per target basis.
+  # Set up all the command line flags here, so that they can be overridden on a per target basis.
 
   set(nvcc_flags "")
 
diff --git a/Modules/FindImageMagick.cmake b/Modules/FindImageMagick.cmake
index 75523f4..52d575b 100644
--- a/Modules/FindImageMagick.cmake
+++ b/Modules/FindImageMagick.cmake
@@ -169,7 +169,7 @@ FOREACH(component ${ImageMagick_FIND_COMPONENTS}
         LIST(APPEND ImageMagick_REQUIRED_VARS ImageMagick_${component}_EXECUTABLE)
       ENDIF(is_requested GREATER -1)
     ELSEIF(ImageMagick_${component}_EXECUTABLE)
-      # if no components were requested explicitely put all (default) executables
+      # if no components were requested explicitly put all (default) executables
       # in the list
       LIST(APPEND ImageMagick_DEFAULT_EXECUTABLES "${ImageMagick_${component}_EXECUTABLE}")
     ENDIF(ImageMagick_FIND_COMPONENTS)
diff --git a/Modules/UseJava.cmake b/Modules/UseJava.cmake
index 1dfa3c0..84d0afd 100644
--- a/Modules/UseJava.cmake
+++ b/Modules/UseJava.cmake
@@ -121,7 +121,7 @@
 #                [VERSION TRUE|FALSE]
 #               )
 #
-# Create jave documentation based on files or packages. For more
+# Create java documentation based on files or packages. For more
 # details please read the javadoc manpage.
 #
 # There are two main signatures for create_javadoc. The first
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index ae5596b..0c79b30 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -1047,10 +1047,10 @@ void cmTarget::DefineProperties(cmake *cm)
      "Can be set to one or more UUIDs recognized by Visual Studio "
      "to indicate the type of project. This value is copied "
      "verbatim into the generated project file. Example for a "
-     "managed C++ unit testing project: \""
-     "{3AC096D0-A1C2-E12C-1390-A8335801FDAB};"
-     "{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}\". UUIDs are "
-     "semicolon-delimited.");
+     "managed C++ unit testing project:\n"
+     " {3AC096D0-A1C2-E12C-1390-A8335801FDAB};"
+     "{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}\n"
+     "UUIDs are semicolon-delimited.");
   cm->DefineProperty
     ("VS_GLOBAL_KEYWORD", cmProperty::TARGET,
      "Visual Studio project keyword.",
diff --git a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
index f76f0d9..ec09aa5 100644
--- a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
+++ b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
@@ -16,16 +16,16 @@ macro(do_find MODULE_NAME)
 endmacro(do_find)
 
 # It is only possible to use either Qt3 or Qt4 in one project.
-# Since FindQt will complain if both are found we explicitely
-# filter out this and FindQt3. FindKDE3 also depends on Qt3 and
+# Since FindQt will complain if both are found we explicitly request Qt4 here
+# and filter out FindQt3. FindKDE3 also depends on Qt3 and
 # is therefore also blocked
+set(DESIRED_QT_VERSION 4)
 set(NO_QT4_MODULES "Qt3" "KDE3")
 
 # These modules are named Find*.cmake, but are nothing that works in
 # find_package().
 set(NO_FIND_MODULES "PackageHandleStandardArgs" "PackageMessage")
 
-set(DESIRED_QT_VERSION 4)
 foreach(FIND_MODULE ${FIND_MODULES})
     string(REGEX REPLACE ".*/Find(.*)\\.cmake$" "\\1" MODULE_NAME "${FIND_MODULE}")