doc/glossary: collate "releases" entries

Collect the "Releases"-related entries together under the "Releases"
headword, in order to give readers a sense at a glance of how the
different kinds of releases relate to one another.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
(cherry picked from commit 39377f7db114b344727249792de2f5d98b72c1d7)

diff --git a/doc/glossary.rst b/doc/glossary.rst
index 32c8484a199e9ed20e6bdd323f686f18a3dc235b..d36bf4009cce7e71ab85271745a6c369c38b155f 100644 (file)
--- a/doc/glossary.rst
+++ b/doc/glossary.rst
@@ -67,8 +67,7 @@
                 <arch-cephfs>` for more details.
 
        Ceph Interim Release
-                A version of Ceph that has not yet been put through quality
-                assurance testing. May contain new features.
+                See :term:`Releases`.
 
        Ceph Kernel Modules
                 The collection of kernel modules that can be used to interact
@@ -144,24 +143,20 @@
                 `https://github.com/ceph`_.
 
        Ceph Point Release
-                Any ad hoc release that includes only bug fixes and security
-                fixes.
+                See :term:`Releases`.
 
        Ceph Project
                 The aggregate term for the people, software, mission and
                 infrastructure of Ceph.
 
        Ceph Release
-               Any distinct numbered version of Ceph.
+                See :term:`Releases`.
 
        Ceph Release Candidate
-                A major version of Ceph that has undergone initial quality
-                assurance testing and is ready for beta testers.
+                See :term:`Releases`.
 
        Ceph Stable Release
-                A major version of Ceph where all features from the preceding
-                interim releases have been put through quality assurance
-                testing successfully.
+                See :term:`Releases`.
 
        Ceph Stack
                A collection of two or more components of Ceph.
@@ -309,6 +304,29 @@
                 The block storage component of Ceph. Also called "RADOS Block
                 Device" or :term:`Ceph Block Device`.
 
+        Releases
+
+               Ceph Interim Release
+                        A version of Ceph that has not yet been put through
+                        quality assurance testing. May contain new features.
+
+                Ceph Point Release
+                        Any ad hoc release that includes only bug fixes and
+                        security fixes.
+
+                Ceph Release
+                        Any distinct numbered version of Ceph.
+
+                Ceph Release Candidate
+                        A major version of Ceph that has undergone initial
+                        quality assurance testing and is ready for beta
+                        testers.
+
+                Ceph Stable Release
+                        A major version of Ceph where all features from the
+                        preceding interim releases have been put through
+                        quality assurance testing successfully.
+
        Reliable Autonomic Distributed Object Store
                 The core set of storage software which stores the user's data
                 (MON+OSD). See also :term:`RADOS`.