Update the administrator guide links in all guides

Change-Id: Iadb25ffd562a7fa50c0e409b362808a9a4a578c9

doc/common/get_started_compute.rst

@@ -27,8 +27,8 @@ OpenStack Compute consists of the following areas and their components:
   Accepts metadata requests from instances. The ``nova-api-metadata``
   service is generally used when you run in multi-host mode with
   ``nova-network`` installations. For details, see `Metadata
-  service <http://docs.openstack.org/admin-guide-cloud/compute-networking-nova.html#metadata-service>`__
+  service <http://docs.openstack.org/admin-guide/compute-networking-nova.html#metadata-service>`__
-  in the OpenStack Cloud Administrator Guide.
+  in the OpenStack Administrator Guide.
 
 ``nova-compute`` service
   A worker daemon that creates and terminates virtual machine
@@ -72,7 +72,7 @@ OpenStack Compute consists of the following areas and their components:
   for console proxies to work. You can run proxies of either type
   against a single nova-consoleauth service in a cluster
   configuration. For information, see `About
-  nova-consoleauth <http://docs.openstack.org/admin-guide-cloud/compute-remote-console-access.html#about-nova-consoleauth>`__.
+  nova-consoleauth <http://docs.openstack.org/admin-guide/compute-remote-console-access.html#about-nova-consoleauth>`__.
 
 ``nova-novncproxy`` daemon
   Provides a proxy for accessing running instances through a VNC

doc/config-reference/source/block-storage/drivers/dell-equallogic-driver.rst

@@ -157,4 +157,4 @@ In this example:
 
 For information on configuring multiple back ends, see `Configure a
 multiple-storage back
-end <http://docs.openstack.org/admin-guide-cloud/blockstorage_multi_backend.html>`__.
+end <http://docs.openstack.org/admin-guide/blockstorage_multi_backend.html>`__.

doc/config-reference/source/block-storage/drivers/emc-vnx-driver.rst

@@ -166,8 +166,8 @@ with ``EMCCLIISCSIDriver`` if you are using the iSCSI driver.
    volume_driver = cinder.volume.drivers.emc.emc_cli_fc.EMCCLIFCDriver
    initiator_auto_registration = True
 
-For more details on multi-backends, see `OpenStack Cloud Administration Guide
+For more details on multi-backends, see `OpenStack Administrator Guide
-<http://docs.openstack.org/admin-guide-cloud/index.html>`__
+<http://docs.openstack.org/admin-guide/index.html>`__
 
 Required configurations
 -----------------------

doc/config-reference/source/compute/scheduler.rst

@@ -49,8 +49,8 @@ how often the list is updated.
    be dead while the host list is being cached.
 
 For information about the volume scheduler, see the Block Storage section of
-`OpenStack Cloud Administrator Guide <http://docs.openstack.org/
+`OpenStack Administrator Guide <http://docs.openstack.org/
-admin-guide-cloud/blockstorage-manage-volumes.html>`_.
+admin-guide/blockstorage-manage-volumes.html>`_.
 
 The scheduler chooses a new host when an instance is migrated.
 
@@ -58,9 +58,9 @@ When evacuating instances from a host, the scheduler service honors
 the target host defined by the administrator on the evacuate command.
 If a target is not defined by the administrator, the scheduler
 determines the target host. For information about instance evacuation,
-see `Evacuate instances <http://docs.openstack.org/admin-guide-cloud/
+see `Evacuate instances <http://docs.openstack.org/admin-guide/
 compute-node-down.html#evacuate-instances>`_ section of the
-``OpenStack Cloud Administrator Guide``.
+OpenStack Administrator Guide.
 
 Filter scheduler
 ~~~~~~~~~~~~~~~~

doc/config-reference/source/identity.rst

@@ -14,5 +14,5 @@ Identity service
 This chapter details the OpenStack Identity service configuration options. For
 installation prerequisites and step-by-step walkthroughs, see the OpenStack
 Installation Guide for your distribution (`docs.openstack.org
-<http://docs.openstack.org>`__) and `Cloud Administrator Guide
+<http://docs.openstack.org>`__) and `Administrator Guide
-<http://docs.openstack.org/admin-guide-cloud/>`__.
+<http://docs.openstack.org/admin-guide/>`__.

doc/config-reference/source/networking.rst

@@ -13,6 +13,5 @@ Networking
 This chapter explains the OpenStack Networking configuration options.
 For installation prerequisites, steps, and use cases, see the OpenStack
 Installation Guide for your distribution
-(`docs.openstack.org <http://docs.openstack.org>`__) and the `Cloud
+(`docs.openstack.org <http://docs.openstack.org>`__) and the
-Administrator Guide <http://docs.openstack.org/admin-guide-cloud/>`__.
+`Administrator Guide <http://docs.openstack.org/admin-guide/>`__.
-

doc/config-reference/source/networking/networking_options_reference.rst

@@ -96,7 +96,7 @@ This section describes the available configuration options.
      and set all guest virtual machines' MTU to the same value by
      using a DHCP option. For information about how to use this
      option, see `Configure OVS plug-in
-     <http://docs.openstack.org/admin-guide-cloud/networking_config-agents.html>`__.
+     <http://docs.openstack.org/admin-guide/networking_config-agents.html>`__.
 
 .. note::
    OpenFlow Agent (ofagent) Mechanism driver is deprecated in favor

doc/contributor-guide/source/content-specs.rst

@@ -52,7 +52,7 @@ Guides for deployers and administrators
 
 * `OpenStack Architecture Design Guide`_: Contains information on how to plan,
   design and architect an OpenStack cloud.
-* `OpenStack Cloud Administrator Guide`_: Contains how-to information for
+* `OpenStack Administrator Guide`_: Contains how-to information for
   managing an OpenStack cloud as needed for your use cases, such as storage,
   computing, or software-defined-networking.
 * `OpenStack High Availability Guide`_: Describes potential strategies for
@@ -164,7 +164,7 @@ This guide has a review in place to get a license indicator in output:
 .. _`release information`: https://wiki.openstack.org/wiki/Releases
 
 .. _`OpenStack Architecture Design Guide`: http://docs.openstack.org/arch-design/
-.. _`OpenStack Cloud Administrator Guide`: http://docs.openstack.org/admin-guide-cloud/index.html
+.. _`OpenStack Administrator Guide`: http://docs.openstack.org/admin-guide/index.html
 .. _`OpenStack High Availability Guide`: http://docs.openstack.org/ha-guide/index.html
 .. _`OpenStack Security Guide`: http://docs.openstack.org/sec/
 .. _`Virtual Machine Image Guide`: http://docs.openstack.org/image-guide/

doc/contributor-guide/source/docs-builds.rst

@@ -72,9 +72,9 @@ Guides for deployers and administrators
      - http://git.openstack.org/cgit/openstack/openstack-manuals/tree/doc/config-reference
      - http://docs.openstack.org/mitaka/config-reference/
 
-   * - Cloud Administrator Guide
+   * - Administrator Guide
-     - http://git.openstack.org/cgit/openstack/openstack-manuals/tree/doc/admin-guide-cloud
+     - http://git.openstack.org/cgit/openstack/openstack-manuals/tree/doc/admin-guide
-     - http://docs.openstack.org/admin-guide-cloud
+     - http://docs.openstack.org/admin-guide
 
    * - High Availability Guide
      - http://git.openstack.org/cgit/openstack/ha-guide

doc/install-guide/source/ceilometer-cinder.rst

@@ -56,6 +56,6 @@ Finalize installation
 
 3. Use the ``cinder-volume-usage-audit`` command on Block Storage nodes
    to retrieve meters on demand. For more information, see the
-   `Cloud Administrator Guide <http://docs.openstack.org/admin-guide-cloud/
+   `Administrator Guide <http://docs.openstack.org/admin-guide/
    telemetry-data-collection.html#block-storage-audit-script-setup-to-get-
    notifications>`__.

doc/install-guide/source/environment-security.rst

@@ -74,8 +74,8 @@ during installation and operation. In some cases, services perform
 modifications to the host that can interfere with deployment automation
 tools such as Ansible, Chef, and Puppet. For example, some OpenStack
 services add a root wrapper to ``sudo`` that can interfere with security
-policies. See the `Cloud Administrator Guide <http://docs.openstack.org/
+policies. See the `Administrator Guide <http://docs.openstack.org/
-admin-guide-cloud/compute-root-wrap-reference.html>`__
+admin-guide/compute-root-wrap-reference.html>`__
 for more information.
 
 Also, the Networking service assumes default values for kernel network

doc/install-guide/source/horizon-next-steps.rst

@@ -15,11 +15,11 @@ complete the following tasks:
 
 * Customize your dashboard. See section
   `Customize the dashboard
-  <http://docs.openstack.org/admin-guide-cloud/common/dashboard_customizing.html>`__.
+  <http://docs.openstack.org/admin-guide/common/dashboard_customizing.html>`__.
 
 * Set up session storage. See
   `Set up session storage for the dashboard
-  <http://docs.openstack.org/admin-guide-cloud/dashboard_sessions.html>`__.
+  <http://docs.openstack.org/admin-guide/dashboard_sessions.html>`__.
 
 * To use the VNC client with the dashboard, the browser
   must support HTML5 Canvas and HTML5 WebSockets.

doc/networking-guide/source/adv-config-fwaas.rst

@@ -4,4 +4,4 @@ FWaaS
 
 See the following URL:
 
-http://docs.openstack.org/admin-guide-cloud/networking_introduction.html#firewall-as-a-service-fwaas-overview
+http://docs.openstack.org/admin-guide/networking_introduction.html#firewall-as-a-service-fwaas-overview

doc/networking-guide/source/adv-config-lbaas.rst

@@ -33,8 +33,8 @@ details about how LBaaS v1 works and how to configure it:
 * `Load-Balancer-as-a-Service (LBaaS) overview`_
 * `Basic Load-Balancer-as-a-Service operations`_
 
-.. _Load-Balancer-as-a-Service (LBaaS) overview: http://docs.openstack.org/admin-guide-cloud/networking_introduction.html#load-balancer-as-a-service-lbaas-overview
+.. _Load-Balancer-as-a-Service (LBaaS) overview: http://docs.openstack.org/admin-guide/networking_introduction.html#load-balancer-as-a-service-lbaas-overview
-.. _Basic Load-Balancer-as-a-Service operations: http://docs.openstack.org/admin-guide-cloud/networking_adv-features.html#basic-load-balancer-as-a-service-operations
+.. _Basic Load-Balancer-as-a-Service operations: http://docs.openstack.org/admin-guide/networking_adv-features.html#basic-load-balancer-as-a-service-operations
 
 LBaaS v2
 ~~~~~~~~

doc/networking-guide/source/adv-config-operational.rst

@@ -7,4 +7,4 @@ TBD
 Logging
 ~~~~~~~
 
-http://docs.openstack.org/admin-guide-cloud/networking_adv-operational-features.html#logging-settings
+http://docs.openstack.org/admin-guide/networking_adv-operational-features.html#logging-settings

doc/networking-guide/source/config-ml2-plug-in.rst

@@ -26,7 +26,7 @@ Tenant network types
 --------------------
 
 Similar info in:
-http://docs.openstack.org/admin-guide-cloud/networking_adv-features.html#provider-networks
+http://docs.openstack.org/admin-guide/networking_adv-features.html#provider-networks
 
 * Local
 

doc/networking-guide/source/intro-os-networking-features.rst

@@ -32,8 +32,8 @@ steps:
 #. Set up a default external network
 
    Setting up an external network is described in
-   `OpenStack Admin Cloud Guide
+   `OpenStack Administrator Guide
-   <http://docs.openstack.org/admin-guide-cloud/networking_adv-features.html>`_.
+   <http://docs.openstack.org/admin-guide/networking_adv-features.html>`_.
    Assuming the external network to be used for the auto-allocation feature
    is named ``public``, make it the default external network
    with the following command:

doc/networking-guide/source/misc-add-ha-for-dhcp.rst

@@ -7,4 +7,4 @@ FIXME (Simple note, needs to be added.)
 DHCP agents
 ~~~~~~~~~~~
 
-FIXME: Content needs to be written; see DHCP agents (http://docs.openstack.org/admin-guide-cloud/networking_multi-dhcp-agents.html)
+FIXME: Content needs to be written; see DHCP agents (http://docs.openstack.org/admin-guide/networking_multi-dhcp-agents.html)

doc/user-guide/source/cli_config_drive.rst

@@ -4,7 +4,7 @@ Store metadata on a configuration drive
 You can configure OpenStack to write metadata to a special configuration drive
 that attaches to the instance when it boots. The instance can mount this drive
 and read files from it to get information that is normally available through
-the `metadata service <http://docs.openstack.org/admin-guide-cloud/compute-networking-nova.html#metadata-service>`__.
+the `metadata service <http://docs.openstack.org/admin-guide/compute-networking-nova.html#metadata-service>`__.
 This metadata is different from the user data.
 
 One use case for using the configuration drive is to pass a networking

doc/user-guide/source/cli_create_and_manage_networks.rst

@@ -132,7 +132,7 @@ parameters:
 
 For information and examples on more advanced use of neutron's
 ``subnet`` subcommand, see the `OpenStack Administrator
-Guide <http://docs.openstack.org/admin-guide-cloud/networking_use.html#advanced-networking-operations>`__.
+Guide <http://docs.openstack.org/admin-guide/networking_use.html#advanced-networking-operations>`__.
 
 Create routers
 ~~~~~~~~~~~~~~

doc/user-guide/source/dashboard_create_networks.rst

@@ -11,7 +11,7 @@ Networking in OpenStack is complex. This section provides the basic
 instructions for creating a network and a router. For detailed
 information about managing networks, refer to the `OpenStack
 Administrator
-Guide <http://docs.openstack.org/admin-guide-cloud/networking.html>`__.
+Guide <http://docs.openstack.org/admin-guide/networking.html>`__.
 
 Create a network
 ~~~~~~~~~~~~~~~~

doc/user-guide/source/dashboard_launch_instances.rst

@@ -220,7 +220,7 @@ file.
 It is also possible to SSH into an instance without an SSH keypair, if the
 administrator has enabled root password injection.  For more information
 about root password injection, see `Injecting the administrator password
-<http://docs.openstack.org/admin-guide-cloud/compute-admin-password-injection.html>`_
+<http://docs.openstack.org/admin-guide/compute-admin-password-injection.html>`_
 in the *OpenStack Administrator Guide*.
 
 Track usage for instances