Merge branch '1.8'

(Resolved) Conflicts:
	sphinx/texinputs/sphinxmanual.cls

1 files changed, 1 insertions, 1 deletions

diff --git a/sphinx/ext/apidoc.py b/sphinx/ext/apidoc.py
index d0c87be13..c0c8c6bcb 100644
--- a/sphinx/ext/apidoc.py
+++ b/sphinx/ext/apidoc.py
@@ -336,7 +336,7 @@ Note: By default this script will not overwrite already created files."""))
                         dest='includeprivate',
                         help=__('include "_private" modules'))
     parser.add_argument('--tocfile', action='store', dest='tocfile', default='modules',
-                        help=__("don't create a table of contents file"))
+                        help=__("filename of table of contents (default: modules)"))
     parser.add_argument('-T', '--no-toc', action='store_false', dest='tocfile',
                         help=__("don't create a table of contents file"))
     parser.add_argument('-E', '--no-headings', action='store_true',