IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

merge with stable

Browse Source
This commit is contained in:
Georg Brandl
2014-09-19 10:36:34 +02:00
parent e895676d82 01f413108e
commit 2d6ef89807
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.hgignore
View File

@@ -11,6 +11,7 @@
^Sphinx.egg-info/ ^Sphinx.egg-info/
^doc/_build/ ^doc/_build/
^TAGS ^TAGS
^\.tags
^\.ropeproject/ ^\.ropeproject/
^env/ ^env/
\.DS_Store$ \.DS_Store$

2
sphinx/domains/std.py
View File

@@ -608,7 +608,7 @@ class StandardDomain(Domain):
return make_refnode(builder, fromdocname, docname, return make_refnode(builder, fromdocname, docname,
labelid, contnode) labelid, contnode)
elif typ == 'option': elif typ == 'option':
progname = node['refprogram'] progname = node.get('refprogram', '')
docname, labelid = self.data['progoptions'].get((progname, target), docname, labelid = self.data['progoptions'].get((progname, target),
('', '')) ('', ''))
if not docname: if not docname: