From: Andrés Delfino <adelfino@gmail.com>
Date: Fri, 18 May 2018 23:44:21 +0000 (-0300)
Subject: [3.6] bpo-33518: Add PEP entry to documentation glossary (GH-6860) (#6935)
X-Git-Tag: v3.6.6rc1~120
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fb5d0aa116125dfb29a3c4d8819a38dfb2760bb9;p=python

[3.6] bpo-33518: Add PEP entry to documentation glossary (GH-6860) (#6935)

(cherry picked from commit d5f144260886959c1fe06bc4506a23fd10f92348)

Co-authored-by: Andrés Delfino <adelfino@gmail.com>
---

diff --git a/Doc/glossary.rst b/Doc/glossary.rst
index aa5f47ed99..425ab81a90 100644
--- a/Doc/glossary.rst
+++ b/Doc/glossary.rst
@@ -829,6 +829,21 @@ Glossary
       :class:`str` or :class:`bytes` result instead, respectively. Introduced
       by :pep:`519`.
 
+   PEP
+      Python Enhancement Proposal. A PEP is a design document
+      providing information to the Python community, or describing a new
+      feature for Python or its processes or environment. PEPs should
+      provide a concise technical specification and a rationale for proposed
+      features.
+
+      PEPs are intended to be the primary mechanisms for proposing major new
+      features, for collecting community input on an issue, and for documenting
+      the design decisions that have gone into Python. The PEP author is
+      responsible for building consensus within the community and documenting
+      dissenting opinions.
+
+      See :pep:`1`.
+
    portion
       A set of files in a single directory (possibly stored in a zip file)
       that contribute to a namespace package, as defined in :pep:`420`.