Merge "[cli-ref] highlight openstack command at index page"

doc/cli-reference/source/heat.rst

@@ -10,9 +10,6 @@ Orchestration service (heat) command-line client
 
    The heat CLI is deprecated
    in favor of python-openstackclient.
-   For more information, see :doc:`openstack`.
-   For a Python library, continue using
-   python-heatclient.
 
 The heat client is the command-line interface (CLI) for
 the Orchestration service (heat) API and its extensions.

doc/cli-reference/source/index.rst

@@ -14,13 +14,22 @@ in the OpenStack End User Guide.
 Contents
 ~~~~~~~~
 
-.. sorted by the service name in alphabetical order, except for openstack
+.. important::
+
+   OpenStackClient is a command-line client for OpenStack that brings
+   the command set for the various APIs together in a single shell
+   with a uniform command structure.
+
+   Presently, Identity service (keystone) and Messaging service (zaqar)
+   only use the OpenStackClient command set.
+
+   For more information about OpenStackClient and the command list,
+   see the `OpenStackClient documentation
+   <http://docs.openstack.org/developer/python-openstackclient/>`_.
 
 .. toctree::
    :maxdepth: 1
 
-   openstack
-
    murano
    freezer
    ironic

doc/cli-reference/source/openstack.rst

@@ -1,11 +0,0 @@
-=============================
-OpenStack command-line client
-=============================
-
-OpenStackClient is a command-line client for OpenStack that brings
-the command set for the various APIs together in a single shell
-with a uniform command structure.
-
-For more information about OpenStackClient and command list,
-see `OpenStackClient document
-<http://docs.openstack.org/developer/python-openstackclient/>`_.

www/static/.htaccess

@@ -509,4 +509,6 @@ redirect 301 /mitaka/networking-guide/adv-config-subnet-pools.html /mitaka/netwo
 redirect 301 /mitaka/networking-guide/adv-config-tag.html /mitaka/networking-guide/ops-resource-tags.html
 
 # Redirect removed CLI reference
+redirect 301 /cli-reference/keystone.html /developer/python-openstackclient/command-list.html
+redirect 301 /cli-reference/openstack.html /developer/python-openstackclient/
 redirect 301 /cli-reference/sahara.html /developer/python-openstackclient/plugin-commands.html#sahara