From: Andrés Delfino <adelfino@gmail.com>
Date: Tue, 22 May 2018 13:37:24 +0000 (-0300)
Subject: [2.7] bpo-33518: Add PEP entry to documentation glossary (GH-6860). (#6936)
X-Git-Tag: v2.7.16rc1~296
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8cbde8a43769641373a681af4b0d72944af43f95;p=thirdparty%2FPython%2Fcpython.git

[2.7] bpo-33518: Add PEP entry to documentation glossary (GH-6860). (#6936)

(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 cbd1237f8e5f..feb40a88bbed 100644
--- a/Doc/glossary.rst
+++ b/Doc/glossary.rst
@@ -625,6 +625,21 @@ Glossary
       :ref:`the difference between arguments and parameters
       <faq-argument-vs-parameter>`, and the :ref:`function` section.
 
+   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`.
+
    positional argument
       See :term:`argument`.