diff --git a/peps/pep-0654.rst b/peps/pep-0654.rst
index 113f657fc..b2b183a32 100644
--- a/peps/pep-0654.rst
+++ b/peps/pep-0654.rst
@@ -1,15 +1,22 @@
 PEP: 654
 Title: Exception Groups and except*
-Author: Irit Katriel <iritkatriel@gmail.com>,
+Author: Irit Katriel <irit@python.org>,
         Yury Selivanov <yury@edgedb.com>,
         Guido van Rossum <guido@python.org>
-Status: Accepted
+Discussions-To: https://discuss.python.org/t/accepting-pep-654-exception-groups-and-except/10813
+Status: Final
 Type: Standards Track
 Content-Type: text/x-rst
 Created: 22-Feb-2021
 Python-Version: 3.11
-Post-History: 22-Feb-2021, 20-Mar-2021
+Post-History: `22-Feb-2021 <https://mail.python.org/archives/list/python-dev@python.org/thread/L5Q27DVKOKZCDNCAWRIQVOZ5DZCZHLRM/>`__,
+              `20-Mar-2021 <https://mail.python.org/archives/list/python-dev@python.org/thread/MQ2UCSQ2ZC4FIGT7KSVI6BJA4FCXSOCL/>`__,
+              `03-Oct-2021 <https://mail.python.org/archives/list/python-dev@python.org/thread/4B256YKUPW5P2M44GG5H6FBL3PSV6ODP/>`__,
+Resolution: https://discuss.python.org/t/accepting-pep-654-exception-groups-and-except/10813/1
 
+.. canonical-doc:: :ref:`python:lib-exception-groups` and :ref:`python:except_star`
+
+   See :ref:`python:tut-exception-groups` for a user-focused tutorial.
 
 Abstract
 ========
diff --git a/peps/pep-0678.rst b/peps/pep-0678.rst
index 140cef283..0e27b0245 100644
--- a/peps/pep-0678.rst
+++ b/peps/pep-0678.rst
@@ -3,15 +3,18 @@ Title: Enriching Exceptions with Notes
 Author: Zac Hatfield-Dodds <zac@zhd.dev>
 Sponsor: Irit Katriel
 Discussions-To: https://discuss.python.org/t/pep-678-enriching-exceptions-with-notes/13374
-Status: Accepted
+Status: Final
 Type: Standards Track
 Content-Type: text/x-rst
 Requires: 654
 Created: 20-Dec-2021
 Python-Version: 3.11
-Post-History: 27-Jan-2022
+Post-History: `27-Jan-2022 <https://discuss.python.org/t/pep-678-enriching-exceptions-with-notes/13374>`__
 Resolution: https://discuss.python.org/t/pep-678-enriching-exceptions-with-notes/13374/100
 
+.. canonical-doc:: :meth:`python:BaseException.add_note` and :attr:`python:BaseException.__notes__`
+
+   See :ref:`python:tut-exception-notes` for a user-focused tutorial.
 
 Abstract
 ========
diff --git a/peps/pep-0680.rst b/peps/pep-0680.rst
index 97e250d15..d709d4fdb 100644
--- a/peps/pep-0680.rst
+++ b/peps/pep-0680.rst
@@ -3,14 +3,16 @@ Title: tomllib: Support for Parsing TOML in the Standard Library
 Author: Taneli Hukkinen, Shantanu Jain <hauntsaninja at gmail.com>
 Sponsor: Petr Viktorin <encukou@gmail.com>
 Discussions-To: https://discuss.python.org/t/13040
-Status: Accepted
+Status: Final
 Type: Standards Track
 Content-Type: text/x-rst
 Created: 01-Jan-2022
 Python-Version: 3.11
-Post-History: 11-Jan-2022
+Post-History: `09-Dec-2021 <https://mail.python.org/archives/list/python-ideas@python.org/thread/IWJ3I32A4TY6CIVQ6ONPEBPWP4TOV2V7/>`__,
+              `27-Jan-2022 <https://discuss.python.org/t/pep-680-tomllib-support-for-parsing-toml-in-the-standard-library/13040>`__,
 Resolution: https://mail.python.org/archives/list/python-dev@python.org/thread/3AHGWYY562HHO55L4Z2OVYUFZP5W73IS/
 
+.. canonical-doc:: :mod:`python:tomllib`
 
 Abstract
 ========
diff --git a/peps/pep-0707.rst b/peps/pep-0707.rst
index eb1ad75b0..6e54b6111 100644
--- a/peps/pep-0707.rst
+++ b/peps/pep-0707.rst
@@ -1,6 +1,6 @@
 PEP: 707
 Title: A simplified signature for __exit__ and __aexit__
-Author: Irit Katriel <iritkatriel@gmail.com>
+Author: Irit Katriel <irit@python.org>
 Discussions-To: https://discuss.python.org/t/24402
 Status: Rejected
 Type: Standards Track