[Cmake-commits] CMake branch, next, updated. v2.8.12-4862-g6c6cc6d

[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  6c6cc6d68206513ccbf8facb7021c1640a55bb0b (commit)
       via  d1e8a0240b6218628af0992c8cc3e89d7609a311 (commit)
      from  2e2047be1371469be2449b96720ee372d30ce76d (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=6c6cc6d68206513ccbf8facb7021c1640a55bb0b
commit 6c6cc6d68206513ccbf8facb7021c1640a55bb0b
Merge: 2e2047b d1e8a02
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 4 11:10:14 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Nov 4 11:10:14 2013 -0500

    Merge topic 'doc-tool-usage' into next
    
    d1e8a02 Help: Refine manual/*.1.rst usage summaries


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d1e8a0240b6218628af0992c8cc3e89d7609a311
commit d1e8a0240b6218628af0992c8cc3e89d7609a311
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 4 11:03:33 2013 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 4 11:06:14 2013 -0500

    Help: Refine manual/*.1.rst usage summaries
    
    Use a parsed-literal block to list possible command-line signatures.
    Add an "Options" section header before the list of options.

diff --git a/Help/manual/ccmake.1.rst b/Help/manual/ccmake.1.rst
index 0c4f47e..a5fe191 100644
--- a/Help/manual/ccmake.1.rst
+++ b/Help/manual/ccmake.1.rst
@@ -6,10 +6,9 @@ ccmake(1)
 Synopsis
 ========
 
-::
+.. parsed-literal::
 
-  ccmake <path-to-source>
-  ccmake <path-to-existing-build>
+ ccmake [<options>] (<path-to-source> | <path-to-existing-build>)
 
 Description
 ===========
@@ -25,6 +24,9 @@ in each directory of a source tree with the name CMakeLists.txt.
 Users build a project by using CMake to generate a build system for a
 native tool on their platform.
 
+Options
+=======
+
 .. include:: OPTIONS_BUILD.txt
 
 .. include:: OPTIONS_HELP.txt
diff --git a/Help/manual/cmake-gui.1.rst b/Help/manual/cmake-gui.1.rst
index ff01332..032b51f 100644
--- a/Help/manual/cmake-gui.1.rst
+++ b/Help/manual/cmake-gui.1.rst
@@ -6,11 +6,10 @@ cmake-gui(1)
 Synopsis
 ========
 
-::
+.. parsed-literal::
 
-  cmake-gui [options]
-  cmake-gui [options] <path-to-source>
-  cmake-gui [options] <path-to-existing-build>
+ cmake-gui [<options>]
+ cmake-gui [<options>] (<path-to-source> | <path-to-existing-build>)
 
 Description
 ===========
@@ -25,6 +24,9 @@ in each directory of a source tree with the name CMakeLists.txt.
 Users build a project by using CMake to generate a build system for a
 native tool on their platform.
 
+Options
+=======
+
 .. include:: OPTIONS_HELP.txt
 
 See Also
diff --git a/Help/manual/cmake.1.rst b/Help/manual/cmake.1.rst
index f74402e..b1f1dc0 100644
--- a/Help/manual/cmake.1.rst
+++ b/Help/manual/cmake.1.rst
@@ -6,10 +6,13 @@ cmake(1)
 Synopsis
 ========
 
-::
+.. parsed-literal::
 
-  cmake [options] <path-to-source>
-  cmake [options] <path-to-existing-build>
+ cmake [<options>] (<path-to-source> | <path-to-existing-build>)
+ cmake [(-D<var>=<value>)...] -P <cmake-script-file>
+ cmake --build <dir> [<options>] [-- <build-tool-options>...]
+ cmake -E <command> [<options>]
+ cmake --find-package <options>...
 
 Description
 ===========
@@ -25,6 +28,9 @@ in each directory of a source tree with the name CMakeLists.txt.
 Users build a project by using CMake to generate a build system for a
 native tool on their platform.
 
+Options
+=======
+
 .. include:: OPTIONS_BUILD.txt
 
 * ``-E``: CMake command mode.
diff --git a/Help/manual/cpack.1.rst b/Help/manual/cpack.1.rst
index 22e5d5a..5967d6f 100644
--- a/Help/manual/cpack.1.rst
+++ b/Help/manual/cpack.1.rst
@@ -6,9 +6,9 @@ cpack(1)
 Synopsis
 ========
 
-::
+.. parsed-literal::
 
-  cpack -G <generator> [options]
+ cpack -G <generator> [<options>]
 
 Description
 ===========
@@ -24,6 +24,8 @@ in each directory of a source tree with the name CMakeLists.txt.
 Users build a project by using CMake to generate a build system for a
 native tool on their platform.
 
+Options
+=======
 
 * ``-G <generator>``: Use the specified generator to generate package.
 
diff --git a/Help/manual/ctest.1.rst b/Help/manual/ctest.1.rst
index 4a5f12e..ed9195e 100644
--- a/Help/manual/ctest.1.rst
+++ b/Help/manual/ctest.1.rst
@@ -6,9 +6,9 @@ ctest(1)
 Synopsis
 ========
 
-::
+.. parsed-literal::
 
-  ctest [options]
+ ctest [<options>]
 
 Description
 ===========
@@ -18,6 +18,8 @@ CMake-generated build trees created for projects that use the
 ENABLE_TESTING and ADD_TEST commands have testing support.  This
 program will run the tests and report results.
 
+Options
+=======
 
 * ``-C <cfg>, --build-config <cfg>``: Choose configuration to test.
 

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

Summary of changes:
 Help/manual/ccmake.1.rst    |    8 +++++---
 Help/manual/cmake-gui.1.rst |   10 ++++++----
 Help/manual/cmake.1.rst     |   12 +++++++++---
 Help/manual/cpack.1.rst     |    6 ++++--
 Help/manual/ctest.1.rst     |    6 ++++--
 5 files changed, 28 insertions(+), 14 deletions(-)


hooks/post-receive
-- 
CMake