summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorRyan Lane <rlane@wikimedia.org>2011-01-25 20:50:14 +0000
committerRyan Lane <rlane@wikimedia.org>2011-01-25 20:50:14 +0000
commitfc8f41e9c34c8d14d1c66ca03ce7098cc6b7f04d (patch)
tree9e4c224d36a054136d3a7ec18d0f66da52e05551 /doc
parent2e6a5713d86b487c0b26a72b111531781745aeb2 (diff)
parentb2d0a77c53d1bd108d233e58f68655381cec4e16 (diff)
downloadnova-fc8f41e9c34c8d14d1c66ca03ce7098cc6b7f04d.tar.gz
nova-fc8f41e9c34c8d14d1c66ca03ce7098cc6b7f04d.tar.xz
nova-fc8f41e9c34c8d14d1c66ca03ce7098cc6b7f04d.zip
Merge from trunk
Diffstat (limited to 'doc')
-rw-r--r--doc/ext/nova_todo.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/doc/ext/nova_todo.py b/doc/ext/nova_todo.py
index efc0c3edd..67bbfd2e0 100644
--- a/doc/ext/nova_todo.py
+++ b/doc/ext/nova_todo.py
@@ -26,7 +26,7 @@ def process_todo_nodes(app, doctree, fromdocname):
# reading through docutils for the proper way to construct an empty list
lists = []
for i in xrange(5):
- lists.append(nodes.bullet_list("", nodes.Text('','')));
+ lists.append(nodes.bullet_list("", nodes.Text('','')))
lists[i].remove(lists[i][0])
lists[i].set_class('todo_list')
@@ -42,7 +42,8 @@ def process_todo_nodes(app, doctree, fromdocname):
# Create a reference
newnode = nodes.reference('', '')
- link = _('%s, line %d') % (filename, todo_info['lineno']);
+ line_info = todo_info['lineno']
+ link = _('%(filename)s, line %(line_info)d') % locals()
innernode = nodes.emphasis(link, link)
newnode['refdocname'] = todo_info['docname']