[Cmake-commits] CMake branch, next, updated. v2.8.3-782-g54fe3cf

[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  54fe3cfdb79209b69fe45e7eb038e531212353a2 (commit)
       via  7145ca67fcc252e63b10f5a301683701f1b6a69c (commit)
      from  2805ecc9a2da403f44d3a747cf2aff0db51e57a8 (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=54fe3cfdb79209b69fe45e7eb038e531212353a2
commit 54fe3cfdb79209b69fe45e7eb038e531212353a2
Merge: 2805ecc 7145ca6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Dec 9 10:38:12 2010 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Dec 9 10:38:12 2010 -0500

    Merge topic 'doc-ctest_sleep' into next
    
    7145ca6 CTest: Fix ctest_sleep documentation (#11554)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7145ca67fcc252e63b10f5a301683701f1b6a69c
commit 7145ca67fcc252e63b10f5a301683701f1b6a69c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Dec 9 10:36:55 2010 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Dec 9 10:37:28 2010 -0500

    CTest: Fix ctest_sleep documentation (#11554)
    
    Document behavior consistently with the implementation.

diff --git a/Source/CTest/cmCTestSleepCommand.h b/Source/CTest/cmCTestSleepCommand.h
index 411eb01..468cd85 100644
--- a/Source/CTest/cmCTestSleepCommand.h
+++ b/Source/CTest/cmCTestSleepCommand.h
@@ -63,11 +63,10 @@ public:
   virtual const char* GetFullDocumentation()
     {
     return
-      "  ctest_sleep( seconds )\n"
-      "  ctest_sleep( time1 duration time2 )\n"
-      "With one argument it will sleep for a given number of seconds. "
-      "With three arguments it will wait for time2 - time1 - duration "
-      "seconds.";
+      "  ctest_sleep(<seconds>)\n"
+      "Sleep for given number of seconds.\n"
+      "  ctest_sleep(<time1> <duration> <time2>)\n"
+      "Sleep for t=(time1 + duration - time2) seconds if t > 0.";
     }
 
   cmTypeMacro(cmCTestSleepCommand, cmCTestCommand);

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

Summary of changes:
 Source/CTest/cmCTestSleepCommand.h |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake