- Issue #24351: Clarify what is meant by "identifier" in the context of

  string.Template instances.

diff --cc Doc/library/string.rst
Simple merge

diff --cc Misc/NEWS
index 8be0e137c45e1437fbe1729b772670e8cda2f4d8,b2f49600ac25393607456c0c6e2542aabcc68132..2b02f1ded2eb6f052bc0a44e8d7da888c45fe0cf
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -2,54 -2,10 +2,60 @@@
  Python News
  +++++++++++
  
 -What's New in Python 3.4.4rc1?
 -==============================
 +What's New in Python 3.5.0 beta 3?
 +==================================
 +
 +Release date: 2015-07-05
 +
 +Core and Builtins
 +-----------------
 +
 +- Issue #24345: Add Py_tp_finalize slot for the stable ABI.
 +
 +Library
 +-------
 +
 +- Issue #24408: Fixed AttributeError in measure() and metrics() methods of
 +  tkinter.Font.
 +
 +- Issue #14373: C implementation of functools.lru_cache() now can be used with
 +  methods.
 +
 +- Issue #8232: webbrowser support incomplete on Windows. Patch by Brandon
 +  Milam
 +
 +- Issue #24347: Set KeyError if PyDict_GetItemWithError returns NULL.
 +
 +- Issue #24348: Drop superfluous incref/decref.
 +
 +- Issue #24359: Check for changed OrderedDict size during iteration.
 +
 +- Issue #24368: Support keyword arguments in OrderedDict methods.
 +
 +- Issue #24362: Simplify the C OrderedDict fast nodes resize logic.
 +
 +- Issue #24377: Fix a ref leak in OrderedDict.__repr__.
 +
 +- Issue #24369: Defend against key-changes during iteration.
 +
 +Tests
 +-----
 +
 +- Issue #24373: _testmultiphase and xxlimited now use tp_traverse and
 +  tp_finalize to avoid reference leaks encountered when combining tp_dealloc
 +  with PyType_FromSpec (see issue #16690 for details)
 +
++Documentation
++-------------
++
++- Issue #24351: Clarify what is meant by "identifier" in the context of
++  string.Template instances.
++
 +
 +What's New in Python 3.5.0 beta 2?
 +==================================
  
 -Release date: tba
 +Release date: 2015-05-31
  
  Core and Builtins
  -----------------