diff options
| author | Jean-François B <jfbu@free.fr> | 2017-02-13 19:38:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-13 19:38:22 +0100 |
| commit | a7becf30ded7472c4ef8fbce632d4de46c416e66 (patch) | |
| tree | 68197fa93d9a52cfb19828ff2f42cfa23295f99c /doc/markup | |
| parent | f7e5043949c2118d3bbb918ebeb6b273594c0339 (diff) | |
| parent | 3e6eba790012ee3c919302fc05bb0c186105aece (diff) | |
| download | sphinx-git-a7becf30ded7472c4ef8fbce632d4de46c416e66.tar.gz | |
Merge branch 'master' into literalincludelines
Diffstat (limited to 'doc/markup')
| -rw-r--r-- | doc/markup/code.rst | 2 | ||||
| -rw-r--r-- | doc/markup/toctree.rst | 2 |
2 files changed, 2 insertions, 2 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. diff --git a/doc/markup/toctree.rst b/doc/markup/toctree.rst index a0161ee3c..78a72c1b4 100644 --- a/doc/markup/toctree.rst +++ b/doc/markup/toctree.rst @@ -41,7 +41,7 @@ tables of contents. The ``toctree`` directive is the central element. * Tables of contents from all those documents are inserted, with a maximum depth of two, that means one nested heading. ``toctree`` directives in those documents are also taken into account. - * Sphinx knows that the relative order of the documents ``intro``, + * Sphinx knows the relative order of the documents ``intro``, ``strings`` and so forth, and it knows that they are children of the shown document, the library index. From this information it generates "next chapter", "previous chapter" and "parent chapter" links. |