diff --git a/CHANGES b/CHANGES index 47cfa672b..6f0ecbd05 100644 --- a/CHANGES +++ b/CHANGES @@ -97,6 +97,8 @@ New features added Release 0.5.2 (in development) ============================== +* #86: Fix explicit document titles in toctrees. + * #81: Write environment and search index in a manner that is safe from exceptions that occur during dumping. diff --git a/sphinx/environment.py b/sphinx/environment.py index 18c3ffe31..cf69ced9f 100644 --- a/sphinx/environment.py +++ b/sphinx/environment.py @@ -985,12 +985,12 @@ class BuildEnvironment: # replace titles, if needed, and set the target paths in the # toctrees (they are not known at TOC generation time) for refnode in newnode.traverse(nodes.reference): - refnode['refuri'] = builder.get_relative_uri( - docname, refnode['refuri']) + refnode['anchorname'] if titleoverrides and not refnode['anchorname'] \ and refnode['refuri'] in titleoverrides: newtitle = titleoverrides[refnode['refuri']] refnode.children = [nodes.Text(newtitle)] + refnode['refuri'] = builder.get_relative_uri( + docname, refnode['refuri']) + refnode['anchorname'] return newnode descroles = frozenset(('data', 'exc', 'func', 'class', 'const', 'attr', 'obj',