mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge from 3.3

This commit is contained in:
Senthil Kumaran 2014-04-06 11:00:15 -07:00
parent 69598d4ccf f5c34054f9
commit 6d6ec25e04
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Doc/library/trace.rst
View File

@ -41,8 +41,8 @@ Main options
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