20 files changed, 95 insertions, 40 deletions
diff --git a/Help/generator/Visual Studio 10 2010.rst b/Help/generator/Visual Studio 10 2010.rst
new file mode 100644
index 0000000..000677a
--- /dev/null
+++ b/Help/generator/Visual Studio 10 2010.rst
@@ -0,0 +1,12 @@
+Visual Studio 10 2010
+---------------------
+
+Generates Visual Studio 10 (VS 2010) project files.
+
+It is possible to append a space followed by the platform name to
+create project files for a specific target platform.  E.g.
+"Visual Studio 10 2010 Win64" will create project files for the
+x64 processor; "Visual Studio 10 2010 IA64" for Itanium.
+
+For compatibility with CMake versions prior to 3.0, one may specify this
+generator using the name "Visual Studio 10" without the year component.
diff --git a/Help/generator/Visual Studio 10.rst b/Help/generator/Visual Studio 10.rst
deleted file mode 100644
index 9ea7970..0000000
--- a/Help/generator/Visual Studio 10.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-Visual Studio 10
-----------------
-
-Generates Visual Studio 10 (2010) project files.
-
-It is possible to append a space followed by the platform name to
-create project files for a specific target platform.  E.g.  "Visual
-Studio 10 Win64" will create project files for the x64 processor;
-"Visual Studio 10 IA64" for Itanium.
diff --git a/Help/generator/Visual Studio 11 2012.rst b/Help/generator/Visual Studio 11 2012.rst
new file mode 100644
index 0000000..42f6f91
--- /dev/null
+++ b/Help/generator/Visual Studio 11 2012.rst
@@ -0,0 +1,12 @@
+Visual Studio 11 2012
+---------------------
+
+Generates Visual Studio 11 (VS 2012) project files.
+
+It is possible to append a space followed by the platform name to
+create project files for a specific target platform.  E.g.
+"Visual Studio 11 2012 Win64" will create project files for the
+x64 processor; "Visual Studio 11 2012 ARM" for ARM.
+
+For compatibility with CMake versions prior to 3.0, one may specify this
+generator using the name "Visual Studio 11" without the year component.
diff --git a/Help/generator/Visual Studio 11.rst b/Help/generator/Visual Studio 11.rst
deleted file mode 100644
index 4115c8d..0000000
--- a/Help/generator/Visual Studio 11.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-Visual Studio 11
-----------------
-
-Generates Visual Studio 11 (2012) project files.
-
-It is possible to append a space followed by the platform name to
-create project files for a specific target platform.  E.g.  "Visual
-Studio 11 Win64" will create project files for the x64 processor;
-"Visual Studio 11 ARM" for ARM.
diff --git a/Help/generator/Visual Studio 12 2013.rst b/Help/generator/Visual Studio 12 2013.rst
new file mode 100644
index 0000000..d2f4912
--- /dev/null
+++ b/Help/generator/Visual Studio 12 2013.rst
@@ -0,0 +1,12 @@
+Visual Studio 12 2013
+---------------------
+
+Generates Visual Studio 12 (VS 2013) project files.
+
+It is possible to append a space followed by the platform name to
+create project files for a specific target platform.  E.g.
+"Visual Studio 12 2013 Win64" will create project files for the
+x64 processor; "Visual Studio 12 2013 ARM" for ARM.
+
+For compatibility with CMake versions prior to 3.0, one may specify this
+generator using the name "Visual Studio 12" without the year component.
diff --git a/Help/generator/Visual Studio 12.rst b/Help/generator/Visual Studio 12.rst
deleted file mode 100644
index 51bcab7..0000000
--- a/Help/generator/Visual Studio 12.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-Visual Studio 12
-----------------
-
-Generates Visual Studio 12 (2013) project files.
-
-It is possible to append a space followed by the platform name to
-create project files for a specific target platform.  E.g.  "Visual
-Studio 12 Win64" will create project files for the x64 processor;
-"Visual Studio 12 ARM" for ARM.
diff --git a/Help/index.rst b/Help/index.rst
index 850660e..dea1463 100644
--- a/Help/index.rst
+++ b/Help/index.rst
@@ -1,30 +1,50 @@
-CMake Reference Documentation
-#############################
+.. title:: CMake Reference Documentation
 
-.. only:: html
-
- Reference Manuals:
+Command-Line Tools
+##################
 
 .. toctree::
    :maxdepth: 1
 
-   /manual/ccmake.1
    /manual/cmake.1
-   /manual/cmake-gui.1
-   /manual/cpack.1
    /manual/ctest.1
+   /manual/cpack.1
+
+Interactive Dialogs
+###################
+
+.. toctree::
+   :maxdepth: 1
+
+   /manual/cmake-gui.1
+   /manual/ccmake.1
+
+Reference Manuals
+#################
+
+.. toctree::
+   :maxdepth: 1
+
    /manual/cmake-commands.7
    /manual/cmake-generators.7
    /manual/cmake-modules.7
    /manual/cmake-policies.7
    /manual/cmake-properties.7
    /manual/cmake-variables.7
-   /manual/cmake-generator-expressions.7
+
+Other Manuals
+#############
+
+.. toctree::
+   :maxdepth: 1
+
    /manual/cmake-developer.7
+   /manual/cmake-generator-expressions.7
 
 .. only:: html
 
- Index and Search:
+ Index and Search
+ ################
 
  * :ref:`genindex`
  * :ref:`search`
diff --git a/Help/manual/ccmake.1.rst b/Help/manual/ccmake.1.rst
index 62a7dcf..0c4f47e 100644
--- a/Help/manual/ccmake.1.rst
+++ b/Help/manual/ccmake.1.rst
@@ -1,3 +1,5 @@
+.. cmake-manual-description: CMake Curses Dialog Command-Line Reference
+
 ccmake(1)
 *********
 
diff --git a/Help/manual/cmake-commands.7.rst b/Help/manual/cmake-commands.7.rst
index 71d7375..9b23efa 100644
--- a/Help/manual/cmake-commands.7.rst
+++ b/Help/manual/cmake-commands.7.rst
@@ -1,3 +1,5 @@
+.. cmake-manual-description: CMake Language Command Reference
+
 cmake-commands(7)
 *****************
 
diff --git a/Help/manual/cmake-developer.7.rst b/Help/manual/cmake-developer.7.rst
index 198a240..ee2016f 100644
--- a/Help/manual/cmake-developer.7.rst
+++ b/Help/manual/cmake-developer.7.rst
@@ -1,3 +1,5 @@
+.. cmake-manual-description: CMake Developer Reference
+
 cmake-developer(7)
 ******************
 
diff --git a/Help/manual/cmake-generator-expressions.7.rst b/Help/manual/cmake-generator-expressions.7.rst
index 849ee36..ddde183 100644
--- a/Help/manual/cmake-generator-expressions.7.rst
+++ b/Help/manual/cmake-generator-expressions.7.rst
@@ -1,3 +1,5 @@
+.. cmake-manual-description: CMake Generator Expressions
+
 cmake-generator-expressions(7)
 ******************************
 
diff --git a/Help/manual/cmake-generators.7.rst b/Help/manual/cmake-generators.7.rst
index c73d587..a290d1a 100644
--- a/Help/manual/cmake-generators.7.rst
+++ b/Help/manual/cmake-generators.7.rst
@@ -1,3 +1,5 @@
+.. cmake-manual-description: CMake Generators Reference
+
 cmake-generators(7)
 *******************
 
@@ -30,9 +32,9 @@ All Generators
    /generator/Sublime Text 2 - NMake Makefiles
    /generator/Sublime Text 2 - Unix Makefiles
    /generator/Unix Makefiles
-   /generator/Visual Studio 10
-   /generator/Visual Studio 11
-   /generator/Visual Studio 12
+   /generator/Visual Studio 10 2010
+   /generator/Visual Studio 11 2012
+   /generator/Visual Studio 12 2013
    /generator/Visual Studio 6
    /generator/Visual Studio 7 .NET 2003
    /generator/Visual Studio 7
diff --git a/Help/manual/cmake-gui.1.rst b/Help/manual/cmake-gui.1.rst
index e773ee1..ff01332 100644
--- a/Help/manual/cmake-gui.1.rst
+++ b/Help/manual/cmake-gui.1.rst
@@ -1,3 +1,5 @@
+.. cmake-manual-description: CMake GUI Command-Line Reference
+
 cmake-gui(1)
 ************
 
diff --git a/Help/manual/cmake-modules.7.rst b/Help/manual/cmake-modules.7.rst
index da518d3..1f3e59f 100644
--- a/Help/manual/cmake-modules.7.rst
+++ b/Help/manual/cmake-modules.7.rst
@@ -1,3 +1,5 @@
+.. cmake-manual-description: CMake Modules Reference
+
 cmake-modules(7)
 ****************
 
diff --git a/Help/manual/cmake-policies.7.rst b/Help/manual/cmake-policies.7.rst
index fcbccba..e3cf74d 100644
--- a/Help/manual/cmake-policies.7.rst
+++ b/Help/manual/cmake-policies.7.rst
@@ -1,3 +1,5 @@
+.. cmake-manual-description: CMake Policies Reference
+
 cmake-policies(7)
 *****************
 
diff --git a/Help/manual/cmake-properties.7.rst b/Help/manual/cmake-properties.7.rst
index 6fbde74..7fe1bf2 100644
--- a/Help/manual/cmake-properties.7.rst
+++ b/Help/manual/cmake-properties.7.rst
@@ -1,3 +1,5 @@
+.. cmake-manual-description: CMake Properties Reference
+
 cmake-properties(7)
 *******************
 
diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst
index 157c38d..2fc02a1 100644
--- a/Help/manual/cmake-variables.7.rst
+++ b/Help/manual/cmake-variables.7.rst
@@ -1,3 +1,5 @@
+.. cmake-manual-description: CMake Variables Reference
+
 cmake-variables(7)
 ******************
 
diff --git a/Help/manual/cmake.1.rst b/Help/manual/cmake.1.rst
index d2a45aa..f74402e 100644
--- a/Help/manual/cmake.1.rst
+++ b/Help/manual/cmake.1.rst
@@ -1,3 +1,5 @@
+.. cmake-manual-description: CMake Command-Line Reference
+
 cmake(1)
 ********
 
diff --git a/Help/manual/cpack.1.rst b/Help/manual/cpack.1.rst
index 5c6567c..22e5d5a 100644
--- a/Help/manual/cpack.1.rst
+++ b/Help/manual/cpack.1.rst
@@ -1,3 +1,5 @@
+.. cmake-manual-description: CPack Command-Line Reference
+
 cpack(1)
 ********
 
diff --git a/Help/manual/ctest.1.rst b/Help/manual/ctest.1.rst
index 43fb961..4a5f12e 100644
--- a/Help/manual/ctest.1.rst
+++ b/Help/manual/ctest.1.rst
@@ -1,3 +1,5 @@
+.. cmake-manual-description: CTest Command-Line Reference
+
 ctest(1)
 ********