diff --git a/doc/source/shell.rst b/doc/source/shell.rst
index e16083a8b..2031b8988 100644
--- a/doc/source/shell.rst
+++ b/doc/source/shell.rst
@@ -7,10 +7,10 @@ The :program:`manila` shell utility
 The :program:`manila` shell utility interacts with the OpenStack Manila API
 from the command line. It supports the entirety of the OpenStack Manila API.
 
-You'll need to provide :program:`manila` with your OpenStack username and
-API key. You can do this with the :option:`--os-username`, :option:`--os-password`
-and :option:`--os-tenant-name` options, but it's easier to just set them as
-environment variables by setting two environment variables:
+You'll need to provide :program:`manila` with your OpenStack username and API
+key. You can do this with the `--os-username`, `--os-password` and
+`--os-tenant-name` options, but it's easier to just set them as environment
+variables by setting two environment variables:
 
 .. envvar:: OS_USERNAME or MANILA_USERNAME
 
diff --git a/setup.cfg b/setup.cfg
index efabe0dca..2d7295fb7 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -37,7 +37,8 @@ oslo.config.opts =
 
 [build_sphinx]
 builders = html,man
-all_files = 1
+all-files = 1
+warning-is-error = 1
 source-dir = doc/source
 build-dir = doc/build
 
diff --git a/tox.ini b/tox.ini
index 3133e7598..65e9eecbe 100644
--- a/tox.ini
+++ b/tox.ini
@@ -39,6 +39,7 @@ commands =
 commands = {posargs}
 
 [testenv:docs]
+basepython = python2.7
 whitelist_externals = rm
 commands =
   rm -rf doc/build