Merge branch 'master' into fix_889_and_non-ascii_in_setup.cfg_take_2

docs/_templates/indexsidebar.html

@@ -5,11 +5,11 @@
 
 <h3>Questions? Suggestions? Contributions?</h3>
 
-<p>Visit the <a href="https://github.com/pypa/setuptools">Setuptools project page</a> </p>
+<p>Visit the <a href="{{ package_url }}">Project page</a> </p>
 
 <h3 class="donation">Professional support</h3>
 
 <p>
 Professionally-supported {{ project }} is available with the
-<a href="https://tidelift.com/subscription/pkg/pypi-setuptools?utm_source=pypi-setuptools&utm_medium=readme">Tidelift Subscription</a>.
+<a href="https://tidelift.com/subscription/pkg/pypi-{{ project }}?utm_source=pypi-{{ project }}&utm_medium=readme">Tidelift Subscription</a>.
 </p>

docs/requirements.txt

 sphinx!=1.8.0
 rst.linker>=1.9
-jaraco.packaging>=3.2
+jaraco.packaging>=6.1
 
 setuptools>=34