summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2018-06-15 20:58:15 -0700
committerGitHub <noreply@github.com>2018-06-15 20:58:15 -0700
commit80c51c4737c6bb51dd76d2ab6c5f7ea75bf118f2 (patch)
tree3f49a2da7e10a8bd46329226b40f7ed06217db39
parentbb3b3655881c071b62f5c2d87b88b769bcad10ad (diff)
downloadcpython-git-80c51c4737c6bb51dd76d2ab6c5f7ea75bf118f2.tar.gz
bpo-33571: Improve the glossary description for '...' prompt (GH-6971)
Mention that it can be triggered by triple quotes and after specifying decorators. (cherry picked from commit 68680035143a3a6398faa88f067f244c74691d19) Co-authored-by: Andrés Delfino <adelfino@gmail.com>
-rw-r--r--Doc/glossary.rst5
1 files changed, 3 insertions, 2 deletions
diff --git a/Doc/glossary.rst b/Doc/glossary.rst
index 4413221de7..34c71c6f3e 100644
--- a/Doc/glossary.rst
+++ b/Doc/glossary.rst
@@ -14,8 +14,9 @@ Glossary
``...``
The default Python prompt of the interactive shell when entering code for
- an indented code block or within a pair of matching left and right
- delimiters (parentheses, square brackets or curly braces).
+ an indented code block, when within a pair of matching left and right
+ delimiters (parentheses, square brackets, curly braces or triple quotes),
+ or after specifying a decorator.
2to3
A tool that tries to convert Python 2.x code to Python 3.x code by