summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-02-10 17:59:32 (GMT)
committerBrad King <brad.king@kitware.com>2015-02-10 17:59:32 (GMT)
commit0a95c5ce2ef8d9887c4a0bdde480155d75f12c7b (patch)
tree5c041f7c222b64846680c7e94d435ace46daba0b /Help
parentf3a6e0cb6a96ca2c3e363371c17940d5cb2ed791 (diff)
parent56cb4a6c3a71f1a3d3e0dccbdc593bc58d76c5ee (diff)
downloadCMake-0a95c5ce2ef8d9887c4a0bdde480155d75f12c7b.zip
CMake-0a95c5ce2ef8d9887c4a0bdde480155d75f12c7b.tar.gz
CMake-0a95c5ce2ef8d9887c4a0bdde480155d75f12c7b.tar.bz2
Merge branch 'fix_timeout_docs' into release
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`.