[Cmake-commits] CMake branch, master, updated. v3.10.0-rc1-48-gf3bb9fc

[Kitware Robot]

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  f3bb9fcf0c3aeceaf5a01051dde8079b51ecbd55 (commit)
       via  1ed11f1c0dd43e493f0f80d17edc91e29f0422e0 (commit)
      from  8af7a16be7290b84c233c5e7749600aa57c4a28a (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=f3bb9fcf0c3aeceaf5a01051dde8079b51ecbd55
commit f3bb9fcf0c3aeceaf5a01051dde8079b51ecbd55
Merge: 8af7a16 1ed11f1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 10 17:46:22 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Oct 10 13:46:34 2017 -0400

    Merge topic 'doc-lang-clarify'
    
    1ed11f1c Help: Minor text clarifications in cmake-language(7) manual
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !1358


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1ed11f1c0dd43e493f0f80d17edc91e29f0422e0
commit 1ed11f1c0dd43e493f0f80d17edc91e29f0422e0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 6 07:53:56 2017 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Oct 10 11:26:00 2017 -0400

    Help: Minor text clarifications in cmake-language(7) manual
    
    Clarify definitions of `bracket_open` and `bracket_close` productions.
    
    In note about unquoted arguments containing unescaped double quotes,
    provide examples of how they can be written as quoted arguments.
    
    Also clarify location of nested calls supported by variable function
    scope.
    
    Suggested-by: Дилян Палаузов <dilyan.palauzov at aegee.org>

diff --git a/Help/manual/cmake-language.7.rst b/Help/manual/cmake-language.7.rst
index 27b5d30..87f8f9d 100644
--- a/Help/manual/cmake-language.7.rst
+++ b/Help/manual/cmake-language.7.rst
@@ -183,18 +183,18 @@ same length:
 
 .. productionlist::
  bracket_argument: `bracket_open` `bracket_content` `bracket_close`
- bracket_open: '[' '='{len} '['
- bracket_content: <any text not containing a `bracket_close`
-                :  of the same {len} as the `bracket_open`>
- bracket_close: ']' '='{len} ']'
+ bracket_open: '[' '='* '['
+ bracket_content: <any text not containing a `bracket_close` with
+                :  the same number of '=' as the `bracket_open`>
+ bracket_close: ']' '='* ']'
 
 .. raw:: latex
 
    \end{small}
 
-An opening bracket of length *len >= 0* is written ``[`` followed
-by *len* ``=`` followed by ``[`` and the corresponding closing
-bracket is written ``]`` followed by *len* ``=`` followed by ``]``.
+An opening bracket is written ``[`` followed by zero or more ``=`` followed
+by ``[``.  The corresponding closing bracket is written ``]`` followed
+by the same number of ``=`` followed by ``]``.
 Brackets do not nest.  A unique length may always be chosen
 for the opening and closing brackets to contain closing brackets
 of other lengths.
@@ -334,6 +334,8 @@ For example:
  beginning of an unquoted argument, and are treated as part of the
  content.  For example, the unquoted arguments ``-Da="b c"``,
  ``-Da=$(v)``, and ``a" "b"c"d`` are each interpreted literally.
+ They may instead be written as quoted arguments ``"-Da=\"b c\""``,
+ ``"-Da=$(v)"``, and ``"a\" \"b\"c\"d"``, respectively.
 
  Make-style references are treated literally as part of the content
  and do not undergo variable expansion.  They are treated as part
@@ -514,7 +516,7 @@ Function Scope
  create commands that, when invoked, process the recorded commands
  in a new variable binding scope.  A variable "set" or "unset"
  binds in this scope and is visible for the current function and
- any nested calls, but not after the function returns.
+ any nested calls within it, but not after the function returns.
 
 Directory Scope
  Each of the `Directories`_ in a source tree has its own variable

-----------------------------------------------------------------------

Summary of changes:
 Help/manual/cmake-language.7.rst |   18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
CMake