From 333fccda07b14f64376e9dd3c730e09db3c39d98 Mon Sep 17 00:00:00 2001
From: Steve Piercy <web@stevepiercy.com>
Date: Mon, 4 May 2020 02:57:31 -0700
Subject: [PATCH 1/2] Backport #3577

---
 docs/api/request.rst | 3 ++-
 docs/conf.py         | 6 +++---
 tox.ini              | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/docs/api/request.rst b/docs/api/request.rst
index 0c169adaf1..9cacfde8e5 100644
--- a/docs/api/request.rst
+++ b/docs/api/request.rst
@@ -14,7 +14,8 @@
                      model_url, resource_url, resource_path, set_property, 
                      effective_principals, authenticated_userid,
                      unauthenticated_userid, has_permission,
-                     invoke_exception_view
+                     invoke_exception_view, localizer, response, session,
+                     json_body
 
    .. attribute:: context
 
diff --git a/docs/conf.py b/docs/conf.py
index 80cf835972..4aa54e1069 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -384,9 +384,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 f2e990b99e..549f19b5f4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -66,7 +66,7 @@ deps =
 basepython = python3.5
 whitelist_externals = make
 commands =
-    make -C docs doctest html epub BUILDDIR={envdir} "SPHINXOPTS=-W -E"
+    make -C docs doctest html epub BUILDDIR={envdir} "SPHINXOPTS=-W -E -D suppress_warnings=ref.term"
 extras =
     docs
 
@@ -74,7 +74,7 @@ extras =
 basepython = python3.5
 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
 

From f1ad1559ad424a3090c8f39dba5ad2860e8fc96b Mon Sep 17 00:00:00 2001
From: Steve Piercy <web@stevepiercy.com>
Date: Thu, 7 May 2020 00:39:47 -0700
Subject: [PATCH 2/2] Backport #3581

---
 setup.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.cfg b/setup.cfg
index 19f338b916..8bef6f52e6 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -23,4 +23,4 @@ ignore =
     *.egg-info/*
 ignore-default-rules = true
 ignore-bad-ideas =
-    tests/pkgs/localeapp/*
+    tests/pkgs/localeapp/**/*.mo