Merge "Alphabetized items under other sections in source documentation"

doc/source/account.rst

@@ -4,16 +4,6 @@
 Account
 *******
 
-.. _account-server:
-
-Account Server
-==============
-
-.. automodule:: swift.account.server
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
 .. _account-auditor:
 
 Account Auditor
@@ -24,6 +14,16 @@ Account Auditor
     :undoc-members:
     :show-inheritance:
 
+.. _account-backend:
+
+Account Backend
+===============
+
+.. automodule:: swift.account.backend
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
 .. _account-reaper:
 
 Account Reaper
@@ -34,12 +34,12 @@ Account Reaper
     :undoc-members:
     :show-inheritance:
 
-.. _account-backend:
+.. _account-server:
 
-Account Backend
-===============
+Account Server
+==============
 
-.. automodule:: swift.account.backend
+.. automodule:: swift.account.server
     :members:
     :undoc-members:
     :show-inheritance:

doc/source/container.rst

@@ -4,26 +4,6 @@
 Container
 *********
 
-.. _container-server:
-
-Container Server
-================
-
-.. automodule:: swift.container.server
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-.. _container-updater:
-
-Container Updater
-=================
-
-.. automodule:: swift.container.updater
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
 .. _container-auditor:
 
 Container Auditor
@@ -34,14 +14,6 @@ Container Auditor
     :undoc-members:
     :show-inheritance:
 
-Container Sync
-==============
-
-.. automodule:: swift.container.sync
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
 .. _container-backend:
 
 Container Backend
@@ -51,3 +23,31 @@ Container Backend
     :members:
     :undoc-members:
     :show-inheritance:
+
+.. _container-server:
+
+Container Server
+================
+
+.. automodule:: swift.container.server
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+Container Sync
+==============
+
+.. automodule:: swift.container.sync
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+.. _container-updater:
+
+Container Updater
+=================
+
+.. automodule:: swift.container.updater
+    :members:
+    :undoc-members:
+    :show-inheritance:

doc/source/object.rst

@@ -4,12 +4,22 @@
 Object
 ******
 
-.. _object-server:
+.. _object-auditor:
 
-Object Server
-=============
+Object Auditor
+==============
 
-.. automodule:: swift.obj.server
+.. automodule:: swift.obj.auditor
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+.. _object-diskfile:
+
+Object Backend
+==============
+
+.. automodule:: swift.obj.diskfile
     :members:
     :undoc-members:
     :show-inheritance:
@@ -34,6 +44,16 @@ Object Replicator
     :undoc-members:
     :show-inheritance:
 
+.. _object-server:
+
+Object Server
+=============
+
+.. automodule:: swift.obj.server
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
 .. _object-updater:
 
 Object Updater
@@ -43,23 +63,3 @@ Object Updater
     :members:
     :undoc-members:
     :show-inheritance:
-
-.. _object-auditor:
-
-Object Auditor
-==============
-
-.. automodule:: swift.obj.auditor
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-.. _object-diskfile:
-
-Object Backend
-==============
-
-.. automodule:: swift.obj.diskfile
-    :members:
-    :undoc-members:
-    :show-inheritance:

doc/source/proxy.rst

@@ -4,16 +4,6 @@
 Proxy
 *****
 
-.. _proxy-server:
-
-Proxy Server
-============
-
-.. automodule:: swift.proxy.server
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
 .. _proxy-controllers:
 
 Proxy Controllers
@@ -50,3 +40,13 @@ Object
     :members:
     :undoc-members:
     :show-inheritance:
+
+.. _proxy-server:
+
+Proxy Server
+============
+
+.. automodule:: swift.proxy.server
+    :members:
+    :undoc-members:
+    :show-inheritance: