diff options
| author | Senthil Kumaran <senthil@uthcode.com> | 2014-04-06 18:00:15 (GMT) |
|---|---|---|
| committer | Senthil Kumaran <senthil@uthcode.com> | 2014-04-06 18:00:15 (GMT) |
| commit | 6d6ec25e043230a8b97b2773f4b50c1495393b0d (patch) | |
| tree | dcd82a7f6ed2f718da0e3769e52390aee50085e7 | |
| parent | 69598d4ccfa250ab49fc417f8e66f384ea2b0767 (diff) | |
| parent | f5c34054f9ea1fbdaeafdcf1a6f17f64f4dfed63 (diff) | |
| download | cpython-6d6ec25e043230a8b97b2773f4b50c1495393b0d.zip cpython-6d6ec25e043230a8b97b2773f4b50c1495393b0d.tar.gz cpython-6d6ec25e043230a8b97b2773f4b50c1495393b0d.tar.bz2 | |
merge from 3.3
| -rw-r--r-- | Doc/library/trace.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/trace.rst b/Doc/library/trace.rst index 1e3f5c3..b0ac812 100644 --- a/Doc/library/trace.rst +++ b/Doc/library/trace.rst @@ -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 |