summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2014-09-07 15:26:06 +0200
committerGeorg Brandl <georg@python.org>2014-09-07 15:26:06 +0200
commit46907148ebf8e6a71557099fbd914c4f4460ac82 (patch)
treef19fb4c5edbda6ae41a6fee4ba141136af70cbc1
parent3be62bc412f4270022582aaaee0b6823652fe4b8 (diff)
parenta1fe6ba956eed1b40244376a5c8023c477c16055 (diff)
downloadsphinx-46907148ebf8e6a71557099fbd914c4f4460ac82.tar.gz
merge with stable
-rw-r--r--doc/markup/toctree.rst12
1 files changed, 6 insertions, 6 deletions
diff --git a/doc/markup/toctree.rst b/doc/markup/toctree.rst
index 1d5d667a..75387413 100644
--- a/doc/markup/toctree.rst
+++ b/doc/markup/toctree.rst
@@ -199,14 +199,14 @@ The special document names (and pages generated for them) are:
.. warning::
- Be careful with unusual characters in filenames. Some formats may interpret
- these characters in unexpected ways:
+ Be careful with unusual characters in filenames. Some formats may interpret
+ these characters in unexpected ways:
- * Do not user the colon ``:`` for HTML based formats. Links to other parts
- may not work.
+ * Do not use the colon ``:`` for HTML based formats. Links to other parts
+ may not work.
- * Do not use the plus ``+`` for the ePub format. Some resources may not be
- found.
+ * Do not use the plus ``+`` for the ePub format. Some resources may not be
+ found.
.. rubric:: Footnotes