From 468f12152f666a04fe35694201d392e354dac2bb Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Sun, 23 Aug 2015 10:20:06 +0200 Subject: [PATCH] Fix URLs after RST conversion Adjust URLs so that they point to the new location of the RST based Cloud Administrators Guide, End User Guide, and Admin User Guide. Change-Id: Ie83f9b0324a1ae527eaa01787372b0745bde77f8 --- api-quick-start/src/docbkx/api-quick-start-onepager.xml | 2 +- api-quick-start/src/docbkx/cli-uses.xml | 4 ++-- api-ref/src/docbkx/ch_identity-v3-ext.xml | 2 +- api-ref/src/docbkx/ch_identity-v3.xml | 2 +- api-ref/src/docbkx/ch_images-v1.xml | 2 +- api-ref/src/docbkx/ch_images-v2.xml | 2 +- api-ref/src/wadls/compute-api/src/v2/common.ent | 2 +- firstapp/source/networking.rst | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/api-quick-start/src/docbkx/api-quick-start-onepager.xml b/api-quick-start/src/docbkx/api-quick-start-onepager.xml index f50339bc7..787c71004 100644 --- a/api-quick-start/src/docbkx/api-quick-start-onepager.xml +++ b/api-quick-start/src/docbkx/api-quick-start-onepager.xml @@ -56,7 +56,7 @@ making REST calls directly. All OpenStack command-line tools are implemented by using the Python SDK. See OpenStack Python SDK in the OpenStack End User Guide. diff --git a/api-quick-start/src/docbkx/cli-uses.xml b/api-quick-start/src/docbkx/cli-uses.xml index 01e5d6091..ae315e645 100644 --- a/api-quick-start/src/docbkx/cli-uses.xml +++ b/api-quick-start/src/docbkx/cli-uses.xml @@ -41,12 +41,12 @@ For complete information about the OpenStack clients, including how to source the openrc file, see OpenStack End User Guide, OpenStack Admin User diff --git a/api-ref/src/docbkx/ch_identity-v3-ext.xml b/api-ref/src/docbkx/ch_identity-v3-ext.xml index 429282918..7832b12df 100644 --- a/api-ref/src/docbkx/ch_identity-v3-ext.xml +++ b/api-ref/src/docbkx/ch_identity-v3-ext.xml @@ -352,7 +352,7 @@ Trust extension (OS-TRUST) For more information, see Use trusts. + xlink:href="http://docs.openstack.org/admin-guide-cloud/keystone_use_trusts.html">Use trusts. keystone.conf, sets the name and location of this policy file. For information about Identity API - protection, see Identity API protection with role-based access control + protection, see Identity API protection with role-based access control (RBAC) in the OpenStack Cloud Administrator Guide.
diff --git a/api-ref/src/docbkx/ch_images-v1.xml b/api-ref/src/docbkx/ch_images-v1.xml index 2073ea9cb..fc2880dfe 100644 --- a/api-ref/src/docbkx/ch_images-v1.xml +++ b/api-ref/src/docbkx/ch_images-v1.xml @@ -15,7 +15,7 @@ Cloud providers can configure property protections that prevent non-administrative users from updating and deleting protected properties. For more information, see Image property protection in the OpenStack Cloud Administrator Guide. diff --git a/api-ref/src/docbkx/ch_images-v2.xml b/api-ref/src/docbkx/ch_images-v2.xml index ddb8a67ad..b7d7b3d4d 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 Image property + xlink:href="http://docs.openstack.org/admin-guide-cloud/compute-images-instances.html#image-properties-and-property-protection">Image property protection in the OpenStack Cloud Administrator Guide. diff --git a/api-ref/src/wadls/compute-api/src/v2/common.ent b/api-ref/src/wadls/compute-api/src/v2/common.ent index bad112208..7e6c0ab9d 100644 --- a/api-ref/src/wadls/compute-api/src/v2/common.ent +++ b/api-ref/src/wadls/compute-api/src/v2/common.ent @@ -1856,7 +1856,7 @@ These IPs must be allocated from the central pool before they can be used. To allocate a floating IP to a project, see Associate floating IP + xlink:href="http://docs.openstack.org/user-guide/cli_manage_ip_addresses.html#associate-floating-ip-addresses">Associate floating IP addresses. diff --git a/firstapp/source/networking.rst b/firstapp/source/networking.rst index b30d58c93..f2d714aa1 100644 --- a/firstapp/source/networking.rst +++ b/firstapp/source/networking.rst @@ -494,7 +494,7 @@ Neutron LbaaS API ----------------- .. note:: This section is based on the Neutron LBaaS API version 1.0 - http://docs.openstack.org/admin-guide-cloud/content/lbaas_workflow.html + http://docs.openstack.org/admin-guide-cloud/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/ -