diff options
| -rw-r--r-- | CHANGES.rst | 4 | ||||
| -rw-r--r-- | docs/conf.py | 9 | ||||
| -rw-r--r-- | setup.py | 2 |
3 files changed, 14 insertions, 1 deletions
diff --git a/CHANGES.rst b/CHANGES.rst index 63c9979f0..1530516f6 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -114,6 +114,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 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 @@ -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', |