summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Wilkins <john.wilkins@inktank.com>2013-05-30 20:27:01 -0700
committerJohn Wilkins <john.wilkins@inktank.com>2013-05-30 20:27:01 -0700
commit7365d0c36d0b7927025ec8d46c7036229c88398e (patch)
tree864c363e3be481c54a7ca761bccf34c3cbdf3011
parenteb35d739ae85129148737c9537af038f0b6ac615 (diff)
downloadceph-7365d0c36d0b7927025ec8d46c7036229c88398e.tar.gz
doc: Updated to reflect glossary usage.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
-rw-r--r--doc/radosgw/index.rst31
1 files changed, 16 insertions, 15 deletions
diff --git a/doc/radosgw/index.rst b/doc/radosgw/index.rst
index e90d690cb19..9251b2411e2 100644
--- a/doc/radosgw/index.rst
+++ b/doc/radosgw/index.rst
@@ -1,23 +1,24 @@
-===============
- RADOS Gateway
-===============
+=====================
+ Ceph Object Storage
+=====================
-RADOS Gateway is an object storage interface built on top of ``librados`` to
-provide applications with a RESTful gateway to RADOS clusters. The RADOS Gateway
-supports two interfaces:
+:term:`Ceph Object Storage` 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:
-#. **S3-compatible:** Provides block storage functionality with an interface that
- is compatible with a large subset of the Amazon S3 RESTful API.
+#. **S3-compatible:** Provides object storage functionality with an interface
+ that is compatible with a large subset of the Amazon S3 RESTful API.
-#. **Swift-compatible:** Provides block storage functionality with an interface
+#. **Swift-compatible:** Provides object storage functionality with an interface
that is compatible with a large subset of the OpenStack Swift API.
-RADOS Gateway is a FastCGI module for interacting with ``librados``. Since it
+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 RADOS
-cluster used to store data from Ceph FS clients or RADOS block devices.
-The S3 and Swift APIs share a common namespace, so you may write data with
-one API and retrieve it with the other.
+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.
.. ditaa:: +------------------------+ +------------------------+
| S3 compatible API | | Swift compatible API |
@@ -29,7 +30,7 @@ one API and retrieve it with the other.
| OSDs | | Monitors |
+------------------------+ +------------------------+
-.. note:: RADOS Gateway does **NOT** use the CephFS metadata server.
+.. note:: Ceph Object Storage does **NOT** use the Ceph Metadata Server.
.. toctree::