diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 4d3af0f844..773eeecc85 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -1,3 +1,7 @@
+=================
+Contributor Guide
+=================
+
 If you would like to contribute to the development of OpenStack,
 you must follow the steps documented at:
 
diff --git a/doc/source/devstack.rst b/doc/source/devstack.rst
index bbe4811e76..16b21ffccc 100644
--- a/doc/source/devstack.rst
+++ b/doc/source/devstack.rst
@@ -166,8 +166,8 @@ Enable trunk service and configure following flags in ``local.conf``::
     ENABLED_SERVICES+=,q-trunk
     Q_SERVICE_PLUGIN_CLASSES=trunk
 
-FWaaS (V1) Driver:
-~~~~~~~~~~~~~
+FWaaS (V1) Driver
+~~~~~~~~~~~~~~~~~
 
 Add neutron-fwaas repo as an external repository and configure following flags in ``local.conf``::
 
@@ -243,8 +243,8 @@ Configure the service provider::
     [DEFAULT]
     api_extensions_path = $DEST/neutron-lbaas/neutron_lbaas/extensions
 
-FWaaS (V1) Driver:
-~~~~~~~~~~~~~
+FWaaS (V1) Driver
+~~~~~~~~~~~~~~~~~
 
 Add neutron-fwaas repo as an external repository and configure following flags in ``local.conf``::
 
diff --git a/doc/source/history.rst b/doc/source/history.rst
deleted file mode 100644
index 69ed4fe6c2..0000000000
--- a/doc/source/history.rst
+++ /dev/null
@@ -1 +0,0 @@
-.. include:: ../../ChangeLog
diff --git a/doc/source/index.rst b/doc/source/index.rst
index 928b6ade85..1b9ee65d00 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -10,7 +10,9 @@ Contents:
    installation
    usage
    contributing
-   history
+   admin_util
+   devstack
+   housekeeper
 
 Code Documentation
 ==================
@@ -18,7 +20,6 @@ Code Documentation
 .. toctree::
    :maxdepth: 1
 
-   api/autoindex
 
 Indices and tables
 ==================
diff --git a/doc/source/readme.rst b/doc/source/readme.rst
index 6b2b3ec68c..38ba8043df 100644
--- a/doc/source/readme.rst
+++ b/doc/source/readme.rst
@@ -1 +1 @@
-.. include:: ../README.rst
\ No newline at end of file
+.. include:: ../../README.rst
\ No newline at end of file
diff --git a/doc/source/usage.rst b/doc/source/usage.rst
index dbc2eadc31..9ada13124d 100644
--- a/doc/source/usage.rst
+++ b/doc/source/usage.rst
@@ -2,6 +2,6 @@
 Usage
 ========
 
-To use  in a project::
+To use in a project::
 
 	import vmware_nsx
diff --git a/test-requirements.txt b/test-requirements.txt
index d638348bfa..05dd9b021d 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -6,6 +6,7 @@ hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
 coverage!=4.4,>=4.0 # Apache-2.0
 fixtures>=3.0.0 # Apache-2.0/BSD
 flake8-import-order==0.12 # LGPLv3
+sphinx!=1.6.6,!=1.6.7,>=1.6.5 # BSD
 mock>=2.0.0 # BSD
 
 psycopg2>=2.6.2 # LGPL/ZPL