[jmeter] branch master updated: Change scheduler reference in Thread Group documentation

[fs...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

fschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git


The following commit(s) were added to refs/heads/master by this push:
     new f508df4  Change scheduler reference in Thread Group documentation
f508df4 is described below

commit f508df4dbb639c42411d4ceaed4b6d95ca32a272
Author: Felix Schumacher <fe...@internetallee.de>
AuthorDate: Sun Dec 6 17:43:53 2020 +0100

    Change scheduler reference in Thread Group documentation
    
    Contributed by Ori Marko
    Bugzilla Id: 64960
---
 xdocs/changes.xml              |  2 ++
 xdocs/usermanual/test_plan.xml | 12 +++---------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 1d8990a..59d103c 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -156,6 +156,7 @@ Summary
 
 <h3>Documentation</h3>
 <ul>
+  <li><bug>64960</bug>Change scheduler reference in Thread Group documentation. Contributed by Ori Marko</li>
 </ul>
 
 <h3>General</h3>
@@ -169,6 +170,7 @@ Summary
 <p>We thank all contributors mentioned in bug and improvement sections above:
 </p>
 <ul>
+  <li>Ori Marko (orimarko at gmail.com)</li>
 </ul>
 <p>We also thank bug reporters who helped us improve JMeter.</p>
 <ul>
diff --git a/xdocs/usermanual/test_plan.xml b/xdocs/usermanual/test_plan.xml
index 75535f2..998eddb 100644
--- a/xdocs/usermanual/test_plan.xml
+++ b/xdocs/usermanual/test_plan.xml
@@ -82,20 +82,14 @@ Start with Ramp-up = number of threads and adjust up or down as needed.
 
 <p>By default, the thread group is configured to loop once through its elements.</p>
 
-<p>Thread Group also provides a <b>scheduler</b>.
+<p>Thread Group also allows to specify <b>Thread lifetime</b>.
     Click the checkbox at the bottom of the Thread Group panel to enable/disable extra fields
-     in which you can enter the duration of test, the startup delay, the start and end times of the run.
+     in which you can enter the duration of test and the startup delay
      You can configure <code>Duration (seconds)</code> and <code>Startup Delay (seconds)</code> to control
      the duration of each thread group and the after how much seconds it starts.
      When the test is started, JMeter will wait <code>Startup Delay (seconds)</code> before starting the Threads
      of the Thread Group and run for the configured <code>Duration (seconds)</code> time.
-     Note those 2 options override the <code>Start time</code> and <code>End time</code>.
-
-     <p>Alternatively (although not recommended as not very flexible) you can use the two other fields <code>Start time</code> and <code>End time</code>.
-     When the test is started, JMeter will wait if necessary until the start-time has been reached.
-     At the end of each cycle, JMeter checks if the end-time has been reached, and if so, the run is stopped,
-     otherwise the test is allowed to continue until the iteration limit is reached.</p>
-     </p>
+</p>
 </subsection>
 
 <subsection name="&sect-num;.2 Controllers" anchor="controllers">