summaryrefslogtreecommitdiff
path: root/docs/dev/reST.rst
diff options
context:
space:
mode:
authorMarkus Heiser <markus.heiser@darmarIT.de>2020-06-19 04:51:02 +0000
committerGitHub <noreply@github.com>2020-06-19 04:51:02 +0000
commitca1c3bd15d60faf235894cb4f6f3a15150e3a6c3 (patch)
treef951cabe1e0140ee5476c33b7703746285fa5ea0 /docs/dev/reST.rst
parentcc721b5d864bcc0bf58d29337aaa1ec774bd70b5 (diff)
parentc83007a6bcd2a7f765e7655b91cc6714fbc4ab01 (diff)
Merge branch 'master' into csp-oscar-theme
Diffstat (limited to 'docs/dev/reST.rst')
-rw-r--r--docs/dev/reST.rst10
1 files changed, 5 insertions, 5 deletions
diff --git a/docs/dev/reST.rst b/docs/dev/reST.rst
index 4835cbbcf..906a0e9af 100644
--- a/docs/dev/reST.rst
+++ b/docs/dev/reST.rst
@@ -325,8 +325,9 @@ Literal blocks
The simplest form of :duref:`literal-blocks` is a indented block introduced by
two colons (``::``). For highlighting use :dudir:`highlight` or :ref:`reST
-code` directive. To include literals from external files use directive
-:dudir:`literalinclude`.
+code` directive. To include literals from external files use
+:rst:dir:`literalinclude` or :ref:`kernel-include <kernel-include-directive>`
+directive (latter one expands environment variables in the path name).
.. _reST literal:
@@ -1312,9 +1313,8 @@ others are basic-tabs_ and code-tabs_. Below a *group-tab* example from
.. literalinclude:: ../admin/buildhosts.rst
:language: reST
- :start-after: .. _system requirements:
- :end-before: .. _system requirements END:
-
+ :start-after: .. SNIP sh lint requirements
+ :end-before: .. SNAP sh lint requirements
.. _math: