[Cmake-commits] CMake branch, next, updated. v2.8.12-4864-g0ae0278

[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  0ae02782f5c1f62959bc62e7c01c89b54e0df271 (commit)
       via  0fa9aea2936eea1081b088caca29bad731437773 (commit)
      from  6c6cc6d68206513ccbf8facb7021c1640a55bb0b (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=0ae02782f5c1f62959bc62e7c01c89b54e0df271
commit 0ae02782f5c1f62959bc62e7c01c89b54e0df271
Merge: 6c6cc6d 0fa9aea
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 4 11:18:17 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Nov 4 11:18:17 2013 -0500

    Merge topic 'remove-cmake-i-wizard' into next
    
    0fa9aea Help: Drop mention of cmake -i wizard mode


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0fa9aea2936eea1081b088caca29bad731437773
commit 0fa9aea2936eea1081b088caca29bad731437773
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 4 11:07:16 2013 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 4 11:16:22 2013 -0500

    Help: Drop mention of cmake -i wizard mode
    
    The parent commit removed support for this mode, so do not mention
    it in the documentation.

diff --git a/Help/manual/cmake.1.rst b/Help/manual/cmake.1.rst
index 46190b5..c9d23db 100644
--- a/Help/manual/cmake.1.rst
+++ b/Help/manual/cmake.1.rst
@@ -14,8 +14,7 @@ Description
 
 The "cmake" executable is the CMake command-line interface.  It may be
 used to configure projects in scripts.  Project configuration settings
-may be specified on the command line with the -D option.  The -i
-option will cause cmake to interactively prompt for such settings.
+may be specified on the command line with the -D option.
 
 CMake is a cross-platform build system generator.  Projects specify
 their build process with platform-independent CMake listfiles included
diff --git a/Help/variable/CMAKE_EDIT_COMMAND.rst b/Help/variable/CMAKE_EDIT_COMMAND.rst
index 24d26b5..a5c13f4 100644
--- a/Help/variable/CMAKE_EDIT_COMMAND.rst
+++ b/Help/variable/CMAKE_EDIT_COMMAND.rst
@@ -4,4 +4,4 @@ CMAKE_EDIT_COMMAND
 Full path to cmake-gui or ccmake.
 
 This is the full path to the CMake executable that can graphically
-edit the cache.  For example, cmake-gui, ccmake, or cmake -i.
+edit the cache.  For example, cmake-gui or ccmake.

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

Summary of changes:
 Help/manual/cmake.1.rst              |    3 +--
 Help/variable/CMAKE_EDIT_COMMAND.rst |    2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake