diff --git a/docs/api/request.rst b/docs/api/request.rst
index ed7f91e912..edd319864e 100644
--- a/docs/api/request.rst
+++ b/docs/api/request.rst
@@ -14,7 +14,7 @@
                      model_url, resource_url, resource_path, set_property, 
                      effective_principals, authenticated_userid,
                      unauthenticated_userid, has_permission,
-                     invoke_exception_view, localizer
+                     invoke_exception_view, localizer, response, session
 
    .. attribute:: context
 
diff --git a/docs/conf.py b/docs/conf.py
index 4724853801..613f38dca5 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -379,9 +379,9 @@ def app_role(role, rawtext, text, lineno, inliner, options={}, content=[]):
 
 def setup(app):
     app.add_role('app', app_role)
-    app.add_directive('frontmatter', FrontMatter, 1, (0, 0, 0))
-    app.add_directive('mainmatter', MainMatter, 1, (0, 0, 0))
-    app.add_directive('backmatter', BackMatter, 1, (0, 0, 0))
+    app.add_directive('frontmatter', FrontMatter)
+    app.add_directive('mainmatter', MainMatter)
+    app.add_directive('backmatter', BackMatter)
     app.connect('autodoc-process-signature', resig)
 
 
diff --git a/tox.ini b/tox.ini
index 8aeb1f4f8f..74f5cfbbd5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -33,14 +33,14 @@ deps =
 [testenv:docs]
 whitelist_externals = make
 commands =
-    make -C docs {posargs:doctest html epub} BUILDDIR={envdir} "SPHINXOPTS=-W -E"
+    make -C docs {posargs:doctest html epub} BUILDDIR={envdir} "SPHINXOPTS=-W -E -D suppress_warnings=ref.term"
 extras =
     docs
 
 [testenv:pdf]
 whitelist_externals = make
 commands =
-    make -C docs latexpdf BUILDDIR={envdir} "SPHINXOPTS=-W -E"
+    make -C docs latexpdf BUILDDIR={envdir} "SPHINXOPTS=-W -E -D suppress_warnings=ref.term"
 extras =
     docs