diff --git a/doc/source/man/glance.rst b/doc/source/man/glance.rst
index 6b53903..8d3cac0 100644
--- a/doc/source/man/glance.rst
+++ b/doc/source/man/glance.rst
@@ -23,26 +23,24 @@ Service (Glance).
 
 In order to use the CLI, you must provide your OpenStack username, password,
 project (historically called tenant), and auth endpoint. You can use
-configuration options :option:`--os-username`, :option:`--os-password`,
-:option:`--os-tenant-id`, and :option:`--os-auth-url` or set corresponding
-environment variables::
+configuration options ``--os-username``, ``--os-password``, ``--os-tenant-id``,
+and ``--os-auth-url`` or set corresponding environment variables::
 
     export OS_USERNAME=user
     export OS_PASSWORD=pass
     export OS_TENANT_ID=b363706f891f48019483f8bd6503c54b
     export OS_AUTH_URL=http://auth.example.com:5000/v2.0
 
-The command line tool will attempt to reauthenticate using provided
-credentials for every request. You can override this behavior by manually
-supplying an auth token using :option:`--os-image-url` and
-:option:`--os-auth-token` or by setting corresponding environment variables::
+The command line tool will attempt to reauthenticate using provided credentials
+for every request. You can override this behavior by manually supplying an auth
+token using ``--os-image-url`` and ``--os-auth-token`` or by setting
+corresponding environment variables::
 
     export OS_IMAGE_URL=http://glance.example.org:9292/
     export OS_AUTH_TOKEN=3bcc3d3a03f44e3d8377f9247b0ad155
 
-
-You can select an API version to use by :option:`--os-image-api-version`
-option or by setting corresponding environment variable::
+You can select an API version to use by ``--os-image-api-version`` option or by
+setting corresponding environment variable::
 
     export OS_IMAGE_API_VERSION=1
 
diff --git a/setup.cfg b/setup.cfg
index 2c3a5a9..e0510ae 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -35,9 +35,10 @@ console_scripts =
 
 [build_sphinx]
 builders = html,man
+all-files = 1
+warning-is-error = 1
 source-dir = doc/source
 build-dir = doc/build
-all_files = 1
 
 [upload_sphinx]
 upload-dir = doc/build/html