[Cmake-commits] CMake branch, next, updated. v3.1.2-1181-g5e36f8e

[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  5e36f8ee1ebf4538146f9f0cb5974426eac14249 (commit)
       via  918bf7fa136b79ccd4a572214b803e94a4fa5e69 (commit)
      from  17fef0dae571e0f745c3dd14facd90e68cf8c9db (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=5e36f8ee1ebf4538146f9f0cb5974426eac14249
commit 5e36f8ee1ebf4538146f9f0cb5974426eac14249
Merge: 17fef0d 918bf7f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 10 13:01:40 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 10 13:01:40 2015 -0500

    Merge topic 'doc-user-interaction' into next
    
    918bf7fa fixup! Help: Add a new user manual for user interaction.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=918bf7fa136b79ccd4a572214b803e94a4fa5e69
commit 918bf7fa136b79ccd4a572214b803e94a4fa5e69
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 10 13:01:20 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 10 13:01:20 2015 -0500

    fixup! Help: Add a new user manual for user interaction.

diff --git a/Help/manual/cmake-user-interaction.7.rst b/Help/manual/cmake-user-interaction.7.rst
index 519c187..85e506e 100644
--- a/Help/manual/cmake-user-interaction.7.rst
+++ b/Help/manual/cmake-user-interaction.7.rst
@@ -25,7 +25,8 @@ to their system.
 
 Generated buildsystems should generally be treated as read-only. The CMake
 files as a primary artifact should completely specify the buildsystem and
-there should be no reason to populate properties in an IDE for example.
+there should be no reason to populate properties manually in an IDE for
+example.
 
 The features and user interfaces described in this manual are available for
 all CMake-based build systems by virtue of providing CMake files.
@@ -84,9 +85,8 @@ simply deleting the build directory.
 
 The CMake tooling may report warnings which are intended for the provider
 of the software, not intended for the consumer of the software.  Such
-warnings usually take the form of :manual:`policy <cmake-policies(7)>`
-warnings.  Users may disable such warnings by passing the ``-Wno-dev`` flag
-to :manual:`cmake(1)`.
+warnings end with "This warning is for project developers".  Users may
+disable such warnings by passing the ``-Wno-dev`` flag to :manual:`cmake(1)`.
 
 Note that spaces in the path to the source directory or build directory can
 cause problems if the provided software is not written to carefully quote
@@ -110,7 +110,7 @@ The output of ``cmake --help`` includes a list of
 :manual:`generators <cmake-generators(7)>` available for the user to
 choose from.
 
-On Unix-like systems (including Apple), the :generator:`Unix Makefiles`
+On Unix-like systems (including Mac OS X), the :generator:`Unix Makefiles`
 generator is used by default.  A variant of that generator can also be used
 on Windows in various environments, such as the :generator:`NMake Makefiles`
 and :generator:`MinGW Makefiles` generator.  These generators generate

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

Summary of changes:
 Help/manual/cmake-user-interaction.7.rst |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake