doc/releases: add major headings for releases

This cleans up the index on the left so that the release name/series
is listed instead of a zillion point releases.

Also, drop the separate page for archived releases, so that the
left-hand index behaves well.

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/doc/releases/archived-index.rst b/doc/releases/archived-index.rst
deleted file mode 100644 (file)
index 15eeed8..0000000
--- a/doc/releases/archived-index.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-=================
-Archived Releases
-=================
-
-.. toctree::
-   :maxdepth: 1
-
-   Mimic <mimic>
-   Luminous <luminous>
-   Kraken <kraken>
-   Jewel <jewel>
-   Infernalis <infernalis>
-   Hammer <hammer>
-   Giant <giant>
-   Firefly <firefly>
-   Emperor <emperor>
-   Dumpling <dumpling>
-   Cuttlefish <cuttlefish>
-   Bobtail <bobtail>
-   Argonaut <argonaut>

diff --git a/doc/releases/argonaut.rst b/doc/releases/argonaut.rst
index 4c2806244ea3f3b99f98767e935fadcf779a9555..409d1af91336132b0a5ca1375c60d5d5e0aa6d14 100644 (file)
--- a/doc/releases/argonaut.rst
+++ b/doc/releases/argonaut.rst
@@ -1,3 +1,11 @@
+========
+Argonaut
+========
+
+Argonaut is the first stable release of Ceph.  It is named after a
+genus of octopuses, sometimes also referred to as paper nautiluses.
+
+
 v0.48.3 "argonaut"
 ==================
 

diff --git a/doc/releases/bobtail.rst b/doc/releases/bobtail.rst
index d6e0b0e36278f50e5cbb32b84e22a44512623602..a6695bf7726ec1886cc257f4b288938cdd65334a 100644 (file)
--- a/doc/releases/bobtail.rst
+++ b/doc/releases/bobtail.rst
@@ -1,3 +1,10 @@
+=======
+Bobtail
+=======
+
+Bobtail is the second stable release of Ceph.  It is named after the
+bobtail squid (order Sepiolida), a group of cephalopods closely related to cuttlefish.
+
 v0.56.7 "bobtail"
 =================
 

diff --git a/doc/releases/cuttlefish.rst b/doc/releases/cuttlefish.rst
index ac0597183a91a4190b8922fd1d3c00d3e927ac7d..3e522fd3f0d2ca9676ade120f1b9534942aae7cb 100644 (file)
--- a/doc/releases/cuttlefish.rst
+++ b/doc/releases/cuttlefish.rst
@@ -1,3 +1,11 @@
+==========
+Cuttlefish
+==========
+
+Cuttlefish is the 3rd stable release of Ceph. It is named after a type
+of cephalopod (order Sepiida) characterized by a unique internal shell, the
+cuttlebone, which is used for control of bouyancy.
+
 v0.61.9 "Cuttlefish"
 ====================
 

diff --git a/doc/releases/dumpling.rst b/doc/releases/dumpling.rst
index 32febd677810ea3d7cfbf9b857312e84734ab5ef..95e99884992f70d3c56fa7f301f80b3037cb8edf 100644 (file)
--- a/doc/releases/dumpling.rst
+++ b/doc/releases/dumpling.rst
@@ -1,3 +1,10 @@
+========
+Dumpling
+========
+
+Dumpling is the 4th stable release of Ceph.  It is named after the
+dumpling squid (Euprymna tasmanica).
+
 v0.67.12 "Dumpling" (draft)
 ===========================
 

diff --git a/doc/releases/emperor.rst b/doc/releases/emperor.rst
index 20823f51f8011b6e4172812fedee1f54e31a7f72..3c0bcb782d8f2504d08c6e2338e71809d47c1d3e 100644 (file)
--- a/doc/releases/emperor.rst
+++ b/doc/releases/emperor.rst
@@ -1,3 +1,10 @@
+=======
+Emperor
+=======
+
+Emperor is the 5th stable release of Ceph.  It is named after the emperor squid.
+
+
 v0.72.3 Emperor (pending release)
 =================================
 

diff --git a/doc/releases/firefly.rst b/doc/releases/firefly.rst
index 5847bd1b9e52c565f8d7bf24bdaec822726385bd..6244600898e7045ed85ea0b1271a5540183941c8 100644 (file)
--- a/doc/releases/firefly.rst
+++ b/doc/releases/firefly.rst
@@ -1,3 +1,10 @@
+=======
+Firefly
+=======
+
+Firefly is the 6th stable release of Ceph. It is named after the
+firefly squid (Watasenia scintillans).
+
 v0.80.11 Firefly
 ================
 

diff --git a/doc/releases/giant.rst b/doc/releases/giant.rst
index d6ee8c097d83d535929247cd2605c2843741b25b..da330f15983481c74ea7acf25e6ae467a9a88c31 100644 (file)
--- a/doc/releases/giant.rst
+++ b/doc/releases/giant.rst
@@ -1,3 +1,11 @@
+=====
+Giant
+=====
+
+Giant is the 7th stable release of Ceph.  It is named after the giant
+squid (Architeuthis dux).
+
+
 v0.87.2 Giant
 =============
 

diff --git a/doc/releases/hammer.rst b/doc/releases/hammer.rst
index 06dd17c9bf647fc33b4796739d666d726d5c7c60..785d0c2b434fb0c60fcab89e1b2a701292514f61 100644 (file)
--- a/doc/releases/hammer.rst
+++ b/doc/releases/hammer.rst
@@ -1,3 +1,10 @@
+======
+Hammer
+======
+
+Hammer is the 8th stable release of Ceph.  It is named after the
+hammer octopus (Octopus australis).
+
 v0.94.10 Hammer
 ===============
 

diff --git a/doc/releases/index.rst b/doc/releases/index.rst
index 6a9a8301f5e7e3b9b398226e0857cc0eb6557ed6..9390b425595d3fc46eae68566b436b93769e0be4 100644 (file)
--- a/doc/releases/index.rst
+++ b/doc/releases/index.rst
@@ -10,17 +10,35 @@ Ceph Releases (index)
 Active Releases
 ---------------
 
+The following Ceph releases are actively maintained and receive periodic backports and
+security fixes.
+
 .. toctree::
    :maxdepth: 1
 
-   Pacific <pacific>
-   Octopus <octopus>
-   Nautilus <nautilus>
+   Pacific (v16.2.*) <pacific>
+   Octopus (v15.2.*) <octopus>
+   Nautilus (v14.2.*) <nautilus>
 
 Archived Releases
 -----------------
 
+The following older Ceph releases are no longer maintained (do not
+receive bug fixes or backports).
+
 .. toctree::
    :maxdepth: 1 
 
-   Archived releases index <archived-index>
+   Mimic (v13.2.*) <mimic>
+   Luminous (v12.2.*) <luminous>
+   Kraken (v11.2.*) <kraken>
+   Jewel (v10.2.*) <jewel>
+   Infernalis (v9.2.*) <infernalis>
+   Hammer (v0.94.*) <hammer>
+   Giant (v0.87.*) <giant>
+   Firefly (v0.80.*) <firefly>
+   Emperor (v0.72.*) <emperor>
+   Dumpling (v0.67.*) <dumpling>
+   Cuttlefish (v0.61.*) <cuttlefish>
+   Bobtail (v0.56.*) <bobtail>
+   Argonaut (v0.48.*) <argonaut>

diff --git a/doc/releases/infernalis.rst b/doc/releases/infernalis.rst
index 14b756c0aff4b174f233e8c6bd4a2f323db5f3cb..43a2af3861bdf79d3b4ceff3b67ec755e2d9d1f0 100644 (file)
--- a/doc/releases/infernalis.rst
+++ b/doc/releases/infernalis.rst
@@ -1,5 +1,13 @@
 .. _infernalis-release-notes:
 
+==========
+Infernalis
+==========
+
+Infernalis is the 9th stable release of Ceph.  It is named after the
+vampire squid (Vampyroteuthis infernalis, the "vampire squid from
+hell").
+
 v9.2.1 Infernalis
 =================
 

diff --git a/doc/releases/jewel.rst b/doc/releases/jewel.rst
index 6bd0d8c37c745183988627e73eea04af4389db69..951dc5d82d7dd98695e398e159181aae4a265e06 100644 (file)
--- a/doc/releases/jewel.rst
+++ b/doc/releases/jewel.rst
@@ -1,3 +1,11 @@
+=====
+Jewel
+=====
+
+Jewel is the 10th stable release of Ceph. It is named after the jewel
+squid (Histioteuthis reversa).
+
+
 v10.2.11 Jewel
 ==============
 

diff --git a/doc/releases/kraken.rst b/doc/releases/kraken.rst
index 3e6774e7ab65866bdd2d79402fa9e5e804bd1db6..3d39e3293b3d314b4e0a1cd25b8b975d65b7512d 100644 (file)
--- a/doc/releases/kraken.rst
+++ b/doc/releases/kraken.rst
@@ -1,3 +1,11 @@
+======
+Kraken
+======
+
+Kraken is the 11th stable release of Ceph.  It is named after the
+mythical kraken, a legendary sea monster in Scandinavian folklore with
+cephalopod-like appearance.
+
 v11.2.1 Kraken
 ==============
 

diff --git a/doc/releases/luminous.rst b/doc/releases/luminous.rst
index 4c20d7f57637f8874d002f859a60ee5625c94f2f..3d01d71990e765c88648eedf2a9071b152480dbd 100644 (file)
--- a/doc/releases/luminous.rst
+++ b/doc/releases/luminous.rst
@@ -1,3 +1,10 @@
+========
+Luminous
+========
+
+Luminous is the 12th stable release of Ceph.  It is named after the
+luminous squid (watasenia scintillans, aka firefly squid).
+
 v12.2.13 Luminous
 =================
 

diff --git a/doc/releases/mimic.rst b/doc/releases/mimic.rst
index e98261c1192a0effb18aa25376726ea08a1042e2..c811556e34d3264bc3d9d975e851fb60c2eff6fb 100644 (file)
--- a/doc/releases/mimic.rst
+++ b/doc/releases/mimic.rst
@@ -1,3 +1,10 @@
+=====
+Mimic
+=====
+
+Mimic is the 13th stable release of Ceph.  It is named after the mimic
+octopus (thaumoctopus mimicus).
+
 v13.2.10 Mimic
 ==============
 

diff --git a/doc/releases/nautilus.rst b/doc/releases/nautilus.rst
index 8b664a82c1a55cf58032a0edf3fcf69da2936f84..5dc4866654f0324c942c56f636bd851a31c5d388 100644 (file)
--- a/doc/releases/nautilus.rst
+++ b/doc/releases/nautilus.rst
@@ -1,3 +1,11 @@
+========
+Nautilus
+========
+
+Nautilus is the 14th stable release of Ceph.  It is named after the
+nautilus, a family of cephalopods characterized by a whorled shell.
+
+
 v14.2.19 Nautilus
 =================
 

diff --git a/doc/releases/octopus.rst b/doc/releases/octopus.rst
index 919b92e1f1148ff02524378ef9926e60f1944441..e4112b9e57e2457a543ed0e3f65ab5645f66cf5b 100644 (file)
--- a/doc/releases/octopus.rst
+++ b/doc/releases/octopus.rst
@@ -1,3 +1,11 @@
+=======
+Octopus
+=======
+
+Octopus is the 15th stable release of Ceph.  It is named after an
+order of 8-limbed cephalopods.
+
+
 v15.2.9 Octopus
 ===============
 

diff --git a/doc/releases/pacific.rst b/doc/releases/pacific.rst
index 3b7652e1fc5720fa1185cbe274ad0596ed41d46f..f9438bfb06df598264f146ef64c45f21a1bf38bc 100644 (file)
--- a/doc/releases/pacific.rst
+++ b/doc/releases/pacific.rst
@@ -1,3 +1,11 @@
+=======
+Pacific
+=======
+
+Pacific is the 16th stable release of Ceph.  It is named after the
+giant pacific octopus (Enteroctopus dofleini).
+
+
 v16.2.0 Pacific
 ===============