From 3aa9d67974de95fcdfbb6eac4005257ff9a62f05 Mon Sep 17 00:00:00 2001
From: "C.A.M. Gerlach" <CAM.Gerlach@Gerlach.CAM>
Date: Mon, 21 Feb 2022 20:20:29 -0600
Subject: [PATCH] PEP 1: Clarify that reST is the default & no plaintext PEPs
 remain

---
 pep-0001.txt          | 14 ++++++--------
 pep-0012/pep-NNNN.rst |  1 +
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/pep-0001.txt b/pep-0001.txt
index 9e491b2f04e8..fbcaaa0e0270 100644
--- a/pep-0001.txt
+++ b/pep-0001.txt
@@ -205,8 +205,8 @@ The standard PEP workflow is:
   * The title accurately describes the content.
   * The PEP's language (spelling, grammar, sentence structure, etc.)
     and code style (examples should match :pep:`7` & :pep:`8`) should be
-    correct and conformant.  The PEP text will be automatically checked for 
-    correct reStructuredText formatting when the pull request is submitted. 
+    correct and conformant.  The PEP text will be automatically checked for
+    correct reStructuredText formatting when the pull request is submitted.
     PEPs with invalid reST markup will not be approved.
 
   Editors are generally quite lenient about this initial review,
@@ -547,7 +547,7 @@ optional and are described below.  All other headers are required.
     Status: <Draft | Active | Accepted | Provisional | Deferred | Rejected |
              Withdrawn | Final | Superseded>
     Type: <Standards Track | Informational | Process>
-  * Content-Type: <text/x-rst | text/plain>
+  * Content-Type: text/x-rst
   * Requires: <pep numbers>
     Created: <date created on, in dd-mmm-yyyy format>
   * Python-Version: <version number>
@@ -603,11 +603,9 @@ The Type header specifies the type of PEP: Standards Track,
 Informational, or Process.
 
 The format of a PEP is specified with a Content-Type header.
-Valid values are ``text/plain`` for plaintext PEPs (see :pep:`9`)
-and ``text/x-rst`` for reStructuredText PEPs (see :pep:`12`).
-All new and active PEPs must use reStructuredText, but for backwards
-compatibility, plain text is currently still the default if no
-Content-Type header is present.
+All PEPs now use reStructuredText (see :pep:`12`),
+and have a value of ``text/x-rst``, the default.
+Previously, plaintext PEPs used ``text/plain`` (see :pep:`9`).
 
 The Created header records the date that the PEP was assigned a
 number, while Post-History is used to record the dates of when new
diff --git a/pep-0012/pep-NNNN.rst b/pep-0012/pep-NNNN.rst
index 0ced89b223db..fd2884867f42 100644
--- a/pep-0012/pep-NNNN.rst
+++ b/pep-0012/pep-NNNN.rst
@@ -6,6 +6,7 @@ PEP-Delegate: <PEP delegate's real name>
 Discussions-To: <email address or URL>
 Status: <REQUIRED: Draft | Active | Accepted | Provisional | Deferred | Rejected | Withdrawn | Final | Superseded>
 Type: <REQUIRED: Standards Track | Informational | Process>
+Content-Type: text/x-rst
 Requires: <pep numbers>
 Created: <date created on, in dd-mmm-yyyy format>
 Python-Version: <version number>