diff -r 752b59a9b9cd Lib/trace.py
--- a/Lib/trace.py	Mon Jul 27 16:48:42 2015 +0300
+++ b/Lib/trace.py	Tue Aug 04 13:50:01 2015 -0700
@@ -84,7 +84,7 @@
 --help                Display this help then exit.
 --version             Output version information then exit.
 
-Otherwise, exactly one of the following three options must be given:
+Otherwise, at least one of the following options must be given:
 -t, --trace           Print each line to sys.stdout before it is executed.
 -c, --count           Count the number of times each line is executed
                       and write the counts to <module>.cover for each
@@ -92,7 +92,8 @@
                       See also `--coverdir', `--file', `--no-report' below.
 -l, --listfuncs       Keep track of which functions are executed at least
                       once and write the results to sys.stdout after the
-                      program exits.
+                      program exits. Cannot be specified alongside `--trace`
+                      or `--count`.
 -T, --trackcalls      Keep track of caller/called pairs and write the
                       results to sys.stdout after the program exits.
 -r, --report          Generate a report from a counts file; do not execute