From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Wed, 10 Dec 2014 23:39:45 +0000 (-0500)
Subject: Merge 3.4
X-Git-Tag: v3.5.0a1~349
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e6b2b78a7d2715e5b645825924c575ceff3d4205;p=thirdparty%2FPython%2Fcpython.git

Merge 3.4
---

e6b2b78a7d2715e5b645825924c575ceff3d4205
diff --cc Misc/NEWS
index 36689c0ed2b9,8a6fd245a118..fb80c0b284bc
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -5676,6 -5225,6 +5676,10 @@@ C-AP
  Documentation
  -------------
  
++- Issue #23006: Improve the documentation and indexing of dict.__missing__.
++  Add an entry in the language datamodel special methods section.
++  Revise and index its discussion in the stdtypes mapping/dict section.
++
  - Issue #17701: Improving strftime documentation.
  
  - Issue #18440: Clarify that `hash()` can truncate the value returned from an