summaryrefslogtreecommitdiffstats
path: root/Help/manual
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-02-10 16:32:04 (GMT)
committerBrad King <brad.king@kitware.com>2017-02-10 16:32:04 (GMT)
commit6cbad490c2fdbd9bdc67b406b9f2dcdc21e08ddb (patch)
tree409695eb868ba2e284ce10d6f807c6ad71916353 /Help/manual
parent84df4a49500e51ac6e2a19a77e385e66234386f7 (diff)
parent30abf145fd48f50c26ee7553fd2512e59be97f25 (diff)
downloadCMake-6cbad490c2fdbd9bdc67b406b9f2dcdc21e08ddb.zip
CMake-6cbad490c2fdbd9bdc67b406b9f2dcdc21e08ddb.tar.gz
CMake-6cbad490c2fdbd9bdc67b406b9f2dcdc21e08ddb.tar.bz2
Merge branch 'sphinx-1.4' into release
Diffstat (limited to 'Help/manual')
-rw-r--r--Help/manual/cmake-developer.7.rst4
-rw-r--r--Help/manual/cmake-language.7.rst4
2 files changed, 4 insertions, 4 deletions
diff --git a/Help/manual/cmake-developer.7.rst b/Help/manual/cmake-developer.7.rst
index 46b922b..f77d8c0 100644
--- a/Help/manual/cmake-developer.7.rst
+++ b/Help/manual/cmake-developer.7.rst
@@ -540,7 +540,7 @@ a :ref:`Line Comment` block of the form:
or a :ref:`Bracket Comment` of the form:
-.. code-block:: cmake
+::
#[[.rst:
<module-name>
@@ -558,7 +558,7 @@ All such comments must start with ``#`` in the first column.
For example, a ``Modules/Findxxx.cmake`` module may contain:
-.. code-block:: cmake
+::
# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
# file Copyright.txt or https://cmake.org/licensing for details.
diff --git a/Help/manual/cmake-language.7.rst b/Help/manual/cmake-language.7.rst
index 41542c9..ba0b30f 100644
--- a/Help/manual/cmake-language.7.rst
+++ b/Help/manual/cmake-language.7.rst
@@ -255,7 +255,7 @@ invocation as exactly one argument.
For example:
-.. code-block:: cmake
+::
message("This is a quoted argument containing multiple lines.
This is always one argument even though it contains a ; character.
@@ -421,7 +421,7 @@ A ``#`` immediately followed by a `Bracket Argument`_ forms a
For example:
-.. code-block:: cmake
+::
#[[This is a bracket comment.
It runs until the close bracket.]]