summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-12-02 15:22:39 (GMT)
committerBrad King <brad.king@kitware.com>2014-12-02 15:22:39 (GMT)
commitb85cd1bd69fcd4320ea05457e8f2254906b102be (patch)
tree701db936ad3748f88ef4924a83a22b8c8724c7e0 /Help
parent95b89e3fd3846b7ca1e6ab429a526d36e92fd1da (diff)
parent64f8c5336b9a3d1ca5d0b7109ee92b40901c03cd (diff)
downloadCMake-b85cd1bd69fcd4320ea05457e8f2254906b102be.zip
CMake-b85cd1bd69fcd4320ea05457e8f2254906b102be.tar.gz
CMake-b85cd1bd69fcd4320ea05457e8f2254906b102be.tar.bz2
Merge branch 'doc-compile-features-typo' into release
Diffstat (limited to 'Help')
-rw-r--r--Help/manual/cmake-compile-features.7.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Help/manual/cmake-compile-features.7.rst b/Help/manual/cmake-compile-features.7.rst
index 4259224..7a6c249 100644
--- a/Help/manual/cmake-compile-features.7.rst
+++ b/Help/manual/cmake-compile-features.7.rst
@@ -28,7 +28,7 @@ CMake knows are known to the compiler, regardless of language standard
or compile flags needed to use them.
Features known to CMake are named mostly following the same convention
-as the Clang feature test macros. The are some execptions, such as
+as the Clang feature test macros. The are some exceptions, such as
CMake using ``cxx_final`` and ``cxx_override`` instead of the single
``cxx_override_control`` used by Clang.