[Python-checkins] cpython (merge default -> default): Merge heads

[serhiy.storchaka]

https://hg.python.org/cpython/rev/81d1481bc094
changeset:   93467:81d1481bc094
parent:      93466:2b27ffe611f3
parent:      93465:524a004e93dd
user:        Serhiy Storchaka <storchaka at gmail.com>
date:        Tue Nov 11 09:45:55 2014 +0200
summary:
  Merge heads

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


diff --git a/Doc/library/tracemalloc.rst b/Doc/library/tracemalloc.rst
--- a/Doc/library/tracemalloc.rst
+++ b/Doc/library/tracemalloc.rst
@@ -435,7 +435,7 @@
       Compute the differences with an old snapshot. Get statistics as a sorted
       list of :class:`StatisticDiff` instances grouped by *group_by*.
 
-      See the :meth:`statistics` method for *group_by* and *cumulative*
+      See the :meth:`Snapshot.statistics` method for *group_by* and *cumulative*
       parameters.
 
       The result is sorted from the biggest to the smallest by: absolute value

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