Merge "Update new cli-reference links in all guides"

doc/admin-guide-cloud/source/compute-manage-the-cloud.rst

@@ -67,7 +67,8 @@ the Identity Service.
        $ nova help SUBCOMMAND
 
    For a complete list of ``nova`` commands and parameters, see the
-   `OpenStack Command-Line Reference <http://docs.openstack.org/cli-reference/content/novaclient_commands.html>`__.
+   `OpenStack Command-Line Reference
+   <http://docs.openstack.org/cli-reference/nova.html>`__.
 
 #. Set the required parameters as environment variables to make running
    commands easier. For example, you can add :option:`--os-username` as a

doc/admin-guide-cloud/source/networking_config-agents.rst

@@ -493,5 +493,5 @@ complete basic operations on agents:
 **Basic operations on Networking agents**
 
 See the `OpenStack Command-Line Interface
-Reference <http://docs.openstack.org/cli-reference/content/neutronclient_commands.html>`__
+Reference <http://docs.openstack.org/cli-reference/neutron.html>`__
 for more information on Networking commands.

doc/admin-guide-cloud/source/networking_introduction.rst

@@ -264,7 +264,7 @@ Then, create a firewall that applies the policy.
    * To add a single rule, use the insert-rule operation.
 
    For more details, see `Networking command-line client
-   <http://docs.openstack.org/cli-reference/content/neutronclient_commands.html#neutronclient_subcommand_firewall-policy-create>`_
+   <http://docs.openstack.org/cli-reference/neutron.html>`_
    in the OpenStack Command-Line Interface Reference.
 
    .. note::

doc/admin-guide-cloud/source/orchestration-introduction.rst

@@ -28,8 +28,5 @@ integrated with the OpenStack dashboard to perform stack functions through
 a web interface.
 
 For more information about using the Orchestration service through the
-command line, see the `OpenStack Command-Line Interface Reference`_.
-
-.. Links
-.. _`OpenStack Command-Line Interface Reference`: http://docs.openstack.org/
-   cli-reference/content/heatclient_commands.html
+command line, see the `OpenStack Command-Line Interface Reference
+<http://docs.openstack.org/cli-reference/heat.html>`_.

doc/arch-design/source/references.rst

@@ -20,7 +20,7 @@ techsupport/papers/ethernet_switch_reliability.pdf>`_
 : Requirements of the Financial Industry Regulatory Authority in the USA.
 
 `Image Service property keys <http://docs.openstack.org/
-cli-reference/content/chapter_cli-glance-property.html>`_
+cli-reference/glance.html#image-service-property-keys>`_
 : Glance API property keys allows the administrator to attach custom
 characteristics to images.
 

doc/arch-design/source/specialized-hardware.rst

@@ -25,8 +25,8 @@ To provide cryptography offloading to a set of instances,
 you can use Image service configuration options.
 For example, assign the cryptography chip to a device node in the guest.
 The OpenStack Command Line Reference contains further information on
-configuring this solution in the chapter `Image service property keys
-<http://docs.openstack.org/cli-reference/content/chapter_cli-glance-property.html>`_.
+configuring this solution in the section `Image service property keys
+<http://docs.openstack.org/cli-reference/glance.html#image-service-property-keys>`_.
 A challenge, however, is this option allows all guests using the
 configured images to access the hypervisor cryptography device.
 

doc/common-rst/app_support.rst

@@ -68,7 +68,7 @@ command-line clients:
    Guide <http://docs.openstack.org/user-guide-admin/>`__
 
 -  `Command-Line Interface
-   Reference <http://docs.openstack.org/cli-reference/content/>`__
+   Reference <http://docs.openstack.org/cli-reference/>`__
 
 The following documentation provides reference and guidance information
 for the OpenStack APIs:

doc/image-guide/source/image-metadata.rst

@@ -30,8 +30,8 @@ command. More than one property can be specified. For example:
 Common image properties are also specified in the
 ``/etc/glance/schema-image.json`` file.
 For a complete list of valid property keys and values, refer to the
-`OpenStack Command-Line Reference <http://docs.openstack.org/
-cli-reference/content/chapter_cli-glance-property.html>`_.
+`OpenStack Command-Line Reference
+<http://docs.openstack.org/cli-reference/glance.html#image-service-property-keys>`_.
 
 All associated properties for an image can be displayed using the
 :command:`glance image-show` command. For example:

doc/user-guide-admin/source/cli_admin_manage_stacks.rst

@@ -21,7 +21,8 @@ For information about:
 -  basic creation and deletion of Orchestration stacks, refer
    to the `OpenStack End User Guide <http://docs.openstack.org/user-guide/dashboard_stacks.html>`_
 
--  **heat** CLI commands, see the `OpenStack Command Line Interface Reference <http://docs.openstack.org/cli-reference/content/heatclient_commands.html>`_
+-  **heat** CLI commands, see the `OpenStack Command Line Interface Reference
+   <http://docs.openstack.org/cli-reference/heat.html>`_
 
 As an administrator, you can also carry out stack functions
 on behalf of your users. For example, to resume, suspend,