[Cmake-commits] CMake branch, next, updated. v3.0.0-rc6-3333-g9fb4859

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  9fb4859d949881e196c60e90a92cfbd616f3744f (commit)
       via  4cf6d9bae4218dfd9cb8520088c63d27e914b0c3 (commit)
      from  85f4f7bd214eac2b5ded36fc9d666d5f69342916 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9fb4859d949881e196c60e90a92cfbd616f3744f
commit 9fb4859d949881e196c60e90a92cfbd616f3744f
Merge: 85f4f7b 4cf6d9b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri May 23 10:49:08 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri May 23 10:49:08 2014 -0400

    Merge topic 'compile-features-manual' into next
    
    4cf6d9ba Help: Fix typos in cmake-compile-features.7 manual


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4cf6d9bae4218dfd9cb8520088c63d27e914b0c3
commit 4cf6d9bae4218dfd9cb8520088c63d27e914b0c3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri May 23 10:49:55 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri May 23 10:49:55 2014 -0400

    Help: Fix typos in cmake-compile-features.7 manual

diff --git a/Help/manual/cmake-compile-features.7.rst b/Help/manual/cmake-compile-features.7.rst
index 808cbeb..c014846 100644
--- a/Help/manual/cmake-compile-features.7.rst
+++ b/Help/manual/cmake-compile-features.7.rst
@@ -20,17 +20,17 @@ CMake provides a primary user interface based on granular handling of
 the features, not the language standard that introduced the feature.
 
 The :prop_gbl:`CMAKE_C_KNOWN_FEATURES` and
-:prop_gbl:`CMAKE_CXX_KNOWN_FEATURES` variables contains all the features
-known to CMake, regardless of compiler support for the feature.  The
-:variable:`CMAKE_C_COMPILE_FEATURES` and
+:prop_gbl:`CMAKE_CXX_KNOWN_FEATURES` global properties contain all the
+features known to CMake, regardless of compiler support for the feature.
+The :variable:`CMAKE_C_COMPILE_FEATURES` and
 :variable:`CMAKE_CXX_COMPILE_FEATURES` variables contain all features
-known to the compiler, regardless of language standard or compile flags
-needed to use them.
+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 execptions, such as
 CMake using ``cxx_final`` and ``cxx_override`` instead of the single
-``cxx_override_control`` used by clang.
+``cxx_override_control`` used by Clang.
 
 Compile Feature Requirements
 ============================
@@ -87,7 +87,7 @@ transitive behavior of build properties and usage requirements.
 Note that new use of compile feature requirements may expose
 cross-platform bugs in user code.  For example, the GNU compiler uses the
 ``gnu++98`` language by default as of GCC version 4.8.  User code may
-be relying on that and expecting the ``typeof`` GNU extension to work.
+be relying on that by expecting the ``typeof`` GNU extension to work.
 However, if the :command:`target_compile_features` command is used to
 specify the requirement for ``cxx_constexpr``, a ``-std=c++11`` flag may
 be added, and the ``typeof`` extension would no longer be available.  The

-----------------------------------------------------------------------

Summary of changes:
 Help/manual/cmake-compile-features.7.rst |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
CMake