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
........
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 @@
: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