doc: Add index entries, remove glossary as it's practically replaced by the index.

Signed-off-by: Tommi Virtanen <tommi.virtanen@dreamhost.com>

diff --git a/doc/architecture.rst b/doc/architecture.rst
index 2bd5c55cc71396811173f9a17749cd0999bfe90e..ed8a5fe12f3c7db328720071e91a8439086fffaf 100644 (file)
--- a/doc/architecture.rst
+++ b/doc/architecture.rst
@@ -16,6 +16,7 @@ device. Qemu/KVM also has a direct RBD client, that avoids the kernel
 overhead.
 
 
+.. index:: monitor, ceph-mon
 .. _monitor:
 
 Monitor cluster
@@ -52,9 +53,9 @@ subgroup for an even number.
 .. todo:: explain monmap
 
 
+.. index:: RADOS, OSD, ceph-osd, object
 .. _rados:
 
-
 RADOS
 =====
 
@@ -90,6 +91,7 @@ attributes should work (see :ref:`xattr`).
 .. todo:: explain plugins ("classes")
 
 
+.. index:: Ceph filesystem, Ceph Distributed File System, MDS, ceph-mds
 .. _cephfs:
 
 Ceph filesystem
@@ -135,6 +137,7 @@ To control the number of `active` ``ceph-mds``\es, see
 .. todo:: mds.0 vs mds.alpha etc details
 
 
+.. index:: RADOS Gateway, radosgw
 .. _radosgw:
 
 ``radosgw``
@@ -148,6 +151,7 @@ access control, and so on.
 .. _RESTful: http://en.wikipedia.org/wiki/RESTful
 
 
+.. index:: RBD, Rados Block Device
 .. _rbd:
 
 Rados Block Device (RBD)

diff --git a/doc/glossary.rst b/doc/glossary.rst
deleted file mode 100644 (file)
index 13b921f..0000000
--- a/doc/glossary.rst
+++ /dev/null
@@ -1,37 +0,0 @@
-==========
- Glossary
-==========
-
-.. glossary::
-   :sorted:
-
-   OSD
-     .. todo:: write me
-
-   MDS
-     .. todo:: write me
-
-   Mon
-     .. todo:: write me
-
-   Cap
-     .. todo:: write me
-
-   Object
-     .. todo:: write me
-
-   ceph-osd
-     .. todo:: write me
-
-   ceph-mon
-     .. todo:: write me
-
-   ceph-mds
-     Ceph MDS, the actual daemon blahblah
-
-   radosgw
-     .. todo:: write me
-
-
-.. todo:: what's missing from glossary
-

diff --git a/doc/index.rst b/doc/index.rst
index 8ab1b2def1ed202bf8e44518957a16378e876a77..7184fb0b53e51c2aaf7b09a3d6a76c7776663a05 100644 (file)
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -91,7 +91,6 @@ Table of Contents
    Internals <dev/index>
    man/index
    papers
-   glossary
    appendix/index
 
 

diff --git a/doc/ops/install/chef.rst b/doc/ops/install/chef.rst
index efc74b6179e16da68fe5a1b452990e84f9a27ecd..e97aabdd86e4edc90674f4261e507658e5a37d63 100644 (file)
--- a/doc/ops/install/chef.rst
+++ b/doc/ops/install/chef.rst
@@ -1,3 +1,4 @@
+.. index:: Chef
 .. _install-chef:
 
 ============================

diff --git a/doc/ops/install/mkcephfs.rst b/doc/ops/install/mkcephfs.rst
index 58a6da3c900656108b3157a190f7fc18d9d057bb..ab799ffa0a845a1c93395e28d2b03d0bf6f408af 100644 (file)
--- a/doc/ops/install/mkcephfs.rst
+++ b/doc/ops/install/mkcephfs.rst
@@ -1,3 +1,5 @@
+.. index:: mkcephfs
+
 ====================================
  Installing Ceph using ``mkcephfs``
 ====================================

diff --git a/doc/ops/manage/key.rst b/doc/ops/manage/key.rst
index 1c4bb8f6e47adb5b8a4c42c4cb9b616cda36bfc9..64951733699ddbc91206998b23bc8209a81364be 100644 (file)
--- a/doc/ops/manage/key.rst
+++ b/doc/ops/manage/key.rst
@@ -1,13 +1,19 @@
+.. index:: key, cryptography
+
 ======================
  Managing crypto keys
 ======================
 
+.. index:: type, name, id
+
 Types of keys
 =============
 
 .. todo:: client, osd, mds, mon; id, no id
 
 
+.. index:: cap, capability
+
 Capabilities
 ============
 

diff --git a/doc/ops/manage/pool.rst b/doc/ops/manage/pool.rst
index 07d1506dc503f4c723b05f2f0d07d72fa975df6e..90e2835ccc5235d739c3b15eae982fc7c517779f 100644 (file)
--- a/doc/ops/manage/pool.rst
+++ b/doc/ops/manage/pool.rst
@@ -1,3 +1,5 @@
+.. index:: pool
+
 ======================
  Managing RADOS pools
 ======================
@@ -17,5 +19,7 @@ Authorizing access to pools
 .. todo:: when and who needs pool access
 
 
+.. index:: CRUSH
+
 Custom pool layouts with CRUSH
 ==============================

diff --git a/doc/ops/monitor.rst b/doc/ops/monitor.rst
index f58914ea5abd0a9de9aa051afd6308c05bdc1a12..98c75c33871a98540c9bb44a26d2cba4369e9518 100644 (file)
--- a/doc/ops/monitor.rst
+++ b/doc/ops/monitor.rst
@@ -1,3 +1,5 @@
+.. index:: monitoring, metrics
+
 =================
  Monitoring Ceph
 =================

diff --git a/doc/ops/radosgw.rst b/doc/ops/radosgw.rst
index fdd48331301cc53b1c82dc47ad570bb2f3ed579a..50fcf38e1bee8cfa0e67d1695760b0f24b792472 100644 (file)
--- a/doc/ops/radosgw.rst
+++ b/doc/ops/radosgw.rst
@@ -1,3 +1,5 @@
+.. index:: RADOS Gateway, radosgw
+
 =========================================
  Radosgw installation and administration
 =========================================

diff --git a/doc/ops/rbd.rst b/doc/ops/rbd.rst
index 07e34890ab8efdf0c614cba86ccf7f1395a6bce0..fa150859aebb2e2487f02bdee809d0a580210b15 100644 (file)
--- a/doc/ops/rbd.rst
+++ b/doc/ops/rbd.rst
@@ -1,3 +1,5 @@
+.. index:: RBD
+
 ==============================
  RBD setup and administration
 ==============================

diff --git a/doc/start/block.rst b/doc/start/block.rst
index 947adfc01ed7d4f1a8ddd22588bc88249767e5f9..4ed09be150a2d65377e0f0c9dd8fdadcff4dd1f6 100644 (file)
--- a/doc/start/block.rst
+++ b/doc/start/block.rst
@@ -1,3 +1,5 @@
+.. index:: RBD
+
 =====================
  Starting to use RBD
 =====================

diff --git a/doc/start/object.rst b/doc/start/object.rst
index b3c218b760afc66175f211729c5aca0e001d7836..7b8a9b95f1d44654093c21b9be49ba6c2053ae24 100644 (file)
--- a/doc/start/object.rst
+++ b/doc/start/object.rst
@@ -4,6 +4,7 @@
 
 .. highlight:: python
 
+.. index:: RADOS, object
 
 Introduction
 ============