[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6337-gaf0f0a4

[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  af0f0a411f661198608d2b2aeb9b8684b7c464a3 (commit)
       via  12862e939fc72d455d962fbf54ca8fcad47e2514 (commit)
      from  ff935aafe6eedacd48ae4f30ba1d1df5be8cb425 (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=af0f0a411f661198608d2b2aeb9b8684b7c464a3
commit af0f0a411f661198608d2b2aeb9b8684b7c464a3
Merge: ff935aa 12862e9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Dec 20 15:15:56 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Dec 20 15:15:56 2013 -0500

    Merge topic 'doc-organize-index' into next
    
    12862e9 Help: Simplify top-level index organization


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=12862e939fc72d455d962fbf54ca8fcad47e2514
commit 12862e939fc72d455d962fbf54ca8fcad47e2514
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Dec 20 15:04:54 2013 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Dec 20 15:10:10 2013 -0500

    Help: Simplify top-level index organization
    
    Revise the organization introduced in commit 2c7cd95c (Help: Organize
    top-level index, 2013-10-28) to drop "Other Manuals" and put them in
    "Reference Manuals" because the distinction between them has blurred.
    Perhaps a better breakdown of the reference manuals will emerge in
    the future.
    
    While at it, sort the reference manual toctree by name.

diff --git a/Help/index.rst b/Help/index.rst
index f5cb8a5..a7a1bd9 100644
--- a/Help/index.rst
+++ b/Help/index.rst
@@ -26,24 +26,17 @@ Reference Manuals
    :maxdepth: 1
 
    /manual/cmake-commands.7
+   /manual/cmake-developer.7
+   /manual/cmake-generator-expressions.7
    /manual/cmake-generators.7
-   /manual/cmake-toolchains.7
+   /manual/cmake-language.7
    /manual/cmake-modules.7
    /manual/cmake-packages.7
    /manual/cmake-policies.7
    /manual/cmake-properties.7
+   /manual/cmake-toolchains.7
    /manual/cmake-variables.7
 
-Other Manuals
-#############
-
-.. toctree::
-   :maxdepth: 1
-
-   /manual/cmake-developer.7
-   /manual/cmake-generator-expressions.7
-   /manual/cmake-language.7
-
 .. only:: html
 
  Index and Search

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

Summary of changes:
 Help/index.rst |   15 ++++-----------
 1 files changed, 4 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
CMake