From 7296c0b4bf9bf61fbf1329d9157d441857e1c9ef Mon Sep 17 00:00:00 2001
From: KATO Tomoyuki <kato.tomoyuki@jp.fujitsu.com>
Date: Sat, 2 Apr 2016 08:22:57 +0900
Subject: [PATCH] Update the title and URL for admin guide

Change-Id: I7675de8670043aac402cae6eeaac9c426bd7bc4b
Implements: blueprint user-guides-reorganised
---
 api-ref/src/docbkx/ch_identity-v3-ext.xml                | 2 +-
 api-ref/src/docbkx/ch_identity-v3.xml                    | 4 ++--
 api-ref/src/docbkx/ch_images-v1.xml                      | 2 +-
 api-ref/src/docbkx/ch_images-v2.xml                      | 2 +-
 api-ref/src/wadls/volume-api/src/v2/wadl/volumes-v2.wadl | 4 ++--
 firstapp/source/networking.rst                           | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/api-ref/src/docbkx/ch_identity-v3-ext.xml b/api-ref/src/docbkx/ch_identity-v3-ext.xml
index aff2c7d57..f9581abe6 100644
--- a/api-ref/src/docbkx/ch_identity-v3-ext.xml
+++ b/api-ref/src/docbkx/ch_identity-v3-ext.xml
@@ -449,7 +449,7 @@ Trust extension (OS-TRUST)
         </para>
         <para>
             For more information, see <link
-            xlink:href="http://docs.openstack.org/admin-guide-cloud/keystone_use_trusts.html">Use
+            xlink:href="http://docs.openstack.org/admin-guide/keystone_use_trusts.html">Use
             trusts</link>.
         </para>
         <wadl:resources
diff --git a/api-ref/src/docbkx/ch_identity-v3.xml b/api-ref/src/docbkx/ch_identity-v3.xml
index 4feb2588f..51fa3d0df 100644
--- a/api-ref/src/docbkx/ch_identity-v3.xml
+++ b/api-ref/src/docbkx/ch_identity-v3.xml
@@ -35,7 +35,7 @@
     </para>
     <para>
         For information about Identity API protection, see <link
-        xlink:href="http://docs.openstack.org/admin-guide-cloud/identity_service_api_protection.html">Identity
+        xlink:href="http://docs.openstack.org/admin-guide/identity_service_api_protection.html">Identity
         API protection with role-based access control (RBAC)</link> in the
         <citetitle>OpenStack Cloud Administrator Guide</citetitle>.
     </para>
@@ -455,7 +455,7 @@
         <para>
             For information about how to integrate the Identity service with
             LDAP, see <link
-            xlink:href="http://docs.openstack.org/admin-guide-cloud/keystone_integrate_with_ldap.html">Integrate Identity with LDAP</link>.
+            xlink:href="http://docs.openstack.org/admin-guide/keystone_integrate_with_ldap.html">Integrate Identity with LDAP</link>.
         </para>
         <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
             <wadl:resource href="../wadls/identity-api/src/v3/wadl/identity-admin-v3.wadl#config"/>
diff --git a/api-ref/src/docbkx/ch_images-v1.xml b/api-ref/src/docbkx/ch_images-v1.xml
index fd0b62ab5..9a4471521 100644
--- a/api-ref/src/docbkx/ch_images-v1.xml
+++ b/api-ref/src/docbkx/ch_images-v1.xml
@@ -15,7 +15,7 @@
     <para>
         Cloud providers can configure property protections that prevent non-administrative users
         from updating and deleting protected properties. For more information, see <link
-        xlink:href="http://docs.openstack.org/admin-guide-cloud/compute-images-instances.html#image-properties-and-property-protection">Image property protection</link> in the
+        xlink:href="http://docs.openstack.org/admin-guide/compute-images-instances.html#image-properties-and-property-protection">Image property protection</link> in the
         <citetitle>OpenStack Cloud Administrator Guide</citetitle>.
     </para>
     <section xml:id="versions-v1">
diff --git a/api-ref/src/docbkx/ch_images-v2.xml b/api-ref/src/docbkx/ch_images-v2.xml
index 7530795ba..8ff481034 100644
--- a/api-ref/src/docbkx/ch_images-v2.xml
+++ b/api-ref/src/docbkx/ch_images-v2.xml
@@ -13,7 +13,7 @@
         Cloud providers can configure property protections that prevent
         non-administrative users from updating and deleting protected
         properties. For more information, see <link
-        xlink:href="http://docs.openstack.org/admin-guide-cloud/compute-images-instances.html#image-properties-and-property-protection">Image
+        xlink:href="http://docs.openstack.org/admin-guide/compute-images-instances.html#image-properties-and-property-protection">Image
         property protection</link> in the <citetitle>OpenStack Cloud
         Administrator Guide</citetitle>.
     </para>
diff --git a/api-ref/src/wadls/volume-api/src/v2/wadl/volumes-v2.wadl b/api-ref/src/wadls/volume-api/src/v2/wadl/volumes-v2.wadl
index 3867a959d..191f0f1e0 100644
--- a/api-ref/src/wadls/volume-api/src/v2/wadl/volumes-v2.wadl
+++ b/api-ref/src/wadls/volume-api/src/v2/wadl/volumes-v2.wadl
@@ -920,7 +920,7 @@
             <para>
                 For information about how to use volume types to create
                 multiple-storage back ends, see <link
-                xlink:href="http://docs.openstack.org/admin-guide-cloud/blockstorage_multi_backend.html">Configure multiple-storage back ends</link>.
+                xlink:href="http://docs.openstack.org/admin-guide/blockstorage_multi_backend.html">Configure multiple-storage back ends</link>.
             </para>
         </wadl:doc>
         <request>
@@ -976,7 +976,7 @@
             <para>
                 For information about how to use volume types to create
                 multiple-storage back ends, see <link
-                xlink:href="http://docs.openstack.org/admin-guide-cloud/blockstorage_multi_backend.html">Configure multiple-storage back ends</link>.
+                xlink:href="http://docs.openstack.org/admin-guide/blockstorage_multi_backend.html">Configure multiple-storage back ends</link>.
             </para>
         </wadl:doc>
         <request>
diff --git a/firstapp/source/networking.rst b/firstapp/source/networking.rst
index 84c48bf1c..6d980d130 100644
--- a/firstapp/source/networking.rst
+++ b/firstapp/source/networking.rst
@@ -496,7 +496,7 @@ Neutron LbaaS API
 -----------------
 
 .. note:: This section is based on the Neutron LBaaS API version 1.0
-          http://docs.openstack.org/admin-guide-cloud/networking_adv-features.html#basic-load-balancer-as-a-service-operations
+          http://docs.openstack.org/admin-guide/networking_adv-features.html#basic-load-balancer-as-a-service-operations
 
 .. todo:: libcloud support added 0.14:
           https://developer.rackspace.com/blog/libcloud-0-dot-14-released/ -