summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorRick Harris <rick.harris@rackspace.com>2011-01-25 21:46:12 +0000
committerRick Harris <rick.harris@rackspace.com>2011-01-25 21:46:12 +0000
commit9fac0cefb1ba4d7ffa85315a3843ef70ce37691c (patch)
tree2c9fb564896647b3c25627a4b27682bd7530fb53 /doc
parenta9ab2d0f0618f855686cb8713b28c3737faabdcc (diff)
parent705cbaa3d311c21cf2a7318e52a60eeadebb435a (diff)
Merge 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']