diff options
author | Georg Brandl <georg@python.org> | 2014-03-02 08:50:10 +0100 |
---|---|---|
committer | Georg Brandl <georg@python.org> | 2014-03-02 08:50:10 +0100 |
commit | 85ddf03f45f79a0bc7d20fcceba0057a72452fd1 (patch) | |
tree | 49f519acf9c000d0fa4deefc94f7ac45498f7ac0 /doc/extdev | |
parent | db0f7ccc705b37617faf7c6139e96dc826dfdb22 (diff) | |
parent | cae4910527c549e83b8b63e88c90324113846f70 (diff) | |
download | sphinx-git-85ddf03f45f79a0bc7d20fcceba0057a72452fd1.tar.gz |
merge with stable
Diffstat (limited to 'doc/extdev')
-rw-r--r-- | doc/extdev/appapi.rst | 2 | ||||
-rw-r--r-- | doc/extdev/markupapi.rst | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/extdev/appapi.rst b/doc/extdev/appapi.rst index 88fd43404..48f5d96e3 100644 --- a/doc/extdev/appapi.rst +++ b/doc/extdev/appapi.rst @@ -218,7 +218,7 @@ package. use ``docutils.nodes.generated`` if you want no further text decoration. If the text should be treated as literal (e.g. no smart quote replacement), but not have typewriter styling, use ``sphinx.addnodes.literal_emphasis`` or - ``sphinx.addnodes.literal_strong``. + ``sphinx.addnodes.literal_strong``. For the role content, you have the same syntactical possibilities as for standard Sphinx roles (see :ref:`xref-syntax`). diff --git a/doc/extdev/markupapi.rst b/doc/extdev/markupapi.rst index 3c09687eb..577a39e0d 100644 --- a/doc/extdev/markupapi.rst +++ b/doc/extdev/markupapi.rst @@ -55,7 +55,7 @@ using :meth:`.Sphinx.add_directive` or :meth:`.Sphinx.add_directive_to_domain`. .. attribute:: arguments The arguments given to the directive, as a list. - + .. attribute:: options The options given to the directive, as a dictionary mapping option names @@ -82,7 +82,7 @@ using :meth:`.Sphinx.add_directive` or :meth:`.Sphinx.add_directive_to_domain`. Internal offset of the directive content. Used when calling ``nested_parse`` (see below). - + .. attribute:: block_text The string containing the entire directive. |