From 32f349b0a1492a096abffc733db5459c6cf67518 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Tue, 14 Apr 2015 16:17:58 +0200 Subject: [PATCH] Fix Image service capitalization Update capitalization for Image service, also fix a few occurences of other wrong capitalization. Change-Id: I9b5cec7726c1d6c10231ffa5eefe7a7093b631eb --- .../src/docbkx/api-quick-start-onepager.xml | 2 +- api-ref/src/docbkx/api-ref-image-v2.xml | 2 +- api-ref/src/docbkx/ch_images-v1.xml | 2 +- api-ref/src/docbkx/ch_images-v2.xml | 4 ++-- api-ref/src/docbkx/itemizedlist-service-list.xml | 4 ++-- .../compute-api/src/v2.1/wadl/os-server-actions.wadl | 10 +++++----- .../wadls/compute-api/src/v2/wadl/os-compute-2.wadl | 12 ++++++------ api-ref/src/wadls/image-api/src/v1/os-image-1.0.wadl | 4 ++-- api-ref/src/wadls/image-api/src/v2/common.ent | 2 +- api-ref/src/wadls/image-api/src/v2/os-image-v2.wadl | 10 +++++----- 10 files changed, 26 insertions(+), 26 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 74f4ef3e4..f50339bc7 100644 --- a/api-quick-start/src/docbkx/api-quick-start-onepager.xml +++ b/api-quick-start/src/docbkx/api-quick-start-onepager.xml @@ -9,7 +9,7 @@ Although you install each OpenStack service separately, the OpenStack services work together to meet your cloud needs: - Identity, Compute, Image Service, Block Storage, Networking + Identity, Compute, Image service, Block Storage, Networking (neutron), Object Storage, Orchestration, and Telemetry. With the TryStack OpenStack installation, these services diff --git a/api-ref/src/docbkx/api-ref-image-v2.xml b/api-ref/src/docbkx/api-ref-image-v2.xml index af1e5a208..d522162b7 100644 --- a/api-ref/src/docbkx/api-ref-image-v2.xml +++ b/api-ref/src/docbkx/api-ref-image-v2.xml @@ -8,7 +8,7 @@ version="5.0-extension RackBook-2.0" xml:id="api.openstack.org-image-v2" status="CURRENT"> - OpenStack Image Service API v2 (CURRENT) + OpenStack Image service API v2 (CURRENT) 2010-2015 diff --git a/api-ref/src/docbkx/ch_images-v1.xml b/api-ref/src/docbkx/ch_images-v1.xml index 80170bed8..625b1a8f4 100644 --- a/api-ref/src/docbkx/ch_images-v1.xml +++ b/api-ref/src/docbkx/ch_images-v1.xml @@ -7,7 +7,7 @@ xmlns:wadl="http://wadl.dev.java.net/2009/02" version="5.0-extension RackBook-2.0" xml:id="images-api-v1" role="api-reference"> - Image Service API v1 (SUPPORTED) + Image service API v1 (SUPPORTED) Load images for use at launch time by the Compute API. Also, assign metadata to images. Some cloud implementations do not expose this API and offer diff --git a/api-ref/src/docbkx/ch_images-v2.xml b/api-ref/src/docbkx/ch_images-v2.xml index cf07e069b..6beebe7cb 100644 --- a/api-ref/src/docbkx/ch_images-v2.xml +++ b/api-ref/src/docbkx/ch_images-v2.xml @@ -7,8 +7,8 @@ xmlns:wadl="http://wadl.dev.java.net/2009/02" version="5.0-extension RackBook-2.0" xml:id="images-api-v2" role="api-reference"> - Image Service API v2 (CURRENT) - Image Service API v2.0, API v2.1, and API v2.2. + Image service API v2 (CURRENT) + Image service API v2.0, API v2.1, and API v2.2. Cloud providers can configure property protections that prevent non-administrative users from updating and deleting protected properties. For more information, see - Image Service + Image service API v2 (CURRENT) - Image Service + Image service API v1 (SUPPORTED) diff --git a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-server-actions.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-server-actions.wadl index 559a6b10f..e0cad5af1 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-server-actions.wadl +++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-server-actions.wadl @@ -221,7 +221,7 @@ succeeded. A successfully creating image operation shows an image's status of available and the serve's status goes back to the original status. You can also see the - new image in the image backend that OpenStack Image Service + new image in the image backend that OpenStack Image service manages. Preconditions @@ -230,7 +230,7 @@ You can only create a new image from the server when its status is ACTIVE, SHUTOFF, PAUSED, or SUSPENDED. - The connection to the Image Service is valid. + The connection to the Image service is valid. Troubleshooting @@ -247,10 +247,10 @@ again, investigate the compute backend or ask your cloud provider. If the request fails due to an error on OpenStack - Compute Service, the image is purged from the image store that - OpenStack Image Service manages. Ensure you meet the preconditions + Compute service, the image is purged from the image store that + OpenStack Image service manages. Ensure you meet the preconditions and run the request again. If the request fails again, investigate - OpenStack Compute Service or ask your cloud provider. + OpenStack Compute service or ask your cloud provider. diff --git a/api-ref/src/wadls/compute-api/src/v2/wadl/os-compute-2.wadl b/api-ref/src/wadls/compute-api/src/v2/wadl/os-compute-2.wadl index 1244706c2..13bbbd706 100644 --- a/api-ref/src/wadls/compute-api/src/v2/wadl/os-compute-2.wadl +++ b/api-ref/src/wadls/compute-api/src/v2/wadl/os-compute-2.wadl @@ -365,7 +365,7 @@ The user must have enough server quota remaining to create the number of servers requested. - The connection to the Image Service is + The connection to the Image service is valid. Asynchronous Postconditions @@ -987,14 +987,14 @@ shows an image's status of available and the serve's status goes back to the original status. You can also see the new image in the image backend that OpenStack - Image Service manages. + Image service manages. Preconditions The specified server must exist. You can only create a new image from the server when its status is ACTIVE, SHUTOFF, PAUSED, or SUSPENDED. - The connection to the Image Service is valid. + The connection to the Image service is valid. Troubleshooting @@ -1010,10 +1010,10 @@ again, investigate the compute backend or ask your cloud provider. If the request fails due to an error on OpenStack - Compute Service, the image is purged from the image store that - OpenStack Image Service manages. Ensure you meet the preconditions + Compute service, the image is purged from the image store that + OpenStack Image service manages. Ensure you meet the preconditions and run the request again. If the request fails again, investigate - OpenStack Compute Service or ask your cloud provider. + OpenStack Compute service or ask your cloud provider. diff --git a/api-ref/src/wadls/image-api/src/v1/os-image-1.0.wadl b/api-ref/src/wadls/image-api/src/v1/os-image-1.0.wadl index 82108d644..ca62310d5 100644 --- a/api-ref/src/wadls/image-api/src/v1/os-image-1.0.wadl +++ b/api-ref/src/wadls/image-api/src/v1/os-image-1.0.wadl @@ -132,7 +132,7 @@ xmlns:wadl="http://wadl.dev.java.net/2009/02" xml:lang="EN" title="List API versions">Lists information about all Image - Service API versions. + service API versions. @@ -150,7 +150,7 @@ xmlns:wadl="http://wadl.dev.java.net/2009/02" xml:lang="EN" title="Show API v1 details"> - Shows details for Image Service API + Shows details for Image service API v1. diff --git a/api-ref/src/wadls/image-api/src/v2/common.ent b/api-ref/src/wadls/image-api/src/v2/common.ent index 5b29894d4..8bfa15b5a 100644 --- a/api-ref/src/wadls/image-api/src/v2/common.ent +++ b/api-ref/src/wadls/image-api/src/v2/common.ent @@ -258,7 +258,7 @@ style="plain" required="true" type="xsd:string"> - Hash of the image data used. The Image Service uses this value for + Hash of the image data used. The Image service uses this value for verification. If this field has no value, its value is None. diff --git a/api-ref/src/wadls/image-api/src/v2/os-image-v2.wadl b/api-ref/src/wadls/image-api/src/v2/os-image-v2.wadl index 7c71a9576..c19f8d6f7 100644 --- a/api-ref/src/wadls/image-api/src/v2/os-image-v2.wadl +++ b/api-ref/src/wadls/image-api/src/v2/os-image-v2.wadl @@ -82,7 +82,7 @@ Lists information about all Image - Service API versions. + service API versions. @@ -202,7 +202,7 @@ xmlns:wadl="http://wadl.dev.java.net/2009/02" xml:lang="EN">Name for the image. The name of an image is not unique to a Image - Service node. The API cannot expect users + service node. The API cannot expect users to know the names of images owned by others. @@ -414,7 +414,7 @@ The image is deleted in images index. The binary image data managed by OpenStack - Image Service is deleted from the storage node if the + Image service is deleted from the storage node if the deleted image stores image data in the node. TroubleShooting @@ -459,7 +459,7 @@ The user must have enough image strage quota remaining to store the data. Size of the data must be less than OpenStack - Image Service restricts. + Image service restricts. Synchronous Postconditions @@ -467,7 +467,7 @@ image status as active through API calls. With correct access, you can see the stored - data in the storage system that OpenStack Image Service + data in the storage system that OpenStack Image service manages. Troubleshooting