[Cmake-commits] CMake branch, next, updated. v3.0.1-5270-gc88b612

[Nils Gladitz]

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, next has been updated
       via  c88b61227e0908f3650d49bf73775d735d2496a2 (commit)
       via  e6ba52e8e02847fbfda601033e3c5bebc838898b (commit)
      from  164c6ca15d00d5bf20b0acbe1b15c7656f64a9cf (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c88b61227e0908f3650d49bf73775d735d2496a2
commit c88b61227e0908f3650d49bf73775d735d2496a2
Merge: 164c6ca e6ba52e
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Wed Sep 10 10:11:24 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Sep 10 10:11:24 2014 -0400

    Merge topic 'string-uuid-doc-fix' into next
    
    e6ba52e8 StringUuid: Mark UPPER flag optional in sub-command synopsis


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e6ba52e8e02847fbfda601033e3c5bebc838898b
commit e6ba52e8e02847fbfda601033e3c5bebc838898b
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Wed Sep 10 16:10:13 2014 +0200
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Wed Sep 10 16:10:13 2014 +0200

    StringUuid: Mark UPPER flag optional in sub-command synopsis

diff --git a/Help/command/string.rst b/Help/command/string.rst
index 8ed0e86..07d0ff3 100644
--- a/Help/command/string.rst
+++ b/Help/command/string.rst
@@ -37,7 +37,7 @@ String operations.
   string(MAKE_C_IDENTIFIER <input string> <output variable>)
   string(GENEX_STRIP <input string> <output variable>)
   string(UUID <output variable> NAMESPACE <namespace> NAME <name>
-         TYPE <MD5|SHA1> <UPPER>)
+         TYPE <MD5|SHA1> [UPPER])
 
 REGEX MATCH will match the regular expression once and store the match
 in the output variable.

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

Summary of changes:
 Help/command/string.rst |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake