Merge branch 'master' into issue-16

Mariatta · web-flow · commit 7575afc145d0 · 2020-09-14T10:11:17.000-07:00
diff --git a/README.rst b/README.rst
@@ -10,14 +10,15 @@ projects if you so choose, but please keep in mind that in doing so you're also
 choosing to accept some of the responsibility for maintaining that collective
 trust.
 
-To use the theme, install it into your docs build environment via ``pip``::
+To use the theme, install it into your docs build environment via ``pip`` 
+(preferably in a virtual environment).
 
-    pip install python-docs-theme
 
-Configuring the options the conf.py holds
-------------------------------------------
+Configuration options
+---------------------
 
-For implementing the theme you should
-- enable `html_theme = 'python_docs_theme'`
-- html_sidebars:
-  - Defaults taken from http://www.sphinx-doc.org/en/stable/config.html#confval-html_sidebars
+To use this theme, add the following to ``conf.py``::
+
+- ``html_theme = 'python_docs_theme'``
+
+- ``html_sidebars``, defaults taken from http://www.sphinx-doc.org/en/stable/config.html#confval-html_sidebars
diff --git a/python_docs_theme/layout.html b/python_docs_theme/layout.html
@@ -47,6 +47,12 @@
     <div class="footer">
     &copy; <a href="{{ pathto('copyright') }}">{% trans %}Copyright{% endtrans %}</a> {{ copyright|e }}.
     <br />
+    {% trans %}This page is licensed under the Python Software Foundation License Version 2.{% endtrans %}
+    <br />
+    {% trans %}Examples, recipes, and other code in the documentation are additionally licensed under the Zero Clause BSD License.{% endtrans %}
+    <br />
+    {% trans pathto_license=license_file %}See <a href="{{ license_file }}">History and License</a> for more information.{% endtrans %}
+    <br /><br />
 
     {% include "footerdonate.html" %}
     <br />
@@ -55,6 +61,6 @@
     {% if theme_issues_url %}{% trans pathto_bugs=theme_issues_url %}<a href="{{ theme_issues_url }}">Found a bug</a>?{% endtrans %}{% endif %}
     <br />
 
-    {% trans sphinx_version=sphinx_version|e %}Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> {{ sphinx_version }}.{% endtrans %}
+    {% trans sphinx_version=sphinx_version|e %}Created using <a href="https://www.sphinx-doc.org/">Sphinx</a> {{ sphinx_version }}.{% endtrans %}
     </div>
 {% endblock %}
diff --git a/setup.py b/setup.py
@@ -13,12 +13,12 @@
     name='python-docs-theme',
     # Version is date based as year.month[.serial], where serial is used
     # if multiple releases are needed to address build failures.
-    version='2018.7',
+    version='2020.1.post1',
     description='The Sphinx theme for the CPython docs and related projects',
     long_description=long_description,
     author='PyPA',
     author_email='distutils-sig@python.org',
-    url='https://docs.python.org',
+    url='https://github.com/python/python-docs-theme/',
     packages=['python_docs_theme'],
     include_package_data=True,
     entry_points={
