[Python-checkins] cpython (merge 3.3 -> default): merge with 3.3.

[georg.brandl]

http://hg.python.org/cpython/rev/c3549f6c4a6e
changeset:   79403:c3549f6c4a6e
parent:      79401:85b6c1c19cb8
parent:      79402:df7c0f25294c
user:        Georg Brandl <georg at python.org>
date:        Tue Oct 02 10:16:26 2012 +0200
summary:
  merge with 3.3.

files:
  Doc/whatsnew/3.3.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
--- a/Doc/whatsnew/3.3.rst
+++ b/Doc/whatsnew/3.3.rst
@@ -1912,7 +1912,7 @@
 value from the parent thread (:issue:`6064`).
 
 The formerly private function ``_thread.get_ident`` is now available as the
-public function :func:`~threading.get_ident`.  This eliminates several cases of
+public function :func:`threading.get_ident`.  This eliminates several cases of
 direct access to the ``_thread`` module in the stdlib.  Third party code that
 used ``_thread.get_ident`` should likewise be changed to use the new public
 interface.

-- 
Repository URL: http://hg.python.org/cpython