summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-02-11 14:59:28 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2015-02-11 14:59:28 (GMT)
commitc1772e5fb25b798a99cdcc820272ca9457123eb6 (patch)
tree70a853f4ed65c3f8a935c26470b8893bc9ae468f /Help
parent79ea7e6d087924ff1c898e727b6e83944f0f689d (diff)
parent56cb4a6c3a71f1a3d3e0dccbdc593bc58d76c5ee (diff)
downloadCMake-c1772e5fb25b798a99cdcc820272ca9457123eb6.zip
CMake-c1772e5fb25b798a99cdcc820272ca9457123eb6.tar.gz
CMake-c1772e5fb25b798a99cdcc820272ca9457123eb6.tar.bz2
Merge topic 'fix_timeout_docs'
56cb4a6c Help: Fix variable reference in TIMEOUT test property docs
Diffstat (limited to 'Help')
-rw-r--r--Help/prop_test/TIMEOUT.rst2
1 files changed, 1 insertions, 1 deletions
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`.