From c5d63ed971f6613084bb7b72de833a5731e2398c Mon Sep 17 00:00:00 2001 From: KATO Tomoyuki <kato.tomoyuki@jp.fujitsu.com> Date: Mon, 12 Dec 2016 13:26:03 +0900 Subject: [PATCH] [cli-ref] highlight openstack command at index page Change-Id: I117512b9bd1ef264945d0151c0ca741410222e55 Partial-Bug: #1490484 --- doc/cli-reference/source/heat.rst | 3 --- doc/cli-reference/source/index.rst | 15 ++++++++++++--- doc/cli-reference/source/openstack.rst | 11 ----------- www/static/.htaccess | 2 ++ 4 files changed, 14 insertions(+), 17 deletions(-) delete mode 100644 doc/cli-reference/source/openstack.rst diff --git a/doc/cli-reference/source/heat.rst b/doc/cli-reference/source/heat.rst index eae4dfe17b..7ce876706f 100644 --- a/doc/cli-reference/source/heat.rst +++ b/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. diff --git a/doc/cli-reference/source/index.rst b/doc/cli-reference/source/index.rst index 4ca3ce9785..c94a6d84e1 100644 --- a/doc/cli-reference/source/index.rst +++ b/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 diff --git a/doc/cli-reference/source/openstack.rst b/doc/cli-reference/source/openstack.rst deleted file mode 100644 index 89ee384391..0000000000 --- a/doc/cli-reference/source/openstack.rst +++ /dev/null @@ -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/>`_. diff --git a/www/static/.htaccess b/www/static/.htaccess index dd37c68ac2..7015da7a61 100644 --- a/www/static/.htaccess +++ b/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