diff --git a/cinder/volume/drivers/san/__init__.py b/cinder/volume/drivers/san/__init__.py
index 511f20cfa49..408bce579e6 100644
--- a/cinder/volume/drivers/san/__init__.py
+++ b/cinder/volume/drivers/san/__init__.py
@@ -13,10 +13,10 @@
 #    under the License.
 
 """
-:mod:`cinder.volume.san` -- Cinder San Drivers
+:mod:`cinder.volume.drivers.san` -- Cinder San Drivers
 =====================================================
 
-.. automodule:: cinder.volume.san
+.. automodule:: cinder.volume.drivers.san
    :platform: Unix
    :synopsis: Module containing all the Cinder San drivers.
 """
diff --git a/doc/source/devref/cinder.rst b/doc/source/devref/cinder.rst
index fe791bbf0da..02d383eea63 100644
--- a/doc/source/devref/cinder.rst
+++ b/doc/source/devref/cinder.rst
@@ -95,15 +95,6 @@ The :mod:`cinder.wsgi` Module
 Tests
 -----
 
-The :mod:`declare_conf` Module
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. automodule:: cinder.tests.unit.declare_conf
-    :noindex:
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
 
 The :mod:`conf_fixture` Module
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -125,11 +116,3 @@ The :mod:`test_rpc` Module
     :show-inheritance:
 
 
-The :mod:`runtime_conf` Module
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. automodule:: cinder.tests.unit.runtime_conf
-    :noindex:
-    :members:
-    :undoc-members:
-    :show-inheritance:
diff --git a/doc/source/devref/index.rst b/doc/source/devref/index.rst
index 4737a8bd57e..79437a4665d 100644
--- a/doc/source/devref/index.rst
+++ b/doc/source/devref/index.rst
@@ -40,7 +40,6 @@ Programming HowTos and Tutorials
     migration
     api.apache
     rolling.upgrades
-    genconfig
 
 Background Concepts for Cinder
 ------------------------------