summaryrefslogtreecommitdiff
path: root/doc/markup
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2014-01-10 09:24:23 +0100
committerGeorg Brandl <georg@python.org>2014-01-10 09:24:23 +0100
commitc28f51fe0f7a00b5553394bd7fe5f91c89564d68 (patch)
tree2d25dc82057caa20998aca42b8d102cba1c1442e /doc/markup
parent853559210b43442fb79772772e77a0c3f7a587f4 (diff)
parent71988b3b9c077ea2fe8cb75d747c8eedec219b08 (diff)
downloadsphinx-c28f51fe0f7a00b5553394bd7fe5f91c89564d68.tar.gz
Merged in plaindocs/sphinx (pull request #185)
Diffstat (limited to 'doc/markup')
-rw-r--r--doc/markup/misc.rst4
-rw-r--r--doc/markup/toctree.rst6
2 files changed, 5 insertions, 5 deletions
diff --git a/doc/markup/misc.rst b/doc/markup/misc.rst
index 10ba491e..98ce5621 100644
--- a/doc/markup/misc.rst
+++ b/doc/markup/misc.rst
@@ -212,9 +212,9 @@ following directive exists:
``p{width}`` construct, or tabulary's automatic specifiers:
+-----+------------------------------------------+
- |``L``| ragged-left column with automatic width |
+ |``L``| flush left column with automatic width |
+-----+------------------------------------------+
- |``R``| ragged-right column with automatic width |
+ |``R``| flush right column with automatic width |
+-----+------------------------------------------+
|``C``| centered column with automatic width |
+-----+------------------------------------------+
diff --git a/doc/markup/toctree.rst b/doc/markup/toctree.rst
index 3da3553f..90666b72 100644
--- a/doc/markup/toctree.rst
+++ b/doc/markup/toctree.rst
@@ -141,9 +141,9 @@ tables of contents. The ``toctree`` directive is the central element.
In the end, all documents in the :term:`source directory` (or subdirectories)
must occur in some ``toctree`` directive; Sphinx will emit a warning if it
finds a file that is not included, because that means that this file will not
- be reachable through standard navigation. Use :ref:`metadata` to
- remove the warning, and :confval:`exclude_patterns` to
- exclude files or directories from building.
+ be reachable through standard navigation. Use :ref:`metadata` to remove the
+ warning, and :confval:`exclude_patterns` to explicitly exclude documents or
+ directories from building.
The "master document" (selected by :confval:`master_doc`) is the "root" of
the TOC tree hierarchy. It can be used as the documentation's main page, or