diff --git a/hypothesis-python/docs/changes.rst b/hypothesis-python/docs/changes.rst
index 8f44d585f4..6567b4bdfb 100644
--- a/hypothesis-python/docs/changes.rst
+++ b/hypothesis-python/docs/changes.rst
@@ -4,7 +4,7 @@ Changelog
This is a record of all past Hypothesis releases and what went into them,
in reverse chronological order. All previous releases should still be available
-on `PyPI `__.
+:pypi:`on PyPI `.
Hypothesis 6.x
@@ -5468,7 +5468,7 @@ This patch updates some docstrings, but has no runtime changes.
This release adds ``exclude_min`` and ``exclude_max`` arguments to
:func:`~hypothesis.strategies.floats`, so that you can easily generate values from
-`open or half-open intervals `_
+:wikipedia:`open or half-open intervals `
(:issue:`1622`).
.. _v4.4.6:
diff --git a/hypothesis-python/docs/community.rst b/hypothesis-python/docs/community.rst
index a93e3380e4..e316ec9495 100644
--- a/hypothesis-python/docs/community.rst
+++ b/hypothesis-python/docs/community.rst
@@ -13,7 +13,7 @@ Feel free to use these to ask for help, provide feedback, or discuss anything re
Hypothesis related at all. If you post a question on Stack Overflow, please use the
`python-hypothesis `__ tag!
-Please note that `the Hypothesis code of conduct `_
+Please note that :gh-file:`the Hypothesis code of conduct `
applies in all Hypothesis community spaces.
If you would like to cite Hypothesis, please consider :gh-file:`our suggested citation `.
diff --git a/hypothesis-python/docs/django.rst b/hypothesis-python/docs/django.rst
index b5f2ea5234..a29597e779 100644
--- a/hypothesis-python/docs/django.rst
+++ b/hypothesis-python/docs/django.rst
@@ -41,8 +41,8 @@ a strategy for Django models:
.. autofunction:: hypothesis.extra.django.from_model
-For example, using `the trivial django project we have for testing
-`_:
+For example, using :gh-file:`the trivial django project we have for testing
+`:
.. code-block:: pycon
diff --git a/hypothesis-python/docs/quickstart.rst b/hypothesis-python/docs/quickstart.rst
index ef74d4baf0..916694bf92 100644
--- a/hypothesis-python/docs/quickstart.rst
+++ b/hypothesis-python/docs/quickstart.rst
@@ -9,9 +9,8 @@ Hypothesis.
An example
----------
-Suppose we've written a `run length encoding
-`_ system and we want to test
-it out.
+Suppose we've written a :wikipedia:`run length encoding `
+system and we want to test it out.
We have the following code which I took straight from the
`Rosetta Code `_ wiki (OK, I
diff --git a/hypothesis-python/docs/supported.rst b/hypothesis-python/docs/supported.rst
index 9290907b20..1ffd6132a8 100644
--- a/hypothesis-python/docs/supported.rst
+++ b/hypothesis-python/docs/supported.rst
@@ -98,6 +98,6 @@ Regularly verifying this
------------------------
Everything mentioned above as explicitly supported is checked on every commit
-with `GitHub Actions `__.
+with :gh-file:`GitHub Actions `.
Our continuous delivery pipeline runs all of these checks before publishing
each release, so when we say they're supported we really mean it.
diff --git a/hypothesis-python/docs/usage.rst b/hypothesis-python/docs/usage.rst
index f6352159e8..84286568fd 100644
--- a/hypothesis-python/docs/usage.rst
+++ b/hypothesis-python/docs/usage.rst
@@ -8,8 +8,7 @@ The only inclusion criterion right now is that if it's a Python library
then it should be available on PyPI.
You can find hundreds more from `the Hypothesis page at libraries.io
-`_, and `thousands on GitHub
-`_.
+`_, and :gh-file:`thousands on GitHub `.
Hypothesis has `over 100,000 downloads per week `__,
and was used by `more than 4% of Python users surveyed by the PSF in 2020
`__.