summaryrefslogtreecommitdiff
path: root/doc/markup/code.rst
diff options
context:
space:
mode:
authorJean-François B <jfbu@free.fr>2017-02-13 19:38:22 +0100
committerGitHub <noreply@github.com>2017-02-13 19:38:22 +0100
commita7becf30ded7472c4ef8fbce632d4de46c416e66 (patch)
tree68197fa93d9a52cfb19828ff2f42cfa23295f99c /doc/markup/code.rst
parentf7e5043949c2118d3bbb918ebeb6b273594c0339 (diff)
parent3e6eba790012ee3c919302fc05bb0c186105aece (diff)
downloadsphinx-git-a7becf30ded7472c4ef8fbce632d4de46c416e66.tar.gz
Merge branch 'master' into literalincludelines
Diffstat (limited to 'doc/markup/code.rst')
-rw-r--r--doc/markup/code.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/markup/code.rst b/doc/markup/code.rst
index 3c85e2afd..397836d3d 100644
--- a/doc/markup/code.rst
+++ b/doc/markup/code.rst
@@ -240,7 +240,7 @@ For example::
:rst:dir:`literalinclude` also supports the ``caption`` and ``name`` option.
-``caption`` has a additional feature that if you leave the value empty, the shown
+``caption`` has an additional feature that if you leave the value empty, the shown
filename will be exactly the one given as an argument.