[Python-checkins] cpython (merge 3.4 -> default): merge from 3.4

[senthil.kumaran]

http://hg.python.org/cpython/rev/b466fd273625
changeset:   90162:b466fd273625
parent:      90158:e56c71c6b45e
parent:      90161:d1d4bcf87e59
user:        Senthil Kumaran <senthil at uthcode.com>
date:        Sun Apr 06 11:00:49 2014 -0700
summary:
  merge from 3.4

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


diff --git a/Doc/library/trace.rst b/Doc/library/trace.rst
--- a/Doc/library/trace.rst
+++ b/Doc/library/trace.rst
@@ -41,8 +41,8 @@
 
 At least one of the following options must be specified when invoking
 :mod:`trace`.  The :option:`--listfuncs <-l>` option is mutually exclusive with
-the :option:`--trace <-t>` and :option:`--counts <-c>` options. When
-:option:`--listfuncs <-l>` is provided, neither :option:`--counts <-c>` nor
+the :option:`--trace <-t>` and :option:`--count <-c>` options. When
+:option:`--listfuncs <-l>` is provided, neither :option:`--count <-c>` nor
 :option:`--trace <-t>` are accepted, and vice versa.
 
 .. program:: trace

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