From 03a0af40cdbdb6f2ed74b90532d0b72f7ba48cdf Mon Sep 17 00:00:00 2001 From: Zac Dover Date: Mon, 3 Oct 2022 22:51:35 +1000 Subject: [PATCH] doc/glossary.rst: remove duplicates This commit removes similar but distinct entries for the following: * CephFS * Ceph Client Removal of a glossary term that is referred to in the body of the documentation suite requires the alteration of the text string that refers to the glossary term. Alterations of this kind have been made to doc/architecture.rst and doc/rados/api/index.rst. Signed-off-by: Zac Dover (cherry picked from commit 0692b223540143cdb4a60b54595a7069284b5481) --- doc/architecture.rst | 4 ++-- doc/glossary.rst | 4 ++-- doc/rados/api/index.rst | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/architecture.rst b/doc/architecture.rst index 33558c0a877a..c7efe6d14c29 100644 --- a/doc/architecture.rst +++ b/doc/architecture.rst @@ -59,7 +59,7 @@ service interfaces built on top of ``librados``. Storing Data ------------ -The Ceph Storage Cluster receives data from :term:`Ceph Clients`--whether it +The Ceph Storage Cluster receives data from :term:`Ceph Client`\s--whether it comes through a :term:`Ceph Block Device`, :term:`Ceph Object Storage`, the :term:`Ceph File System` or a custom implementation you create using ``librados``-- which is stored as RADOS objects. Each object is stored on an @@ -80,7 +80,7 @@ stored in a monolithic database-like fashion. Ceph OSD Daemons store data as objects in a flat namespace (e.g., no hierarchy of directories). An object has an identifier, binary data, and metadata consisting of a set of name/value pairs. The semantics are completely -up to :term:`Ceph Clients`. For example, CephFS uses metadata to store file +up to :term:`Ceph Client`\s. For example, CephFS uses metadata to store file attributes such as the file owner, created date, last modified date, and so forth. diff --git a/doc/glossary.rst b/doc/glossary.rst index 7a96a45f967c..5519b3a2c871 100644 --- a/doc/glossary.rst +++ b/doc/glossary.rst @@ -37,12 +37,12 @@ reflect either technical terms or legacy ways of referring to Ceph systems. The collection of libraries that can be used to interact with components of the Ceph System. - Ceph Clients Ceph Cluster Map Ceph Dashboard Ceph File System + See :term:`CephFS` + CephFS - Ceph FS The POSIX filesystem components of Ceph. Refer :ref:`CephFS Architecture ` and :ref:`ceph-file-system` for more details. diff --git a/doc/rados/api/index.rst b/doc/rados/api/index.rst index 51de06d98a85..5422ce8717b5 100644 --- a/doc/rados/api/index.rst +++ b/doc/rados/api/index.rst @@ -6,7 +6,7 @@ The :term:`Ceph Storage Cluster` has a messaging layer protocol that enables clients to interact with a :term:`Ceph Monitor` and a :term:`Ceph OSD Daemon`. -``librados`` provides this functionality to :term:`Ceph Clients` in the form of +``librados`` provides this functionality to :term:`Ceph Client`\s in the form of a library. All Ceph Clients either use ``librados`` or the same functionality encapsulated in ``librados`` to interact with the object store. For example, ``librbd`` and ``libcephfs`` leverage this functionality. You may use -- 2.47.3