From: Petri Lehtinen <petri@digip.org>
Date: Wed, 15 Feb 2012 20:22:34 +0000 (+0200)
Subject: Merge branch '3.2'
X-Git-Tag: v3.3.0a1~173
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=be2cf338e9baef1f2479a33a8c7b5552bf9bd86f;p=thirdparty%2FPython%2Fcpython.git

Merge branch '3.2'

Issue #13491.
---

be2cf338e9baef1f2479a33a8c7b5552bf9bd86f
diff --cc Misc/NEWS
index faef50aebaac,81ec44b13de1..3aa7e52333ab
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -2254,21 -1455,6 +2254,24 @@@ C-AP
  Documentation
  -------------
  
++- Issue #13491: Fix many errors in sqlite3 documentation. Initial
++  patch 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.