You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by vl...@apache.org on 2019/11/11 18:34:08 UTC
[jmeter] branch master updated: Grammar fixes for - Informations
This is an automated email from the ASF dual-hosted git repository.
vladimirsitnikov 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 0e29eb8 Grammar fixes for - Informations
0e29eb8 is described below
commit 0e29eb80b37644b85b70daa6aaf555b54093bbb6
Author: Vincent Lee <vi...@yahoo.com>
AuthorDate: Thu Oct 31 17:17:55 2019 -0400
Grammar fixes for - Informations
fixes #542
---
bin/report-template/content/pages/CustomsGraphs.html.fmkr | 2 +-
bin/report-template/content/pages/OverTime.html.fmkr | 2 +-
bin/report-template/content/pages/ResponseTimes.html.fmkr | 2 +-
bin/report-template/content/pages/Throughput.html.fmkr | 2 +-
bin/report-template/index.html.fmkr | 2 +-
.../src/main/java/org/apache/jmeter/visualizers/MailerVisualizer.java | 2 +-
.../org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java | 4 ++--
xdocs/changes.xml | 1 +
xdocs/creating-templates.xml | 2 +-
xdocs/usermanual/component_reference.xml | 2 +-
10 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/bin/report-template/content/pages/CustomsGraphs.html.fmkr b/bin/report-template/content/pages/CustomsGraphs.html.fmkr
index 2b6b03d..f86296e 100644
--- a/bin/report-template/content/pages/CustomsGraphs.html.fmkr
+++ b/bin/report-template/content/pages/CustomsGraphs.html.fmkr
@@ -112,7 +112,7 @@
<div class="col-lg-12">
<div class="panel panel-default" >
<div class="panel-heading" style="text-align:center;">
- <p class="dashboard-title">Test and Report informations</p>
+ <p class="dashboard-title">Test and Report information</p>
</div>
<div class="panel-body">
<table id="generalInfos" class="table table-bordered table-condensed " >
diff --git a/bin/report-template/content/pages/OverTime.html.fmkr b/bin/report-template/content/pages/OverTime.html.fmkr
index 4254fe6..555efaf 100644
--- a/bin/report-template/content/pages/OverTime.html.fmkr
+++ b/bin/report-template/content/pages/OverTime.html.fmkr
@@ -150,7 +150,7 @@
<div class="col-lg-12">
<div class="panel panel-default" >
<div class="panel-heading" style="text-align:center;">
- <p class="dashboard-title">Test and Report informations</p>
+ <p class="dashboard-title">Test and Report information</p>
</div>
<div class="panel-body">
<table id="generalInfos" class="table table-bordered table-condensed " >
diff --git a/bin/report-template/content/pages/ResponseTimes.html.fmkr b/bin/report-template/content/pages/ResponseTimes.html.fmkr
index 68e5b3a..9b59d48 100644
--- a/bin/report-template/content/pages/ResponseTimes.html.fmkr
+++ b/bin/report-template/content/pages/ResponseTimes.html.fmkr
@@ -119,7 +119,7 @@
<div class="col-lg-12">
<div class="panel panel-default" >
<div class="panel-heading" style="text-align:center;">
- <p class="dashboard-title">Test and Report informations</p>
+ <p class="dashboard-title">Test and Report information</p>
</div>
<div class="panel-body">
<table id="generalInfos" class="table table-bordered table-condensed " >
diff --git a/bin/report-template/content/pages/Throughput.html.fmkr b/bin/report-template/content/pages/Throughput.html.fmkr
index c92c13c..c761021 100644
--- a/bin/report-template/content/pages/Throughput.html.fmkr
+++ b/bin/report-template/content/pages/Throughput.html.fmkr
@@ -119,7 +119,7 @@
<div class="col-lg-12">
<div class="panel panel-default">
<div class="panel-heading" style="text-align:center;">
- <p class="dashboard-title">Test and Report informations</p>
+ <p class="dashboard-title">Test and Report information</p>
</div>
<div class="panel-body">
<table id="generalInfos" class="table table-bordered table-condensed " >
diff --git a/bin/report-template/index.html.fmkr b/bin/report-template/index.html.fmkr
index 8c1d524..e559055 100644
--- a/bin/report-template/index.html.fmkr
+++ b/bin/report-template/index.html.fmkr
@@ -84,7 +84,7 @@
<div class="col-lg-12">
<div class="panel panel-default" >
<div class="panel-heading" style="text-align:center;">
- <p class="dashboard-title">Test and Report informations</p>
+ <p class="dashboard-title">Test and Report information</p>
</div>
<div class="panel-body">
<table id="generalInfos" class="table table-bordered table-condensed " >
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/MailerVisualizer.java b/src/components/src/main/java/org/apache/jmeter/visualizers/MailerVisualizer.java
index 6b196bc..4154e50 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/MailerVisualizer.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/MailerVisualizer.java
@@ -108,7 +108,7 @@ public class MailerVisualizer extends AbstractVisualizer implements ActionListen
}
/**
- * Clears any stored sampling-informations.
+ * Clears any stored sampling-information.
*/
@Override
public synchronized void clearData() {
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
index 8aeb905..6b3a4ad 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
@@ -122,7 +122,7 @@ public class DefaultSamplerCreator extends AbstractSamplerCreator {
}
/**
- * Compute sampler informations from Request Header
+ * Compute sampler information from Request Header
* @param sampler {@link HTTPSamplerBase}
* @param request {@link HttpRequestHdr}
* @param pageEncodings Map of page encodings
@@ -149,7 +149,7 @@ public class DefaultSamplerCreator extends AbstractSamplerCreator {
}
/**
- * Compute sampler informations from Request Header
+ * Compute sampler information from Request Header
* @param sampler {@link HTTPSamplerBase}
* @param request {@link HttpRequestHdr}
* @throws Exception when something fails
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 795bf59..18625df 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -173,6 +173,7 @@ to view the last release notes of version 5.2.
<p>We thank all contributors mentioned in bug and improvement sections above:
</p>
<ul>
+ <li><a href="https://github.com/vincentclee">Vincent Lee</a></li>
</ul>
<p>We also thank bug reporters who helped us improve JMeter.</p>
<ul>
diff --git a/xdocs/creating-templates.xml b/xdocs/creating-templates.xml
index 53afa51..43264d6 100644
--- a/xdocs/creating-templates.xml
+++ b/xdocs/creating-templates.xml
@@ -44,7 +44,7 @@
<figure image="templates/templates_xml.png">Figure 2 - recording template declaration</figure>
A template declaration is made as follow :<br/>
<ul>
- <li><code>template</code> element which contains the informations described in the followings tags</li>
+ <li><code>template</code> element which contains the information described in the following tags</li>
<li><code>name</code> element which contains the template name the user will see</li>
<li><code>fileName</code> element which contains the relative path of the template.</li>
<li><code>description</code> element which uses html to describe the template</li>
diff --git a/xdocs/usermanual/component_reference.xml b/xdocs/usermanual/component_reference.xml
index 0f3fa72..a106792 100644
--- a/xdocs/usermanual/component_reference.xml
+++ b/xdocs/usermanual/component_reference.xml
@@ -5946,7 +5946,7 @@ extracting the node as text or attribute value and store the result into the giv
<dt><code>compare(/book[1]/page[2],/book[2]/page[2])</code></dt>
<dd>return Integer value equal 0 to if the 2<sup>nd</sup> page of the first book is equal to the 2<sup>nd</sup> page of the 2<sup>nd</sup> book, else return -1.</dd>
</dl>
- <p>To see more informations about thoses fuctions, please check <a href="http://saxon.sourceforge.net/saxon7.9.1/functions.html">xPath2 functions</a></p>
+ <p>To see more information about these functions, please check <a href="http://saxon.sourceforge.net/saxon7.9.1/functions.html">xPath2 functions</a></p>
</component>
<component name="XPath Extractor" index="§-num;.8.3" width="729" height="317" screenshot="xpath_extractor.png">