Update the title and URL for admin guide

Change-Id: I5f61abc31a350635ff278b1fe29b1e7290c01f1a
Implements: blueprint user-guides-reorganised

security-guide/source/block-storage/volume_wiping.rst

@@ -20,8 +20,8 @@ patterns.
 For more information about the ``lvm_type`` parameter, see the `Configuration
 Reference
 <http://docs.openstack.org/liberty/config-reference/content/lvm-volume-driver.html>__`
-and the `Cloud Administration Guide
-<http://docs.openstack.org/admin-guide-cloud/blockstorage_over_subscription.html>__`.
+and the `Administrator Guide
+<http://docs.openstack.org/admin-guide/blockstorage_over_subscription.html>__`.
 
 For more information about the ``volume_clear`` parameter, see the `OpenStack
 Configuration Reference

security-guide/source/compute/how-to-select-virtual-consoles.rst

@@ -86,6 +86,6 @@ Bibliography
 ------------
 
 #. OpenStack Admin Guide. SPICE Console. `SPICE Console
-   <http://docs.openstack.org/admin-guide-cloud/compute-remote-console-access.html>`__.
+   <http://docs.openstack.org/admin-guide/compute-remote-console-access.html>`__.
 #. bugzilla.redhat.com, Bug 913607 - RFE: Support Tunnelling SPICE over
    websockets. 2013. `RedHat bug 913607 <https://bugzilla.redhat.com/show_bug.cgi?id=913607>`_.

security-guide/source/databases.rst

@@ -6,8 +6,8 @@ The choice of database server is an important consideration in the
 security of an OpenStack deployment. Multiple factors should be
 considered when deciding on a database server, however for the scope of
 this book only security considerations will be discussed. OpenStack
-supports a variety of database types (see `OpenStack Cloud Administrator
-Guide <http://docs.openstack.org/admin-guide-cloud>`__ for more
+supports a variety of database types (see `OpenStack Administrator
+Guide <http://docs.openstack.org/admin-guide/>`__ for more
 information). The Security Guide currently focuses on PostgreSQL and
 MySQL.
 

security-guide/source/identity/authorization.rst

@@ -32,8 +32,8 @@ Service authorization
 ~~~~~~~~~~~~~~~~~~~~~
 
 Cloud administrators must define a user with the role of admin for each
-service, as described in the `OpenStack Cloud Administrator
-Guide <http://docs.openstack.org/admin-guide-cloud/index.html>`__.
+service, as described in the `OpenStack Administrator
+Guide <http://docs.openstack.org/admin-guide/index.html>`__.
 This service account provides the service with the authorization to
 authenticate users.
 

security-guide/source/networking/architecture.rst

@@ -86,5 +86,5 @@ API network
    allocation ranges to use only less than the full range of IP addresses in an
    IP block. This network is considered the Public Security Domain.
 
-For additional information see the `OpenStack Cloud Administrator Guide
-<http://docs.openstack.org/admin-guide-cloud/networking.html>`__.
+For additional information see the `OpenStack Administrator Guide
+<http://docs.openstack.org/admin-guide/networking.html>`__.

security-guide/source/networking/services-security-best-practices.rst

@@ -26,8 +26,8 @@ operators should carefully evaluate their policy towards user and tenant
 access to administration of network resources. For a more detailed
 explanation of OpenStack Networking policy definition, please refer to
 the `Authentication and authorization
-section <http://docs.openstack.org/admin-guide-cloud/networking_auth.html>`__
-in the OpenStack Cloud Administrator Guide.
+section <http://docs.openstack.org/admin-guide/networking_auth.html>`__
+in the OpenStack Administrator Guide.
 
 .. note::
 

security-guide/source/networking/services.rst

@@ -162,8 +162,7 @@ is currently provided by security groups. Both Freescale and Intel
 developed third-party plug-ins as extensions in OpenStack Networking to
 support this component in the Kilo release. Documentation for
 administration of FWaaS is located at
-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
 
 During the design of an OpenStack Networking infrastructure it is
 important that you understand the current features and limitations of

security-guide/source/shared-file-systems/intro.rst

@@ -20,8 +20,8 @@ Using SQL, the Shared File Systems service is similar to other OpenStack
 services and can be used with any OpenStack deployment. For more details on
 the API, see the `OpenStack Shared File Systems API <http://developer.
 openstack.org/api-ref-share-v2.html>`_ description. For mode details of the CLI
-using and configuring, see `Shared File Systems Cloud Administrative Guide
-<http://docs.openstack.org/admin-guide-cloud/shared_file_systems.html>`_.
+using and configuring, see `Shared File Systems Administrator Guide
+<http://docs.openstack.org/admin-guide/shared_file_systems.html>`_.
 
 Below is an explanation of the different components.
 

security-guide/source/shared-file-systems/network-and-security-models.rst

@@ -57,10 +57,11 @@ option, that defines the driver mode for share storage life cycle management:
 This is the share types which have the extra specifications that help scheduler
 to filter back ends and choose the appropriate back end for the user that
 requested to create a share. For details of managing the share types and
-configuration the back ends, see `Share types <http://docs.openstack.org/admin-
-guide-cloud/shared_file_systems_share_types.html>`_ and `Multi-storage
-configuration <http://docs.openstack.org/admin-guide-cloud/shared_file_systems_
-multi_backend.html>`_ documentation.
+configuration the back ends, see `Share types
+<http://docs.openstack.org/admin-guide/shared_file_systems_share_types.html>`_
+and `Multi-storage configuration
+<http://docs.openstack.org/admin-guide/shared_file_systems_multi_backend.html>`_
+documentation.
 
 No share servers mode
    In this mode, drivers have basically no network requirements whatsoever.
@@ -209,6 +210,7 @@ flat networks or VLAN-segmented networks of the Legacy networking
 (nova-network) service, or you can use the plug-in for specifying networks
 independently from OpenStack networking services. For more information of how
 to use different network plug-ins, see `Shared File Systems service Network
-plug-ins <http://docs.openstack.org/admin-guide-cloud/shared_file_systems_
-network_plugins.html#network-plug-ins>`_. The security in using different
+plug-ins
+<http://docs.openstack.org/admin-guide/shared_file_systems_network_plugins.html#network-plug-ins>`_.
+The security in using different
 network plug-ins depends on the specific network configuration.

security-guide/source/shared-file-systems/share-type-acl.rst

@@ -13,8 +13,9 @@ specifications that give them meaning inside the Shared File Systems service.
 Tenants can list the share types and can use them to create new shares. For
 details of managing the share types, see `Shared File Systems API
 <http://developer.openstack.org/api-ref-share-v2.html#share-type>`_ and
-`Share types managing <http://docs.openstack.org/admin-guide-cloud/
-shared_file_systems_share_types.html>`_ documentation.
+`Share types managing
+<http://docs.openstack.org/admin-guide/shared_file_systems_share_types.html>`_
+documentation.
 
 The shares types can be created as *public* and *private*. This is the level of
 visibility for the share type that defines whether other tenants can or cannot