From 5c2fb27139fa3d6fb8a6c8ba1c703869152297c3 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Fri, 8 Aug 2008 14:29:56 +0000
Subject: [PATCH] clarify timeout attribute.  PR 35877

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@683981 13f79535-47bb-0310-9956-ffa450edef68
---
 docs/manual/OptionalTasks/junit.html | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/manual/OptionalTasks/junit.html b/docs/manual/OptionalTasks/junit.html
index 84c9d5adf..8ecf6d811 100644
--- a/docs/manual/OptionalTasks/junit.html
+++ b/docs/manual/OptionalTasks/junit.html
@@ -143,7 +143,10 @@ elements</a>).</p>
     <td valign="top">timeout</td>
     <td valign="top">Cancel the individual tests if they don't finish
       in the given time (measured in milliseconds).  Ignored if
-      <code>fork</code> is disabled.</td>
+      <code>fork</code> is disabled.  When running multiple tests
+      inside the same Java VM (see forkMode), timeout applies to the
+      time that all tests use together, not to an individual
+      test.</td>
     <td align="center" valign="top">No</td>
   </tr>
   <tr>