[Python-checkins] cpython (merge 3.3 -> 3.4): merge from 3.3
senthil.kumaran
python-checkins at python.org
Sun Apr 6 20:01:08 CEST 2014
http://hg.python.org/cpython/rev/d1d4bcf87e59
changeset: 90161:d1d4bcf87e59
branch: 3.4
parent: 90150:70990e795657
parent: 90160:b49d990aaa9d
user: Senthil Kumaran <senthil at uthcode.com>
date: Sun Apr 06 11:00:15 2014 -0700
summary:
merge from 3.3
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
More information about the Python-checkins
mailing list