This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, master has been updated
via dec5693641f794901851eafe24aed6a9338ad786 (commit)
via 124564504a4f3d8416899de96e0dec048c588372 (commit)
from 3bd8ed22e8017e5490b8e758f486433b005ace30 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dec5693641f794901851eafe24aed6a9338ad786
commit dec5693641f794901851eafe24aed6a9338ad786
Merge: 3bd8ed2 1245645
Author: Craig Scott <craig.sc...@crascit.com>
AuthorDate: Sat May 18 23:24:42 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Sat May 18 19:24:55 2019 -0400
Merge topic 'bracket-comment-doc-clarification'
124564504a Help: Clarify that bracket comments start with bracket open
Acked-by: Kitware Robot <kwro...@kitware.com>
Acked-by: Brad King <brad.k...@kitware.com>
Acked-by: Ben McMorran <ben.mcmor...@gmail.com>
Merge-request: !3331
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=124564504a4f3d8416899de96e0dec048c588372
commit 124564504a4f3d8416899de96e0dec048c588372
Author: Kyle Edwards <kyle.edwa...@kitware.com>
AuthorDate: Thu May 16 14:37:00 2019 -0400
Commit: Kyle Edwards <kyle.edwa...@kitware.com>
CommitDate: Thu May 16 17:55:38 2019 -0400
Help: Clarify that bracket comments start with bracket open
Fixes: #19264
diff --git a/Help/manual/cmake-language.7.rst b/Help/manual/cmake-language.7.rst
index 5e5cfff..4ca8e3a 100644
--- a/Help/manual/cmake-language.7.rst
+++ b/Help/manual/cmake-language.7.rst
@@ -430,7 +430,7 @@ comments: a `Bracket Comment`_ and a `Line Comment`_.
Bracket Comment
^^^^^^^^^^^^^^^
-A ``#`` immediately followed by a `Bracket Argument`_ forms a
+A ``#`` immediately followed by a :token:`bracket_open` forms a
*bracket comment* consisting of the entire bracket enclosure:
.. raw:: latex
@@ -461,7 +461,7 @@ For example:
Line Comment
^^^^^^^^^^^^
-A ``#`` not immediately followed by a `Bracket Argument`_ forms a
+A ``#`` not immediately followed by a :token:`bracket_open` forms a
*line comment* that runs until the end of the line:
.. raw:: latex
@@ -469,7 +469,7 @@ A ``#`` not immediately followed by a `Bracket Argument`_
forms a
\begin{small}
.. productionlist::
- line_comment: '#' <any text not starting in a `bracket_argument`
+ line_comment: '#' <any text not starting in a `bracket_open`
: and not containing a `newline`>
.. raw:: latex
-----------------------------------------------------------------------
Summary of changes:
Help/manual/cmake-language.7.rst | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
