diff --git a/peps/pep-0394.rst b/peps/pep-0394.rst
index f3ffcd7d0..ae6cc22df 100644
--- a/peps/pep-0394.rst
+++ b/peps/pep-0394.rst
@@ -1,7 +1,5 @@
 PEP: 394
 Title: The "python" Command on Unix-Like Systems
-Version: $Revision$
-Last-Modified: $Date$
 Author: Kerrick Staley <mail@kerrickstaley.com>,
         Alyssa Coghlan <ncoghlan@gmail.com>,
         Barry Warsaw <barry@python.org>,
@@ -10,7 +8,6 @@ Author: Kerrick Staley <mail@kerrickstaley.com>,
         Carol Willing <willingc@gmail.com>,
 Status: Active
 Type: Informational
-Content-Type: text/x-rst
 Created: 02-Mar-2011
 Post-History: 04-Mar-2011, 20-Jul-2011, 16-Feb-2012, 30-Sep-2014, 28-Apr-2018,
               26-Jun-2019
@@ -63,11 +60,11 @@ For Python runtime distributors
 * Distributors may choose to set the behavior of the ``python`` command
   as follows:
 
-   * ``python2``,
-   * ``python3``,
-   * not provide ``python`` command,
-   * allow ``python`` to be configurable by an end user or
-     a system administrator.
+  * ``python2``,
+  * ``python3``,
+  * not provide ``python`` command,
+    allow ``python`` to be configurable by an end user or
+    a system administrator.
 
 * The Python 3.x ``idle``, ``pydoc``, and ``python-config`` commands should
   likewise be available as ``idle3``, ``pydoc3``, and ``python3-config``;
@@ -222,7 +219,9 @@ making such a change.
   example, while the change of ``print`` from a statement to a builtin
   function is relatively simple for automated converters to handle, the
   SyntaxError from attempting to use the Python 2 notation in Python 3
-  may be confusing for users that are not aware of the change::
+  may be confusing for users that are not aware of the change:
+
+  .. code-block:: pytb
 
       $ python3 -c 'print "Hello, world!"'
         File "<string>", line 1
@@ -289,7 +288,9 @@ While technically a new feature, the ``make install`` and ``make bininstall``
 command in the 2.7 version of CPython were adjusted to create the
 following chains of symbolic links in the relevant ``bin`` directory (the
 final item listed in the chain is the actual installed binary, preceding
-items are relative symbolic links)::
+items are relative symbolic links):
+
+.. code-block:: text
 
     python -> python2 -> python2.7
     python-config -> python2-config -> python2.7-config
@@ -300,14 +301,18 @@ This feature first appeared in the default installation process in
 CPython 2.7.3.
 
 The installation commands in the CPython 3.x series already create the
-appropriate symlinks. For example, CPython 3.2 creates::
+appropriate symlinks. For example, CPython 3.2 creates:
+
+.. code-block:: text
 
     python3 -> python3.2
     idle3 -> idle3.2
     pydoc3 -> pydoc3.2
     python3-config -> python3.2-config
 
-And CPython 3.3 creates::
+And CPython 3.3 creates:
+
+.. code-block:: text
 
     python3 -> python3.3
     idle3 -> idle3.3
@@ -350,7 +355,7 @@ References
    (https://mail.python.org/pipermail/python-dev/2011-July/112322.html)
 
 .. [3] Implement PEP 394 in the CPython Makefile
-   (http://bugs.python.org/issue12627)
+   (https://github.com/python/cpython/issues/56836)
 
 .. [4] PEP 394 request for pronouncement (python2 symlink in \*nix systems)
    (https://mail.python.org/pipermail/python-dev/2012-February/116435.html)