Merge PR #33953 into octopus

* refs/pull/33953/head:
	doc: Move ceph-deploy docs to doc/install/ceph-deploy

Reviewed-by: Sage Weil <sage@redhat.com>

13 files changed, 19 insertions, 12 deletions

diff --git a/doc/index.rst b/doc/index.rst
index 0306df6eaf1..af3b49c6c33 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -93,7 +93,6 @@ about Ceph, see our `Architecture`_ section.
 
    start/intro
    cephadm/index
-   start/index
    install/index
    rados/index
    cephfs/index
diff --git a/doc/start/index.rst b/doc/install/ceph-deploy/index.rst
index 40143214dfb..9579d3b3be8 100644
--- a/doc/start/index.rst
+++ b/doc/install/ceph-deploy/index.rst
@@ -38,7 +38,7 @@ Ceph Block Devices, the Ceph File System, and Ceph Object Storage.
 
 .. toctree::
 	
-   Block Device Quick Start <quick-rbd>
+   Block Device Quick Start <../../start/quick-rbd>
    Filesystem Quick Start <quick-cephfs>
    Object Storage Quick Start <quick-rgw>
 
@@ -47,3 +47,10 @@ Ceph Block Devices, the Ceph File System, and Ceph Object Storage.
 	</td></tr></tbody></table>
 
 
+.. toctree::
+    :hidden:
+    
+    Upgrading Ceph <upgrading-ceph>
+   	Install Ceph Object Gateway <install-ceph-gateway>
+
+
diff --git a/doc/install/install-ceph-gateway.rst b/doc/install/ceph-deploy/install-ceph-gateway.rst
index fe5b6b574cd..fe5b6b574cd 100644
--- a/doc/install/install-ceph-gateway.rst
+++ b/doc/install/ceph-deploy/install-ceph-gateway.rst
diff --git a/doc/start/quick-ceph-deploy.rst b/doc/install/ceph-deploy/quick-ceph-deploy.rst
index c4589c7b3d3..c4589c7b3d3 100644
--- a/doc/start/quick-ceph-deploy.rst
+++ b/doc/install/ceph-deploy/quick-ceph-deploy.rst
diff --git a/doc/start/quick-cephfs.rst b/doc/install/ceph-deploy/quick-cephfs.rst
index e8ca28f86ee..e8ca28f86ee 100644
--- a/doc/start/quick-cephfs.rst
+++ b/doc/install/ceph-deploy/quick-cephfs.rst
diff --git a/doc/start/quick-common.rst b/doc/install/ceph-deploy/quick-common.rst
index 915a7b88642..915a7b88642 100644
--- a/doc/start/quick-common.rst
+++ b/doc/install/ceph-deploy/quick-common.rst
diff --git a/doc/start/quick-rgw-old.rst b/doc/install/ceph-deploy/quick-rgw-old.rst
index db6474de514..db6474de514 100644
--- a/doc/start/quick-rgw-old.rst
+++ b/doc/install/ceph-deploy/quick-rgw-old.rst
diff --git a/doc/start/quick-rgw.rst b/doc/install/ceph-deploy/quick-rgw.rst
index 5efda04f9ba..5efda04f9ba 100644
--- a/doc/start/quick-rgw.rst
+++ b/doc/install/ceph-deploy/quick-rgw.rst
diff --git a/doc/start/quick-start-preflight.rst b/doc/install/ceph-deploy/quick-start-preflight.rst
index b1fdc92d228..b1fdc92d228 100644
--- a/doc/start/quick-start-preflight.rst
+++ b/doc/install/ceph-deploy/quick-start-preflight.rst
diff --git a/doc/install/upgrading-ceph.rst b/doc/install/ceph-deploy/upgrading-ceph.rst
index 6fbf43a236d..6fbf43a236d 100644
--- a/doc/install/upgrading-ceph.rst
+++ b/doc/install/ceph-deploy/upgrading-ceph.rst
diff --git a/doc/install/index.rst b/doc/install/index.rst
index 298b3b39a75..69a48a6d003 100644
--- a/doc/install/index.rst
+++ b/doc/install/index.rst
@@ -69,6 +69,11 @@ Install ceph using ceph-deploy
 
    ceph-deploy is no longer actively maintained. It is not tested on versions of Ceph newer than Nautilus. It does not support RHEL8, CentOS 8, or newer operating systems.
 
+.. toctree::
+   :hidden:
+  
+   ceph-deploy/index
+
 
 DeepSea
 -------
@@ -92,6 +97,11 @@ Manually install Ceph using packages.
 
 * :ref:`install-manual`
 
+.. toctree::
+   :hidden:
+  
+   index_manual
+
 Puppet
 ------
 
@@ -100,9 +110,3 @@ Installs Ceph using Puppet
 * `github.com/openstack/puppet-ceph <https://github.com/openstack/puppet-ceph>`_
 
 
-
-
-.. toctree::
-   :hidden:
-  
-   index_manual
diff --git a/doc/install/index_manual.rst b/doc/install/index_manual.rst
index 68520735ac6..817247c9532 100644
--- a/doc/install/index_manual.rst
+++ b/doc/install/index_manual.rst
@@ -42,7 +42,6 @@ QEMU.
 
 	Install ceph-deploy <install-ceph-deploy>
     	Install Ceph Storage Cluster <install-storage-cluster>
-	Install Ceph Object Gateway <install-ceph-gateway>
 	Install Virtualization for Block <install-vm-cloud>
 
 
@@ -69,6 +68,4 @@ sequence.
 .. toctree::
    :maxdepth: 2
 
-   Upgrading Ceph <upgrading-ceph>
-
 .. _get packages: ../install/get-packages
diff --git a/doc/radosgw/index.rst b/doc/radosgw/index.rst
index bb7280f7009..957c3641d63 100644
--- a/doc/radosgw/index.rst
+++ b/doc/radosgw/index.rst
@@ -38,7 +38,7 @@ you may write data with one API and retrieve it with the other.
 .. toctree::
    :maxdepth: 1
 
-   Manual Install w/Civetweb <../../install/install-ceph-gateway>
+   Manual Install w/Civetweb <../../install/ceph-deploy/install-ceph-gateway>
    HTTP Frontends <frontends>
    Pool Placement and Storage Classes <placement>
    Multisite Configuration <multisite>