From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Mon, 20 May 2013 05:14:14 +0000 (+0300)
Subject: #14097: merge with 3.3.
X-Git-Tag: v3.4.0a1~675
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=93c6770c7202ea8c123a1d04e76be1007584697e;p=thirdparty%2FPython%2Fcpython.git

#14097: merge with 3.3.
---

93c6770c7202ea8c123a1d04e76be1007584697e
diff --cc Misc/NEWS
index da81c3b0bf34,5d9494781fe3..1c54d33f5c99
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -323,9 -283,6 +323,11 @@@ Test
  Documentation
  -------------
  
++- Issue #14097: improve the "introduction" page of the tutorial.
++
 +- Issue #17977: The documentation for the cadefault argument's default value
 +  in urllib.request.urlopen() is fixed to match the code.
 +
  - Issue #15940: Specify effect of locale on time functions.
  
  - Issue #6696: add documentation for the Profile objects, and improve