[Cmake-commits] CMake branch, next, updated. v3.1.2-1175-g8926a09

[Zack Galbreath]

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  8926a09dd37e32502f0ed82b5b84dda9ce686d82 (commit)
       via  248d74165ed6f18d130e13a19fa8a866d81fabe8 (commit)
      from  fa1af50e9bbe0506da14019b82cbc86fd1333e02 (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=8926a09dd37e32502f0ed82b5b84dda9ce686d82
commit 8926a09dd37e32502f0ed82b5b84dda9ce686d82
Merge: fa1af50 248d741
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Tue Feb 10 11:10:02 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 10 11:10:02 2015 -0500

    Merge topic 'fix_timeout_docs' into next
    
    248d7416 fix the name of the referenced variable.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=248d74165ed6f18d130e13a19fa8a866d81fabe8
commit 248d74165ed6f18d130e13a19fa8a866d81fabe8
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Tue Feb 10 11:07:26 2015 -0500
Commit:     Zack Galbreath <zack.galbreath at kitware.com>
CommitDate: Tue Feb 10 11:07:26 2015 -0500

    fix the name of the referenced variable.
    
    It's CTEST_TEST_TIMEOUT, not CTEST_TESTING_TIMEOUT.
    This change also adds a link to the variable's documentation.

diff --git a/Help/prop_test/TIMEOUT.rst b/Help/prop_test/TIMEOUT.rst
index 0b247b8..d1cb90d 100644
--- a/Help/prop_test/TIMEOUT.rst
+++ b/Help/prop_test/TIMEOUT.rst
@@ -6,4 +6,4 @@ How many seconds to allow for this test.
 This property if set will limit a test to not take more than the
 specified number of seconds to run.  If it exceeds that the test
 process will be killed and ctest will move to the next test.  This
-setting takes precedence over CTEST_TESTING_TIMEOUT.
+setting takes precedence over :variable:`CTEST_TEST_TIMEOUT`.

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

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


hooks/post-receive
-- 
CMake