From 1b059750257535ffecc2ea9863e8c65a7ad5335d Mon Sep 17 00:00:00 2001
From: OpenStack Proposal Bot <openstack-infra@lists.openstack.org>
Date: Wed, 26 Oct 2016 09:45:21 +0000
Subject: [PATCH] Updated from openstack-manuals

Change-Id: Ic53c8caa21ea55ff2b64b620a7827dd10dd0cf27
---
 common/glossary.rst                           | 21 ++++++++++---------
 .../introduction-to-openstack.rst             |  2 +-
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/common/glossary.rst b/common/glossary.rst
index e67f7964..d44ab7d7 100644
--- a/common/glossary.rst
+++ b/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)
 
diff --git a/security-guide/source/introduction/introduction-to-openstack.rst b/security-guide/source/introduction/introduction-to-openstack.rst
index c46937e0..e0dd129d 100644
--- a/security-guide/source/introduction/introduction-to-openstack.rst
+++ b/security-guide/source/introduction/introduction-to-openstack.rst
@@ -133,7 +133,7 @@ API endpoints.
 Object Storage
 --------------
 
-The OpenStack :term:`Object Storage service` (swift) provides support for
+The OpenStack :term:`Object Storage service (swift)` provides support for
 storing and retrieving arbitrary data in the cloud. The Object Storage
 service provides both a native API and an Amazon Web Services S3 compatible
 API. The service provides a high degree of resiliency through data replication