summaryrefslogtreecommitdiff
path: root/sphinx
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2009-08-09 22:44:41 +0200
committerGeorg Brandl <georg@python.org>2009-08-09 22:44:41 +0200
commit56ccba668d2c0770ef2161d285af8059e3aa7e67 (patch)
tree1fcfc5398fb1ca0c960f91f479e75f8c6ca56766 /sphinx
parentc5e00f96a01e4b9771e56abd053d447b305d7c67 (diff)
downloadsphinx-56ccba668d2c0770ef2161d285af8059e3aa7e67.tar.gz
Add more tests for markup.
Diffstat (limited to 'sphinx')
-rw-r--r--sphinx/directives/other.py2
-rw-r--r--sphinx/roles.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/sphinx/directives/other.py b/sphinx/directives/other.py
index 977b1691..ed42e3d2 100644
--- a/sphinx/directives/other.py
+++ b/sphinx/directives/other.py
@@ -260,7 +260,7 @@ class SeeAlso(Directive):
return ret
-token_re = re.compile('`([a-z_]+)`')
+token_re = re.compile('`([a-z_][a-z0-9_]*)`')
def token_xrefs(text, env):
retnodes = []
diff --git a/sphinx/roles.py b/sphinx/roles.py
index d896641a..db231463 100644
--- a/sphinx/roles.py
+++ b/sphinx/roles.py
@@ -29,7 +29,7 @@ generic_docroles = {
'manpage' : addnodes.literal_emphasis,
'mimetype' : addnodes.literal_emphasis,
'newsgroup' : addnodes.literal_emphasis,
- 'program' : nodes.strong,
+ 'program' : nodes.strong, # XXX should be an x-ref
'regexp' : nodes.literal,
}