From d275ec131b63dd03f1922990752c5564841275cf Mon Sep 17 00:00:00 2001
From: Steve Piercy <web@stevepiercy.com>
Date: Fri, 21 Sep 2018 18:07:22 -0700
Subject: Add support for RTD Ethical Ads

---
 docs/conf.py | 9 +++++++++
 setup.py     | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/docs/conf.py b/docs/conf.py
index 8fe7108ff..6e3d41240 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -161,6 +161,15 @@ html_theme_options = dict(
     outdated='false',
     )
 
+# Control display of sidebars
+html_sidebars = {'**': [
+    'localtoc.html',
+    'ethicalads.html',
+    'relations.html',
+    'sourcelink.html',
+    'searchbox.html',
+]}
+
 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".
 html_title = 'The Pyramid Web Framework v%s' % release
diff --git a/setup.py b/setup.py
index 56f9e30d1..e38dcd656 100644
--- a/setup.py
+++ b/setup.py
@@ -43,7 +43,7 @@ tests_require = [
 docs_extras = [
     'Sphinx >= 1.7.4,<=1.7.9',
     'docutils',
-    'pylons-sphinx-themes',
+    'pylons-sphinx-themes >= 1.0.7',
     'pylons_sphinx_latesturl',
     'repoze.sphinx.autointerface',
     'sphinxcontrib-autoprogram',
-- 
cgit v1.2.3


From c8abfbba6414faeb85eb72b9d42825cbedc1ca48 Mon Sep 17 00:00:00 2001
From: Steve Piercy <web@stevepiercy.com>
Date: Fri, 21 Sep 2018 18:22:19 -0700
Subject: Add changelog entry

---
 CHANGES.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index d0dbbe5c0..3425a950f 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -110,6 +110,10 @@ Backward Incompatibilities
 Documentation Changes
 ---------------------
 
+- Ad support for Read The Docs Ethical Ads.
+  https://github.com/Pylons/pyramid/pull/3360
+  https://docs.readthedocs.io/en/latest/advertising/ethical-advertising.html
+
 - Add support for alembic to the pyramid-cookiecutter-alchemy cookiecutter
   and update the wiki2 tutorial to explain how it works.
   See https://github.com/Pylons/pyramid/pull/3307 and
-- 
cgit v1.2.3