summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2008-05-16 22:59:28 (GMT)
committerBenjamin Peterson <benjamin@python.org>2008-05-16 22:59:28 (GMT)
commit518c44cecf3df7312cda8b15d0c44dce00ff9467 (patch)
treeb2c38ebf0fc215002111d6d054c6d9eaa7fbaf0f /Doc
parentee130b72f897dc90b51b2ff78df1eedfde483f5e (diff)
downloadcpython-518c44cecf3df7312cda8b15d0c44dce00ff9467.zip
cpython-518c44cecf3df7312cda8b15d0c44dce00ff9467.tar.gz
cpython-518c44cecf3df7312cda8b15d0c44dce00ff9467.tar.bz2
mention Py3k in glossary
Diffstat (limited to 'Doc')
-rw-r--r--Doc/glossary.rst7
1 files changed, 4 insertions, 3 deletions
diff --git a/Doc/glossary.rst b/Doc/glossary.rst
index 16215d2..8ce622d 100644
--- a/Doc/glossary.rst
+++ b/Doc/glossary.rst
@@ -388,9 +388,10 @@ Glossary
definition), or pass several arguments as a list to a function. See
:term:`argument`.
- Python 3000
- Nickname for the next major Python version, 3.0 (coined long ago when the
- release of version 3 was something in the distant future.)
+ Python 3000
+ Nickname for the next major Python version, 3.0 (coined long ago
+ when the release of version 3 was something in the distant future.) This
+ is also abbreviated "Py3k".
Pythonic
An idea or piece of code which closely follows the most common idioms of