Commits

Georg Brandl committed 83de16c Merge

merge with 1.0

Comments (0)

Files changed (2)

 
    .. function:: foo(x)
                  foo(y, z)
-      :bar: no
+      :module: some.module.name
 
       Return a line of text input from the user.
 
 ``function`` is the directive name.  It is given two arguments here, the
-remainder of the first line and the second line, as well as one option ``bar``
-(as you can see, options are given in the lines immediately following the
-arguments and indicated by the colons).
+remainder of the first line and the second line, as well as one option
+``module`` (as you can see, options are given in the lines immediately following
+the arguments and indicated by the colons).  Options must be indented to the
+same level as the directive content.
 
 The directive content follows after a blank line and is indented relative to the
 directive start.

sphinx/setup_command.py

         except Exception, err:
             from docutils.utils import SystemMessage
             if isinstance(err, SystemMessage):
-                sys.stderr, darkred('reST markup error:')
+                print >>sys.stderr, darkred('reST markup error:')
                 print >>sys.stderr, err.args[0].encode('ascii',
                                                        'backslashreplace')
             else:
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.