Merge "[Doc Bld Fix] Add links to man page contents" into stable/pike

2017-08-23 00:05:37 +00:00 · 2017-08-23 00:05:37 +00:00 · 7524a44ebb
parent f897d489ce 6f663fb929
commit 7524a44ebb
3 changed files with 15 additions and 1 deletions
--- a/doc/source/contributor/volume.rst
+++ b/doc/source/contributor/volume.rst
@ -18,7 +18,8 @@
 Storage Volumes, Disks
 ======================

-.. todo:: rework after iSCSI merge (see 'Old Docs') (todd or vish)
+.. note::
+   TODO(todd or vish): rework after iSCSI merge (see 'Old Docs') (todd or vish)


 The :mod:`cinder.volume.manager` Module
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@ -90,6 +90,17 @@ on the python-cinderclient is in the `python-cinderclient repo`_.
   cli/cli-cinder-quotas
   cli/cli-cinder-scheduling

+Man Pages
+~~~~~~~~~
+
+Additional 'man page' style documentation for Cinder may be seen below.
+
+.. toctree::
+   :maxdepth: 2
+
+   man/cinder-manage
+   man/generalized_filters
+
 Drivers
 ~~~~~~~

--- a/doc/source/install/index.rst
+++ b/doc/source/install/index.rst
@ -19,6 +19,8 @@ For more information, see the

 .. toctree::

+   overview
+   get-started-block-storage
   index-obs
   index-rdo
   index-ubuntu