diff options
| author | Benjamin Peterson <benjamin@python.org> | 2008-05-26 12:52:02 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2008-05-26 12:52:02 (GMT) |
| commit | 1e2f050a7952823a0cacbf32e2e9ccfc0a50b470 (patch) | |
| tree | 53109300fc016e241c108700c9fab1de26696d11 /Doc/glossary.rst | |
| parent | c5595728af485175d5f9472fcf93e1dc4b3598f2 (diff) | |
| download | cpython-1e2f050a7952823a0cacbf32e2e9ccfc0a50b470.zip cpython-1e2f050a7952823a0cacbf32e2e9ccfc0a50b470.tar.gz cpython-1e2f050a7952823a0cacbf32e2e9ccfc0a50b470.tar.bz2 | |
Merged revisions 63397,63673 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r63397 | benjamin.peterson | 2008-05-16 17:59:28 -0500 (Fri, 16 May 2008) | 2 lines
mention Py3k in glossary
........
r63673 | benjamin.peterson | 2008-05-26 07:29:46 -0500 (Mon, 26 May 2008) | 2 lines
some updates to string formatting section in whatsnew
........
Diffstat (limited to 'Doc/glossary.rst')
| -rw-r--r-- | Doc/glossary.rst | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Doc/glossary.rst b/Doc/glossary.rst index 77e586f..cd8b7ac 100644 --- a/Doc/glossary.rst +++ b/Doc/glossary.rst @@ -371,8 +371,9 @@ Glossary :term:`argument`. Python 3000 - Nickname for the Python 3.x release line (coined long ago when the - release of version 3 was something in the distant future.) + Nickname for the Python 3.x release line (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 |