summaryrefslogtreecommitdiff
path: root/doc/markup
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
commit36454814589eadec6994d36ba6e1d0a74d15721f (patch)
treef19fb4c5edbda6ae41a6fee4ba141136af70cbc1 /doc/markup
parentec329d54f2a53b429f0fe68538899250d4afcad6 (diff)
parent294c83d8f0df265497240ecb22f6ebdab48becbb (diff)
downloadsphinx-git-36454814589eadec6994d36ba6e1d0a74d15721f.tar.gz
merge with stable
Diffstat (limited to 'doc/markup')
-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 1d5d667ae..753874137 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