diff options
| author | Georg Brandl <georg@python.org> | 2014-01-13 00:14:00 +0100 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2014-01-13 00:14:00 +0100 |
| commit | 8aec27617e3ba2bf13ba9f96bb6fa57602f13b91 (patch) | |
| tree | b5a8bfe70f7ecd52ba3d64a19c375a5b8ac6288d /doc/markup | |
| parent | 0ce3e1b81e8105ccf99e497b6c82c1ef8d9201ba (diff) | |
| parent | dd1c23518d9f91edeb5a19e796a5be2700c93f34 (diff) | |
| download | sphinx-8aec27617e3ba2bf13ba9f96bb6fa57602f13b91.tar.gz | |
merge with stable
Diffstat (limited to 'doc/markup')
| -rw-r--r-- | doc/markup/misc.rst | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/doc/markup/misc.rst b/doc/markup/misc.rst index 98ce5621..b2e9051f 100644 --- a/doc/markup/misc.rst +++ b/doc/markup/misc.rst @@ -176,8 +176,9 @@ Including content based on tags .. only:: html and draft Undefined tags are false, defined tags (via the ``-t`` command-line option or - within :file:`conf.py`) are true. Boolean expressions, also using - parentheses (like ``html and (latex or draft)``) are supported. + within :file:`conf.py`, see :ref:`here <conf-tags>`) are true. Boolean + expressions, also using parentheses (like ``html and (latex or draft)``) are + supported. The *format* and the *name* of the current builder (``html``, ``latex`` or ``text``) are always set as a tag [#]_. To make the distinction between @@ -185,6 +186,9 @@ Including content based on tags ``builder_``, e.g. the epub builder defines the tags ``html``, ``epub``, ``format_html`` and ``builder_epub``. + These standard tags are set *after* the configuration file is read, so they + are not available there. + .. versionadded:: 0.6 .. versionchanged:: 1.2 Added the name of the builder and the prefixes. |