[Cmake-commits] CMake branch, next, updated. v3.2.1-1818-gfd6b5d8

[Brad King]

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  fd6b5d8feab3e2b4815c7046a3993afd520b9838 (commit)
       via  fef1f26749a7dc3839b1e461fb09eecbe97cca90 (commit)
      from  12a641ce5a8432f09a2e641288ba5581efcd168f (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=fd6b5d8feab3e2b4815c7046a3993afd520b9838
commit fd6b5d8feab3e2b4815c7046a3993afd520b9838
Merge: 12a641c fef1f26
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Apr 13 13:01:35 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Apr 13 13:01:35 2015 -0400

    Merge topic 'doc-ctest-update-option-wording' into next
    
    fef1f267 Help: Fix {GIT,P4}UpdateCustom documentation (#15512)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fef1f26749a7dc3839b1e461fb09eecbe97cca90
commit fef1f26749a7dc3839b1e461fb09eecbe97cca90
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Apr 13 12:57:59 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Apr 13 13:00:58 2015 -0400

    Help: Fix {GIT,P4}UpdateCustom documentation (#15512)
    
    The GITUpdateCustom and P4UpdateCustom options take only one command
    line with all arguments as a ;-list, not a ;-list of multiple command
    lines.  Fix the incorrect documentation originally added by commit
    v3.1.0-rc1~463^2 (Help: Document ctest dashboard client usage,
    2014-05-30).

diff --git a/Help/manual/ctest.1.rst b/Help/manual/ctest.1.rst
index dd3bcfb..584786f 100644
--- a/Help/manual/ctest.1.rst
+++ b/Help/manual/ctest.1.rst
@@ -573,7 +573,7 @@ Configuration settings to specify the version control tool include:
   * :module:`CTest` module variable: ``GITCOMMAND``
 
 ``GITUpdateCustom``
-  Specify a semicolon-separated list of custom command lines to run
+  Specify a custom command line (as a semicolon-separated list) to run
   in the source tree (Git work tree) to update it instead of running
   the ``GITCommand``.
 
@@ -617,7 +617,7 @@ Configuration settings to specify the version control tool include:
   * :module:`CTest` module variable: ``CTEST_P4_OPTIONS``
 
 ``P4UpdateCustom``
-  Specify a semicolon-separated list of custom command lines to run
+  Specify a custom command line (as a semicolon-separated list) to run
   in the source tree (Perforce tree) to update it instead of running
   the ``P4Command``.
 

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

Summary of changes:
 Help/manual/ctest.1.rst |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake