From: Petri Lehtinen <petri@digip.org>
Date: Thu, 16 Feb 2012 19:43:41 +0000 (+0200)
Subject: Merge branch '3.2'
X-Git-Tag: v3.3.0a1~161^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=17f1be63681c921a82f2dd9dd44e0305e46b4733;p=thirdparty%2FPython%2Fcpython.git

Merge branch '3.2'

Closes #13995.
---

17f1be63681c921a82f2dd9dd44e0305e46b4733
diff --cc Misc/NEWS
index a1810aee71e2,9c6485576b42..73bfd5b5e73e
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -2258,24 -1459,6 +2258,24 @@@ C-AP
  Documentation
  -------------
  
- - Issue #13491: Fix many errors in sqlite3 documentation. Initial
-   patch by Johannes Vogel.
++- Issues #13491 and #13995: Fix many errors in sqlite3 documentation.
++  Initial patch for #13491 by Johannes Vogel.
 +
 +- Issue #13402: Document absoluteness of sys.executable.
 +
 +- Issue #13883: PYTHONCASEOK also works on OS X.
 +
 +- Issue #12949: Document the kwonlyargcount argument for the PyCode_New
 +  C API function.
 +
 +- Issue #13513: Fix io.IOBase documentation to correctly link to the
 +  io.IOBase.readline method instead of the readline module.
 +
 +- Issue #13237: Reorganise subprocess documentation to emphasise convenience
 +  functions and the most commonly needed arguments to Popen.
 +
 +- Issue #13141: Demonstrate recommended style for socketserver examples.
 +
  - Issue #11818: Fix tempfile examples for Python 3.