From e3a44f348f2fd52ac4231018be5497d0250fbf4e Mon Sep 17 00:00:00 2001
From: CAM Gerlach <CAM.Gerlach@Gerlach.CAM>
Date: Fri, 4 Mar 2022 09:47:20 -0600
Subject: [PATCH] PEP 12: Update whitespace conventions to match current
 practice (#2374)

---
 pep-0012.rst          | 27 +++------------------------
 pep-0012/pep-NNNN.rst | 11 -----------
 2 files changed, 3 insertions(+), 35 deletions(-)

diff --git a/pep-0012.rst b/pep-0012.rst
index e8d45c080d2..3a9de4ff79f 100644
--- a/pep-0012.rst
+++ b/pep-0012.rst
@@ -143,9 +143,6 @@ directions below.
 - Update your Footnotes section, listing any footnotes and
   non-inline link targets referenced by the text.
 
-- Leave the Emacs stanza at the end of this file alone, including the
-  formfeed character ("^L", or ``\f``).
-
 - Create a pull request against the https://github.com/python/peps
   repository.
 
@@ -185,14 +182,9 @@ illustrate the plaintext markup.
 General
 -------
 
-You must adhere to the Emacs convention of adding two spaces at the
-end of every sentence.  You should fill your paragraphs to column 70,
-but under no circumstances should your lines extend past column 79.
-If your code samples spill over column 79, you should rewrite them.
-
-Tab characters must never appear in the document at all.  A PEP should
-include the standard Emacs stanza included by example at the bottom of
-this PEP.
+Lines should usually not extend past column 79,
+excepting URLs and similar circumstances.
+Tab characters must never appear in the document at all.
 
 
 Section Headings
@@ -606,8 +598,6 @@ visible in the processed document.  For example:
         This section should be updated in the final PEP.
         Ensure the date is accurate.
 
-The Emacs stanza at the bottom of this document is inside a comment.
-
 
 Escaping Mechanism
 ------------------
@@ -690,14 +680,3 @@ Copyright
 
 This document is placed in the public domain or under the
 CC0-1.0-Universal license, whichever is more permissive.
-
-
-
-..
-   Local Variables:
-   mode: indented-text
-   indent-tabs-mode: nil
-   sentence-end-double-space: t
-   fill-column: 70
-   coding: utf-8
-   End:
diff --git a/pep-0012/pep-NNNN.rst b/pep-0012/pep-NNNN.rst
index f5de0835314..43c119d6e27 100644
--- a/pep-0012/pep-NNNN.rst
+++ b/pep-0012/pep-NNNN.rst
@@ -87,14 +87,3 @@ Copyright
 
 This document is placed in the public domain or under the
 CC0-1.0-Universal license, whichever is more permissive.
-
-
-
-..
-    Local Variables:
-    mode: indented-text
-    indent-tabs-mode: nil
-    sentence-end-double-space: t
-    fill-column: 70
-    coding: utf-8
-    End: