[Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-374-ge5f2828

[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  e5f2828eed88f28a8ea27474996dc39bf0179f2b (commit)
       via  ec7b892e29e52fb5fa791e4fe956422c4ab4946f (commit)
      from  9e5df9c8cba2b0b0a01a95ce44387650a2e1322a (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=e5f2828eed88f28a8ea27474996dc39bf0179f2b
commit e5f2828eed88f28a8ea27474996dc39bf0179f2b
Merge: 9e5df9c ec7b892
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 17 10:48:50 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 17 10:48:50 2015 -0500

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


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ec7b892e29e52fb5fa791e4fe956422c4ab4946f
commit ec7b892e29e52fb5fa791e4fe956422c4ab4946f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 17 10:47:48 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 17 10:48:25 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 85e506e..e50f4b3 100644
--- a/Help/manual/cmake-user-interaction.7.rst
+++ b/Help/manual/cmake-user-interaction.7.rst
@@ -197,7 +197,7 @@ user because they are paths and options specific to the users system.
 When it is first executed, CMake generates a cache file in the build
 directory containing key-value pairs for such artifacts.  The cache file
 can be viewed or edited by the user by running the :manual:`cmake-gui(1)`
-or :manual:`ccmake(1)` tool.  The tools provide user interface for
+or :manual:`ccmake(1)` tool.  The tools provide an interactive interface for
 re-configuring the provided software and re-generating the buildsystem, as
 is needed after editing cached values.  Each cache entry may have an
 associated short help text which is displayed in the user interface tools.
@@ -209,7 +209,8 @@ type ``BOOL`` can be edited by a checkbox in a user interface, a
 to a ``STRING`` should also provide a way to locate filesystem paths using
 a file dialog.  An entry of type ``STRING`` may provide a restricted list of
 allowed values which are then provided in a drop-down menu in
-the :manual:`cmake-gui(1)` user interface.
+the :manual:`cmake-gui(1)` user interface (see the :prop_cache:`STRINGS`
+cache property).
 
 On the command line, the ``-D`` option to the :manual:`cmake(1)` tool is
 used to specify cache entries, and the ``-U`` option is used to clear

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

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


hooks/post-receive
-- 
CMake