diff options
| -rw-r--r-- | CHANGES | 2 | ||||
| -rw-r--r-- | sphinx/apidoc.py | 1 |
2 files changed, 3 insertions, 0 deletions
@@ -34,6 +34,8 @@ New features * Prompt for the document language in sphinx-quickstart. * PR#217: Added config values to suppress UUID and location information in generated gettext catalogs. +* PR#236, #1456: apidoc: Add a -M option to put module documentation before + submodule documentation. Thanks to Wes Turner and Luc Saffre. Bugs fixed ---------- diff --git a/sphinx/apidoc.py b/sphinx/apidoc.py index 487e2efe..874fe4b2 100644 --- a/sphinx/apidoc.py +++ b/sphinx/apidoc.py @@ -98,6 +98,7 @@ def create_package_file(root, master_package, subroot, py_files, opts, subs): if opts.modulefirst: text += format_directive(subroot, master_package) + text += '\n' # build a list of directories that are szvpackages (contain an INITPY file) subs = [sub for sub in subs if path.isfile(path.join(root, sub, INITPY))] |