1. Georg Brandl
  2. sphinx
  3. Pull requests

Pull requests

#236 Merged at ba5386d
Repository
westurner
Branch
apidoc_output_order
Repository
birkenfeld
Branch
default

#1456: apidoc: Add a -M option to put module documentation before submodule documentation

Author
  1. Wes Turner
Reviewers
Description

1456

Comments (5)

  1. Takayuki Shimizukawa

    we need a extra line as Wes Turner mentioned in his mail:

    diff -r c171d4eef221 sphinx/apidoc.py
    --- a/sphinx/apidoc.py  Sat Apr 19 19:08:41 2014 -0500
    +++ b/sphinx/apidoc.py  Wed Apr 23 09:51:40 2014 +0300
    @@ -98,6 +98,7 @@
    
         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))]