merge with stable

This commit is contained in:
Georg Brandl
2014-09-17 13:38:20 +02:00
2 changed files with 2 additions and 1 deletions

View File

@@ -70,6 +70,7 @@ Features added
Bugs fixed
----------
* #1568: fix a crash when a "centered" directive contains a reference.
* #1563: :meth:`~sphinx.application.Sphinx.add_search_language` raises
AssertionError for correct type of argument. Thanks to rikoman.
* #1174: Fix smart quotes being applied inside roles like :rst:role:`program` or

View File

@@ -107,7 +107,7 @@ class index(nodes.Invisible, nodes.Inline, nodes.TextElement):
*entrytype* is one of "single", "pair", "double", "triple".
"""
class centered(nodes.Part, nodes.Element):
class centered(nodes.Part, nodes.TextElement):
"""Deprecated."""
class acks(nodes.Element):