Merge branch 'doc-compile-features-typo' into release

This commit is contained in:
Brad King 2014-12-02 10:22:39 -05:00
commit b85cd1bd69
1 changed files with 1 additions and 1 deletions

View File

@ -28,7 +28,7 @@ CMake knows are known to the compiler, regardless of language standard
or compile flags needed to use them. or compile flags needed to use them.
Features known to CMake are named mostly following the same convention 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 CMake using ``cxx_final`` and ``cxx_override`` instead of the single
``cxx_override_control`` used by Clang. ``cxx_override_control`` used by Clang.