merge with stable

This commit is contained in:
Takayuki Shimizukawa 2014-12-05 19:44:05 +09:00
commit aa79c97da7

View File

@ -247,6 +247,7 @@ todolist directive has neither content nor arguments that need to be handled.
The ``todo`` directive function looks like this::
from sphinx.util.compat import make_admonition
from sphinx.locale import _
class TodoDirective(Directive):