Merge "[glossary] Consolidate project codenames [swift]"

doc/arch-design/source/generalpurpose-technical-considerations.rst

@@ -356,8 +356,8 @@ OpenStack core services recommended in a general purpose cloud are:
 
 * :term:`Telemetry service (telemetry)`
 
-A general purpose cloud may also include :term:`Object Storage service`
-(:term:`swift`). :term:`Block Storage service (cinder)`.
+A general purpose cloud may also include :term:`Object Storage service
+(swift)`. :term:`Block Storage service (cinder)`.
 These may be selected to provide storage to applications and instances.
 
 Supplemental software

doc/common/glossary.rst

@@ -2651,15 +2651,15 @@ O
       An Object Storage component that is responsible for managing
       objects.
 
-   Object Storage service
+   Object Storage service (swift)
 
       The OpenStack core project that provides eventually consistent
-      and redundant storage and retrieval of fixed digital content. The
-      project name of OpenStack Object Storage is swift.
+      and redundant storage and retrieval of fixed digital content.
 
    Object Storage API
 
-      API used to access OpenStack Object Storage.
+      API used to access OpenStack :term:`Object Storage<Object Storage
+      service (swift)>`.
 
    Object Storage Device (OSD)
 
@@ -2667,8 +2667,9 @@ O
 
    object versioning
 
-      Allows a user to set a flag on an Object Storage container so
-      that all objects within the container are versioned.
+      Allows a user to set a flag on an :term:`Object Storage<Object Storage
+      service (swift)>` container so that all objects within the container are
+      versioned.
 
    Ocata
 
@@ -2682,8 +2683,8 @@ O
 
    Oldie
 
-      Term for an Object Storage process that runs for a long time.
-      Can indicate a hung process.
+      Term for an :term:`Object Storage<Object Storage service (swift)>`
+      process that runs for a long time.  Can indicate a hung process.
 
    Open Cloud Computing Interface (OCCI)
 
@@ -3633,8 +3634,8 @@ S
 
    swift
 
-      An OpenStack core project that provides object storage
-      services.
+      Codename for OpenStack :term:`Object Storage service<Object
+      Storage service (swift)>`.
 
    swift All in One (SAIO)
 

doc/ops-guide/source/arch-example-nova-network.rst

@@ -92,10 +92,11 @@ those deviations next.
        little or no service interruption, you would enable live migration,
        but it is considered optional.
 
-    -  :term:`Object storage <Object Storage service>`: You may choose to
-       store machine images on a file system rather than in object storage
-       if you do not have the extra hardware for the required replication
-       and redundancy that OpenStack Object Storage offers.
+    -  :term:`Object storage <Object Storage service (swift)>`: You may
+       choose to store machine images on a file system rather than in
+       object storage if you do not have the extra hardware for the
+       required replication and redundancy that OpenStack Object Storage
+       offers.
 
 Rationale
 ~~~~~~~~~

doc/ops-guide/source/ops-maintenance-controller.rst

@@ -54,8 +54,8 @@ confident that those services are in working condition:
    # nova list
    # openstack project list
 
-For the storage proxy, ensure that the :term:`Object Storage service` has
-resumed:
+For the storage proxy, ensure that the :term:`Object Storage service <Object
+Storage service (swift)>` has resumed:
 
 .. code-block:: console