[jmeter] branch master updated: More fixes of wether -> whether

[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 81bd8a0  More fixes of wether -> whether
81bd8a0 is described below

commit 81bd8a03c817e0e65b1b7a562012308fb2c33c7e
Author: Felix Schumacher <fe...@internetallee.de>
AuthorDate: Thu Dec 26 12:00:39 2019 +0100

    More fixes of wether -> whether
    
    Could even be seen as a performance optimization, as whether uses less ram :)
---
 xdocs/changes_history.xml      | 4 ++--
 xdocs/usermanual/functions.xml | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/xdocs/changes_history.xml b/xdocs/changes_history.xml
index 0ee90c5..ed90525 100644
--- a/xdocs/changes_history.xml
+++ b/xdocs/changes_history.xml
@@ -1007,7 +1007,7 @@ containing a fix to this issue, we decided to remove it. If you still needed, yo
 
 <h3>Controllers</h3>
 <ul>
-    <li><bug>62806</bug>ModuleController cloning by Run behaves differently wether in GUI or Non GUI mode. Contributed by Ubik Load Pack (support at ubikloadpack.com)</li>
+    <li><bug>62806</bug>ModuleController cloning by Run behaves differently whether in GUI or Non GUI mode. Contributed by Ubik Load Pack (support at ubikloadpack.com)</li>
     <li><bug>62847</bug>If Controller cannot use variable for index exposed by LoopController/WhileController/ForEachController</li>
     <li><bug>63064</bug>Ignore spaces at the end and beginning of expressions used in IfController</li>
 </ul>
@@ -6400,7 +6400,7 @@ When calling "Clear All" command, if Log Viewer is displayed its content will be
 <li><bugzilla>52674</bugzilla> - Proxy : Add a Sampler Creator to allow plugging HTTP based samplers using potentially non textual POST Body (AMF, Silverlight, &hellip;) and customizing them for others</li>
 <li><bugzilla>52934</bugzilla> - GUI : Open Test plan with the tree expanded to the testplan level and no further and select the root of the tree</li>
 <li><bugzilla>52941</bugzilla> - Improvements of HTML report design generated by JMeter Ant task extra</li>
-<li><bugzilla>53042</bugzilla> - Introduce a new method in Sampler interface to allow Sampler to decide wether a config element applies to Sampler</li>
+<li><bugzilla>53042</bugzilla> - Introduce a new method in Sampler interface to allow Sampler to decide whether a config element applies to Sampler</li>
 <li><bugzilla>52771</bugzilla> - Documentation : Added RSS feed on JMeter Home page under link "Subscribe to What's New"</li>
 <li><bugzilla>42784</bugzilla> - Show the number of errors logged in the GUI</li>
 <li><bugzilla>53256</bugzilla> - Make Clear All command clean LogViewer content</li>
diff --git a/xdocs/usermanual/functions.xml b/xdocs/usermanual/functions.xml
index 71c9cd4..36413d8 100644
--- a/xdocs/usermanual/functions.xml
+++ b/xdocs/usermanual/functions.xml
@@ -727,9 +727,9 @@ This leads to creation of match number variable called <code>varName_matchNr</co
                 computed by this function.</property>
 </properties>
 <p>Examples:
-<source>${__RandomFromMultipleVars(val)}</source> will return a random string based on content of variable val taking into account wether they are multi-value or not<br/>
-<source>${__RandomFromMultipleVars(val1|val2)}</source> will return a random string based on content of variables val1 and val2 taking into account wether they are multi-value or not<br/>
-<source>${__RandomFromMultipleVars(val1|val2, MYVAR)}</source> will return a random string based on content of variables val1 and val2 taking into account wether they are multi-value or not and store the result in <code>MYVAR</code><br/>
+<source>${__RandomFromMultipleVars(val)}</source> will return a random string based on content of variable val taking into account whether they are multi-value or not<br/>
+<source>${__RandomFromMultipleVars(val1|val2)}</source> will return a random string based on content of variables val1 and val2 taking into account whether they are multi-value or not<br/>
+<source>${__RandomFromMultipleVars(val1|val2, MYVAR)}</source> will return a random string based on content of variables val1 and val2 taking into account whether they are multi-value or not and store the result in <code>MYVAR</code><br/>
 </p>
 </component>