Anonymous avatar Anonymous committed f6e4d31 Draft Merge

Pulling in changes from birkenfeld branch

Comments (0)

Files changed (3)

sphinx/builders/gettext.py

 
                     # generate "#: file1:line1 file2:line2 ..."
                     pofile.write(u"#: %s\n" % ", ".join("%s:%s" %
-                        (path.relpath(source, self.srcdir), line)
+                        (path.relpath(source, self.outdir), line)
                         for source, line, _ in positions))
                     # generate "# uuid1\n# uuid2\n ..."
                     pofile.write(u"# %s\n" % "\n# ".join(uid for _, _, uid

sphinx/ext/graphviz.py

     # The object tag works fine on Firefox and WebKit
     # Besides it's a hack, this strategy does not mess with templates.
     imgcss = imgcls and ' class="%s"' % imgcls or ''
-    return '<object type="image/svg+xml" data="%s"%s%s/>\n' % \
+    return '<object type="image/svg+xml" data="%s"%s%s></object>\n' % \
            (svgref, imgcss, style)
 
 

sphinx/writers/manpage.py

     def visit_admonition(self, node, name=None):
         if name:
             self.body.append('.IP %s\n' %
-                             admonitionlabels.get(name, name))
+                             self.deunicode(admonitionlabels.get(name, name)))
 
     def visit_productionlist(self, node):
         self.ensure_eol()
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.