diff --git a/pep-0001.txt b/pep-0001.txt
index 049dbab5be5..ea82bcdf778 100644
--- a/pep-0001.txt
+++ b/pep-0001.txt
@@ -423,7 +423,6 @@ to development practices and other details. The precise process followed in
 these cases will depend on the nature and purpose of the PEP being updated.
 
 
-
 What belongs in a successful PEP?
 =================================
 
@@ -785,18 +784,16 @@ Footnotes
 =========
 
 .. [1] This historical record is available by the normal git commands
-   for retrieving older revisions, and can also be browsed via HTTP here:
-   https://github.com/python/peps
+   for retrieving older revisions, and can also be browsed
+   `on GitHub <https://github.com/python/peps>`__.
 
 .. [2] More details on the PEP rendering and publication process can be found
-   in the PEPs repo README at
-   https://github.com/python/peps/blob/main/README.rst
+   in the `PEPs repo README
+   <https://github.com/python/peps/blob/main/README.rst>`__.
 
-.. _.github/CODEOWNERS:
-   https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
+.. _.github/CODEOWNERS: https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
 
-.. _issue tracker:
-   https://bugs.python.org/
+.. _issue tracker: https://bugs.python.org/
 
 .. _CC0-1.0-Universal: https://choosealicense.com/licenses/cc0-1.0/
 
diff --git a/pep-0012.rst b/pep-0012.rst
index d211cd05b8c..bef14de51b8 100644
--- a/pep-0012.rst
+++ b/pep-0012.rst
@@ -26,8 +26,9 @@ Note: if you are reading this PEP via the web, you should first grab
 the text (reStructuredText) source of this PEP in order to complete
 the steps below.  **DO NOT USE THE HTML FILE AS YOUR TEMPLATE!**
 
-The source for this (or any) PEP can be found in the PEPs repository,
-viewable on the web at https://github.com/python/peps/ .
+The source for this (or any) PEP can be found in the
+`PEPs repository <https://github.com/python/peps/>`_,
+as well as via a link at the bottom of each PEP.
 
 
 Rationale
@@ -680,15 +681,15 @@ thoroughness, please see:
 
 * `A ReStructuredText Primer`__, a gentle introduction.
 
-  __ http://docutils.sourceforge.net/docs/rst/quickstart.html
+  __ https://docutils.sourceforge.io/docs/user/rst/quickstart.html
 
 * `Quick reStructuredText`__, a users' quick reference.
 
-  __ http://docutils.sourceforge.net/docs/rst/quickref.html
+  __ https://docutils.sourceforge.io/docs/user/rst/quickref.html
 
 * `reStructuredText Markup Specification`__, the final authority.
 
-  __ http://docutils.sourceforge.net/spec/rst/reStructuredText.html
+  __ https://docutils.sourceforge.io/docs/ref/rst/restructuredtext.html
 
 The processing of reStructuredText PEPs is done using Docutils_.  If
 you have a question or require assistance with reStructuredText or
@@ -696,11 +697,11 @@ Docutils, please `post a message`_ to the `Docutils-users mailing
 list`_.  The `Docutils project web site`_ has more information.
 
 .. _Docutils:
-.. _Docutils project web site: http://docutils.sourceforge.net/
+.. _Docutils project web site: https://docutils.sourceforge.io/
 .. _post a message:
    mailto:docutils-users@lists.sourceforge.net?subject=PEPs
 .. _Docutils-users mailing list:
-   http://docutils.sf.net/docs/user/mailing-lists.html#docutils-users
+   https://docutils.sourceforge.io/docs/user/mailing-lists.html#docutils-users
 
 
 Copyright
diff --git a/pep0/constants.py b/pep0/constants.py
index 108710d0927..3f48dd488b1 100644
--- a/pep0/constants.py
+++ b/pep0/constants.py
@@ -21,14 +21,14 @@
 
 intro = """\
 This PEP contains the index of all Python Enhancement Proposals,
-known as PEPs.  PEP numbers are assigned by the PEP editors[1_], and
-once assigned are never changed.  The version control history [2_] of
-the PEP texts represent their historical record.
+known as PEPs.  PEP numbers are :pep:`assigned <1#pep-editors>` by the
+PEP editors, and once assigned are never changed.
+The `version control history`_ of the PEP texts represent
+their historical record.
 """
 
 references = """\
-.. [1] PEP 1: PEP Purpose and Guidelines
-.. [2] View PEP history online: https://github.com/python/peps
+.. _version control history: https://github.com/python/peps
 """
 
 footer = """\