diff --git a/doc/source/conf.py b/doc/source/conf.py
index ed14d260..b2556d8f 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -164,7 +164,7 @@ html_theme_options = {'incubating': True}
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
+#html_static_path = ['_static']
 
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.
diff --git a/doc/source/devref/auth.rst b/doc/source/devref/auth.rst
index 3432ff98..16bdcdd0 100644
--- a/doc/source/devref/auth.rst
+++ b/doc/source/devref/auth.rst
@@ -31,7 +31,7 @@ The :mod:`manila.quota` Module
     :show-inheritance:
 
 The :mod:`manila.policy` Module
-------------------------------
+-------------------------------
 
 .. automodule:: manila.policy
     :noindex:
diff --git a/doc/source/devref/database.rst b/doc/source/devref/database.rst
index c871d19e..ae10893d 100644
--- a/doc/source/devref/database.rst
+++ b/doc/source/devref/database.rst
@@ -46,15 +46,6 @@ The :mod:`manila.db.sqlalchemy.models` Module
     :undoc-members:
     :show-inheritance:
 
-The :mod:`manila.db.sqlalchemy.session` Module
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. automodule:: manila.db.sqlalchemy.session
-    :noindex:
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
 
 Tests
 -----
diff --git a/doc/source/devref/share.rst b/doc/source/devref/share.rst
index b0c3ba99..ee1fabeb 100644
--- a/doc/source/devref/share.rst
+++ b/doc/source/devref/share.rst
@@ -39,19 +39,3 @@ The :mod:`manila.share.driver` Module
     :undoc-members:
     :show-inheritance:
     :exclude-members: FakeAOEDriver
-
-Tests
------
-
-The :mod:`test_share` Module
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. automodule:: manila.tests.test_share
-    :noindex:
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-
-
-
diff --git a/doc/source/index.rst b/doc/source/index.rst
index 33b21c59..48b86fb5 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -42,6 +42,8 @@ Developer Docs
    :maxdepth: 1
 
    devref/index
+   man/index
+   api/autoindex
 
 API Extensions
 ==============
diff --git a/doc/source/man/index.rst b/doc/source/man/index.rst
new file mode 100644
index 00000000..aeb946c2
--- /dev/null
+++ b/doc/source/man/index.rst
@@ -0,0 +1,11 @@
+Command-Line Utilities
+======================
+
+In this section you will find information on Manila's command-line utilities.
+
+Reference
+---------
+.. toctree::
+   :maxdepth: 3
+
+   manila-manage