From fbf8d2c90dab4376c4dc9d33d7e6f20bf86771f1 Mon Sep 17 00:00:00 2001 From: venkatamahesh Date: Thu, 14 Jan 2016 18:50:32 +0530 Subject: [PATCH] Typo Change Identity/Image Service to Identity/Image service Change-Id: Id002b613191aa6b04d0c4527abc7bbc6abd135da --- .../source/compute-manage-the-cloud.rst | 2 +- .../source/compute/hypervisor-vmware.rst | 4 ++-- .../source/debconf/debconf-api-endpoints.rst | 2 +- doc/install-guide/source/index.rst | 23 ++++++++++--------- .../source/scenario-provider-lb.rst | 2 +- .../source/scenario-provider-ovs.rst | 2 +- 6 files changed, 18 insertions(+), 17 deletions(-) diff --git a/doc/admin-guide-cloud/source/compute-manage-the-cloud.rst b/doc/admin-guide-cloud/source/compute-manage-the-cloud.rst index 99def56282..28184a1d5c 100644 --- a/doc/admin-guide-cloud/source/compute-manage-the-cloud.rst +++ b/doc/admin-guide-cloud/source/compute-manage-the-cloud.rst @@ -14,7 +14,7 @@ commands to manage their clouds. ``nova`` client and ``euca2ools`` can be used by all users, though specific commands might be restricted by Role Based Access Control in -the Identity Service. +the Identity service. **Managing the cloud with nova client** diff --git a/doc/config-reference/source/compute/hypervisor-vmware.rst b/doc/config-reference/source/compute/hypervisor-vmware.rst index 784f9b1db2..a8176ece0f 100644 --- a/doc/config-reference/source/compute/hypervisor-vmware.rst +++ b/doc/config-reference/source/compute/hypervisor-vmware.rst @@ -69,7 +69,7 @@ high-level steps: #. Configure vCenter. See :ref:`vmware-prereqs`. #. Configure the VMware vCenter driver in the ``nova.conf`` file. See :ref:`vmware-vcdriver`. -#. Load desired VMDK images into the Image Service. See :ref:`vmware-images`. +#. Load desired VMDK images into the Image service. See :ref:`vmware-images`. #. Configure networking with either ``nova-network`` or the Networking service. See :ref:`vmware-networking`. @@ -861,7 +861,7 @@ In the previous cases, the converted vmdk is actually a pair of files: * The descriptor file ``converted.vmdk``. * The actual virtual disk data file ``converted-flat.vmdk``. -The file to be uploaded to the Image Service is ``converted-flat.vmdk``. +The file to be uploaded to the Image service is ``converted-flat.vmdk``. Image handling -------------- diff --git a/doc/install-guide/source/debconf/debconf-api-endpoints.rst b/doc/install-guide/source/debconf/debconf-api-endpoints.rst index 5222c608e4..9ffc1b8f45 100644 --- a/doc/install-guide/source/debconf/debconf-api-endpoints.rst +++ b/doc/install-guide/source/debconf/debconf-api-endpoints.rst @@ -31,7 +31,7 @@ This screen registers packages in the Identity service catalog: | You are prompted for the Identity service ``admin_token`` value. The -Identity Service uses this value to register the API service. When you +Identity service uses this value to register the API service. When you set up the ``keystone`` package, this value is configured automatically. .. image:: ../figures/debconf-screenshots/api-endpoint_3_keystone_authtoken.png diff --git a/doc/install-guide/source/index.rst b/doc/install-guide/source/index.rst index 1a6d20c8b8..ba15c1d406 100644 --- a/doc/install-guide/source/index.rst +++ b/doc/install-guide/source/index.rst @@ -30,27 +30,28 @@ Abstract ~~~~~~~~ -The OpenStack system consists of several key projects that you install -separately. These projects work together depending on your cloud -needs. These projects include Compute, Identity Service, Networking, -Image Service, Block Storage, Object Storage, Telemetry, -Orchestration, and Database. You can install any of these projects -separately and configure them stand-alone or as connected entities. +The OpenStack system consists of several key services that are separately +installed. These services work together depending on your cloud +needs. These services include Compute service, Identity service, +Networking service, Image service, Block Storage service, Object Storage +service, Telemetry service, Orchestration service, and Database service. You +can install any of these projects separately and configure them stand-alone +or as connected entities. .. only:: rdo - This guide shows you how to install OpenStack by using packages + This guide will show you how to install OpenStack by using packages available on Red Hat Enterprise Linux 7 and its derivatives through the EPEL repository. .. only:: ubuntu - This guide walks through an installation by using packages + This guide will walk through an installation by using packages available through Canonical's Ubuntu Cloud archive repository. .. only:: obs - This guide shows you how to install OpenStack by using packages on + This guide will show you how to install OpenStack by using packages on openSUSE 13.2 and SUSE Linux Enterprise Server 12 through the Open Build Service Cloud repository. @@ -66,9 +67,9 @@ This guide documents OpenStack Liberty release. .. warning:: - This guide is a work-in-progress and is subject to frequent updates. + This guide is a work-in-progress and is subject to updates frequently. Pre-release packages have been used for testing, and some instructions - might not work with final versions. Please help us make this guide better + may not work with final versions. Please help us make this guide better by reporting any errors you encounter. Contents diff --git a/doc/networking-guide/source/scenario-provider-lb.rst b/doc/networking-guide/source/scenario-provider-lb.rst index 23ce94227e..ae5ca2a67e 100644 --- a/doc/networking-guide/source/scenario-provider-lb.rst +++ b/doc/networking-guide/source/scenario-provider-lb.rst @@ -620,7 +620,7 @@ Verify network operation .. note:: - This example uses a CirrOS image that was manually uploaded into the Image Service + This example uses a CirrOS image that was manually uploaded into the Image service .. code-block:: console diff --git a/doc/networking-guide/source/scenario-provider-ovs.rst b/doc/networking-guide/source/scenario-provider-ovs.rst index 599d042f98..d72169a977 100644 --- a/doc/networking-guide/source/scenario-provider-ovs.rst +++ b/doc/networking-guide/source/scenario-provider-ovs.rst @@ -683,7 +683,7 @@ Verify network operation .. note:: - This example uses a CirrOS image that was manually uploaded into the Image Service + This example uses a CirrOS image that was manually uploaded into the Image service .. code-block:: console