From: John Wilkins <john.wilkins@inktank.com>
Date: Mon, 5 Aug 2013 20:44:20 +0000 (-0700)
Subject: doc: Nomenclature update.
X-Git-Tag: v0.68~109
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0f56e3ebb55b0ae816cac27293c17a4cb0d64f28;p=ceph.git

doc: Nomenclature update.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
---

diff --git a/doc/radosgw/index.rst b/doc/radosgw/index.rst
index 9251b2411e2d..9f6274c23260 100644
--- a/doc/radosgw/index.rst
+++ b/doc/radosgw/index.rst
@@ -1,10 +1,10 @@
 =====================
- Ceph Object Storage
+ Ceph Object Gateway
 =====================
 
-:term:`Ceph Object Storage` is an object storage interface built on top of
+:term:`Ceph Object Gateway` is an object storage interface built on top of
 ``librgw`` and ``librados`` to provide applications with a RESTful gateway to
-Ceph Storage Clusters. Ceph Object Storage supports two interfaces:
+Ceph Storage Clusters. :term:`Ceph Object Storage` supports two interfaces:
 
 #. **S3-compatible:** Provides object storage functionality with an interface 
    that is compatible with a large subset of the Amazon S3 RESTful API.
@@ -12,13 +12,13 @@ Ceph Storage Clusters. Ceph Object Storage supports two interfaces:
 #. **Swift-compatible:** Provides object storage functionality with an interface
    that is compatible with a large subset of the OpenStack Swift API.
    
-Ceph Object Storage uses the RADOS Gateway daemon (``radosgw``), which is a
-FastCGI module for interacting with ``librgw`` and ``librados``. Since it
-provides interfaces compatible with OpenStack Swift and Amazon S3, RADOS Gateway
-has its own user management. RADOS Gateway can store data in the same Ceph
-Storage Cluster used to store data from Ceph Filesystem clients or Ceph Block
-Device clients. The S3 and Swift APIs share a common namespace, so you may write
-data with  one API and retrieve it with the other. 
+Ceph Object Storage uses the Ceph Object Gateway daemon (``radosgw``), which is
+a FastCGI module for interacting with ``librgw`` and ``librados``. Since it
+provides interfaces compatible with OpenStack Swift and Amazon S3, the Ceph
+Object Gateway has its own user management. Ceph Object Gateway can store data
+in the same Ceph Storage Cluster used to store data from Ceph Filesystem clients
+or Ceph Block Device clients. The S3 and Swift APIs share a common namespace, so
+you may write data with one API and retrieve it with the other. 
 
 .. ditaa::  +------------------------+ +------------------------+
             |   S3 compatible API    | |  Swift compatible API  |