diff options
| author | Georg Brandl <georg@python.org> | 2012-02-18 08:04:31 +0100 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2012-02-18 08:04:31 +0100 |
| commit | 78d3102d2cf549353f67acde6a7b9a713d1f84cb (patch) | |
| tree | 3090df0aefaa240bf17e393bd2a72e3404c7963d | |
| parent | 1f51e496377381a065e46f520cdddb2a3f3bfb1f (diff) | |
| parent | 7aa61c5da86d54ecae80509b88e0db315c366774 (diff) | |
| download | sphinx-78d3102d2cf549353f67acde6a7b9a713d1f84cb.tar.gz | |
Merged in rolmei/sphinx-epub (pull request #42)
| -rw-r--r-- | doc/config.rst | 2 | ||||
| -rw-r--r-- | sphinx/cmdline.py | 3 | ||||
| -rw-r--r-- | sphinx/ext/graphviz.py | 8 |
3 files changed, 8 insertions, 5 deletions
diff --git a/doc/config.rst b/doc/config.rst index f840b289..61154ebb 100644 --- a/doc/config.rst +++ b/doc/config.rst @@ -277,7 +277,7 @@ Project information the format given in :confval:`today_fmt`. The default is no :confval:`today` and a :confval:`today_fmt` of ``'%B %d, - %Y'`` (or, if translation is enabled with :confval:`language`, am equivalent + %Y'`` (or, if translation is enabled with :confval:`language`, an equivalent %format for the selected locale). .. confval:: highlight_language diff --git a/sphinx/cmdline.py b/sphinx/cmdline.py index 5340aa88..3822ddc8 100644 --- a/sphinx/cmdline.py +++ b/sphinx/cmdline.py @@ -67,7 +67,8 @@ def main(argv): allopts = set(opt[0] for opt in opts) srcdir = confdir = path.abspath(args[0]) if not path.isdir(srcdir): - print >>sys.stderr, 'Error: Cannot find source directory.' + print >>sys.stderr, 'Error: Cannot find source directory `%s\'.' % ( + srcdir,) return 1 if not path.isfile(path.join(srcdir, 'conf.py')) and \ '-c' not in allopts and '-C' not in allopts: diff --git a/sphinx/ext/graphviz.py b/sphinx/ext/graphviz.py index dc3b2623..9c2012c7 100644 --- a/sphinx/ext/graphviz.py +++ b/sphinx/ext/graphviz.py @@ -298,14 +298,16 @@ def texinfo_visit_graphviz(self, node): def text_visit_graphviz(self, node): if 'alt' in node.attributes: self.add_text(_('[graph: %s]') % node['alt']) - self.add_text(_('[graph]')) + else: + self.add_text(_('[graph]')) raise nodes.SkipNode def man_visit_graphviz(self, node): if 'alt' in node.attributes: - self.body.append(_('[graph: %s]') % node['alt'] + '\n') - self.body.append(_('[graph]')) + self.body.append(_('[graph: %s]') % node['alt']) + else: + self.body.append(_('[graph]')) raise nodes.SkipNode |