You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by mi...@apache.org on 2015/06/04 19:08:16 UTC
svn commit: r1683596 - in /jmeter/branches/docs-2.13: ./ docs/index.html
docs/issues.html docs/mail.html docs/usermanual/get-started.html
xdocs/index.xml xdocs/mail.xml xdocs/usermanual/get-started.xml
Author: milamber
Date: Thu Jun 4 17:08:16 2015
New Revision: 1683596
URL: http://svn.apache.org/r1683596
Log:
Backport some typo commit: 1667880,1676827,1676836(only index.xml)
Modified:
jmeter/branches/docs-2.13/ (props changed)
jmeter/branches/docs-2.13/docs/index.html
jmeter/branches/docs-2.13/docs/issues.html
jmeter/branches/docs-2.13/docs/mail.html
jmeter/branches/docs-2.13/docs/usermanual/get-started.html
jmeter/branches/docs-2.13/xdocs/index.xml
jmeter/branches/docs-2.13/xdocs/mail.xml
jmeter/branches/docs-2.13/xdocs/usermanual/get-started.xml
Propchange: jmeter/branches/docs-2.13/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 4 17:08:16 2015
@@ -1 +1 @@
-/jmeter/trunk:1668162,1672759,1672765,1672768
+/jmeter/trunk:1667880,1668162,1672759,1672765,1672768,1676827,1676836
Modified: jmeter/branches/docs-2.13/docs/index.html
URL: http://svn.apache.org/viewvc/jmeter/branches/docs-2.13/docs/index.html?rev=1683596&r1=1683595&r2=1683596&view=diff
==============================================================================
--- jmeter/branches/docs-2.13/docs/index.html (original)
+++ jmeter/branches/docs-2.13/docs/index.html Thu Jun 4 17:08:16 2015
@@ -86,7 +86,7 @@ As far as web-services and remote servic
however JMeter does not perform all the actions supported by browsers.
In particular, JMeter does not execute the Javascript found in HTML pages.
Nor does it render the HTML pages as a browser does
-(it's possible to view the response as HTML etc, but the timings are not included in any samples, and only one sample in one thread is ever viewed at a time).
+(it's possible to view the response as HTML etc., but the timings are not included in any samples, and only one sample in one thread is ever viewed at a time).
</p>
<h2>How do I do it?</h2>
Modified: jmeter/branches/docs-2.13/docs/issues.html
URL: http://svn.apache.org/viewvc/jmeter/branches/docs-2.13/docs/issues.html?rev=1683596&r1=1683595&r2=1683596&view=diff
==============================================================================
--- jmeter/branches/docs-2.13/docs/issues.html (original)
+++ jmeter/branches/docs-2.13/docs/issues.html Thu Jun 4 17:08:16 2015
@@ -96,8 +96,8 @@ Use the checklist below to guide you.
<li>JMeter version</li>
<li>Java version (output from java -version)</li>
<li>OS version</li>
-<li>jmeter.log file (unlikely to contain sensitive information, but check before uploading)</li>
-<li>JMX file if relevant (redact any sensitive information first), providing a simplified Test Plan (using DEBUG sampler) will ensure BUG is fixed much more rapidely than without it</li>
+<li><span class="code">jmeter.log</span> file (unlikely to contain sensitive information, but check before uploading)</li>
+<li>JMX file if relevant (redact any sensitive information first), providing a simplified Test Plan (using <a href="./usermanual/component_reference.html#Debug_Sampler">Debug Sampler</a>) will ensure BUG is fixed much more rapidly than without it</li>
<li>JTL file if relevant (may need to redact sensitive information)</li>
<li>For a suspected bug, describe what you did, what happened, and how this differs from what you expected to happen.
Does it happen every time?.
Modified: jmeter/branches/docs-2.13/docs/mail.html
URL: http://svn.apache.org/viewvc/jmeter/branches/docs-2.13/docs/mail.html?rev=1683596&r1=1683595&r2=1683596&view=diff
==============================================================================
--- jmeter/branches/docs-2.13/docs/mail.html (original)
+++ jmeter/branches/docs-2.13/docs/mail.html Thu Jun 4 17:08:16 2015
@@ -130,14 +130,14 @@ and read.
<strong>
Start a new thread for a new topic
</strong><br>
-When asing a new question, please start a new thread with an appropriate new subject line.
+When asking a new question, please start a new thread with an appropriate new subject line.
This makes it easier to read, and to find later in the archives.
</p>
<p>
<strong>
Do your best to ensure that you are not sending HTML or
- "Stylelized" email to the list.
+ "Stylized" email to the list.
</strong><br>
If you are using Outlook or Outlook Express or Eudora, chances are that
you are sending HTML email by default. There is usually a setting that
Modified: jmeter/branches/docs-2.13/docs/usermanual/get-started.html
URL: http://svn.apache.org/viewvc/jmeter/branches/docs-2.13/docs/usermanual/get-started.html?rev=1683596&r1=1683595&r2=1683596&view=diff
==============================================================================
--- jmeter/branches/docs-2.13/docs/usermanual/get-started.html (original)
+++ jmeter/branches/docs-2.13/docs/usermanual/get-started.html Thu Jun 4 17:08:16 2015
@@ -276,7 +276,7 @@ and the java command silently ignores th
<p>A documentation for each template explains what to do once test plan is created from template.</p>
</div>
-<div class="subsection"><h2 id="proxy_server">2.4.3 Using JMeter behing a proxy<a class="sectionlink" href="#proxy_server" title="Link to here">¶</a></h2>
+<div class="subsection"><h2 id="proxy_server">2.4.3 Using JMeter behind a proxy<a class="sectionlink" href="#proxy_server" title="Link to here">¶</a></h2>
<p>If you are testing from behind a firewall/proxy server, you may need to provide JMeter with
the firewall/proxy server hostname and port number. To do so, run the jmeter[.bat] file
from a command line with the following parameters:</p>
Modified: jmeter/branches/docs-2.13/xdocs/index.xml
URL: http://svn.apache.org/viewvc/jmeter/branches/docs-2.13/xdocs/index.xml?rev=1683596&r1=1683595&r2=1683596&view=diff
==============================================================================
--- jmeter/branches/docs-2.13/xdocs/index.xml (original)
+++ jmeter/branches/docs-2.13/xdocs/index.xml Thu Jun 4 17:08:16 2015
@@ -79,7 +79,7 @@ As far as web-services and remote servic
however JMeter does not perform all the actions supported by browsers.
In particular, JMeter does not execute the Javascript found in HTML pages.
Nor does it render the HTML pages as a browser does
-(it's possible to view the response as HTML etc, but the timings are not included in any samples, and only one sample in one thread is ever viewed at a time).
+(it's possible to view the response as HTML etc., but the timings are not included in any samples, and only one sample in one thread is ever viewed at a time).
</p>
<h2>How do I do it?</h2>
Modified: jmeter/branches/docs-2.13/xdocs/mail.xml
URL: http://svn.apache.org/viewvc/jmeter/branches/docs-2.13/xdocs/mail.xml?rev=1683596&r1=1683595&r2=1683596&view=diff
==============================================================================
--- jmeter/branches/docs-2.13/xdocs/mail.xml (original)
+++ jmeter/branches/docs-2.13/xdocs/mail.xml Thu Jun 4 17:08:16 2015
@@ -127,14 +127,14 @@ and read.
<strong>
Start a new thread for a new topic
</strong><br/>
-When asing a new question, please start a new thread with an appropriate new subject line.
+When asking a new question, please start a new thread with an appropriate new subject line.
This makes it easier to read, and to find later in the archives.
</p>
<p>
<strong>
Do your best to ensure that you are not sending HTML or
- "Stylelized" email to the list.
+ "Stylized" email to the list.
</strong><br/>
If you are using Outlook or Outlook Express or Eudora, chances are that
you are sending HTML email by default. There is usually a setting that
Modified: jmeter/branches/docs-2.13/xdocs/usermanual/get-started.xml
URL: http://svn.apache.org/viewvc/jmeter/branches/docs-2.13/xdocs/usermanual/get-started.xml?rev=1683596&r1=1683595&r2=1683596&view=diff
==============================================================================
--- jmeter/branches/docs-2.13/xdocs/usermanual/get-started.xml (original)
+++ jmeter/branches/docs-2.13/xdocs/usermanual/get-started.xml Thu Jun 4 17:08:16 2015
@@ -283,7 +283,7 @@ and the java command silently ignores th
<p>A documentation for each template explains what to do once test plan is created from template.</p>
</subsection>
-<subsection name="§-num;.4.3 Using JMeter behing a proxy" anchor="proxy_server">
+<subsection name="§-num;.4.3 Using JMeter behind a proxy" anchor="proxy_server">
<p>If you are testing from behind a firewall/proxy server, you may need to provide JMeter with
the firewall/proxy server hostname and port number. To do so, run the jmeter[.bat] file
from a command line with the following parameters:</p>