Author: sebb
Date: Thu Jul 8 11:16:09 2010
New Revision: 961713
URL: http://svn.apache.org/viewvc?rev=961713&view=rev
Log:
Documentation fixes
Modified:
jakarta/jmeter/trunk/docs/usermanual/build-test-plan.html
jakarta/jmeter/trunk/docs/usermanual/get-started.html
jakarta/jmeter/trunk/xdocs/usermanual/build-test-plan.xml
jakarta/jmeter/trunk/xdocs/usermanual/get-started.xml
Modified: jakarta/jmeter/trunk/docs/usermanual/build-test-plan.html
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/usermanual/build-test-plan.html?rev=961713&r1=961712&r2=961713&view=diff
==============================================================================
--- jakarta/jmeter/trunk/docs/usermanual/build-test-plan.html (original)
+++ jakarta/jmeter/trunk/docs/usermanual/build-test-plan.html Thu Jul 8
11:16:09 2010
@@ -167,7 +167,7 @@ elements to a test plan
</a>
can be done by right-clicking on an element in the
tree, and choosing a new element from the "add" list. Alternatively, elements
can
-be loaded from file and added by choosing the "open" option.
+be loaded from file and added by choosing the "merge" or "open" option.
</p>
<p>
To remove an element, make sure the element is selected, right-click on the
element,
@@ -187,13 +187,13 @@ and choose the "remove" option.
<blockquote>
<p>
To load an element from file, right click on the existing tree element to which
-you want to add the loaded element, and select the "open" option. Choose the
file where
-your elements are saved. JMeter will load the elements into the tree.
+you want to add the loaded element, and select the "merge" option. Choose the
file where
+your elements are saved. JMeter will merge the elements into the tree.
</p>
<p>
-To save tree elements, right click on an element and choose the "save" option.
+To save tree elements, right click on an element and choose the "Save
Selection As ..." option.
JMeter will save the element selected, plus all child elements beneath it. In
this way,
-you can save test tree fragments, individual elements, or the entire test plan.
+you can save test tree fragments and individual elements for later use.
</p>
<p>
<table border="1" bgcolor="#bbbb00" width="50%" cellspacing="0"
cellpadding="2">
@@ -238,7 +238,7 @@ configured for an element depends on wha
<blockquote>
<p>
Although it is not required, we recommend that you save the Test Plan to a
-file before running it. To save the Test Plan, select Save Test Plan from the
+file before running it. To save the Test Plan, select "Save" or "Save Test
Plan As ..." from the
File menu (with the latest release, it is no longer necessary to select the
Test Plan element first).
</p>
@@ -247,8 +247,8 @@ Test Plan element first).
<tr><td>JMeter allows you to save the entire Test Plan tree or
only a portion of it. To save only the elements located in a particular
"branch"
of the Test Plan tree, select the Test Plan element in the tree from which to
start
-the "branch", and then click your right mouse button to access the Save As
menu item.
-Alternatively, select the appropriate Test Plan element and then select Save
As from
+the "branch", and then click your right mouse button to access the "Save
Selection As ..." menu item.
+Alternatively, select the appropriate Test Plan element and then select "Save
Selection As ..." from
the Edit menu.
</td></tr>
@@ -276,6 +276,7 @@ then JMeter is running your test plan (o
<p>
The numbers to the left of the green box are the number of active threads /
total number of threads.
+These only apply to a locally run test; they do not include any threads
started on remote systems when using client-server mode.
</p>
</blockquote>
Modified: jakarta/jmeter/trunk/docs/usermanual/get-started.html
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/usermanual/get-started.html?rev=961713&r1=961712&r2=961713&view=diff
==============================================================================
--- jakarta/jmeter/trunk/docs/usermanual/get-started.html (original)
+++ jakarta/jmeter/trunk/docs/usermanual/get-started.html Thu Jul 8 11:16:09
2010
@@ -446,13 +446,13 @@ system.properties
</p>
<p>
-JMeter defaults to protocol level TLS. This can be changed by editting the
JMeter property
+JMeter HTTP defaults to protocol level TLS. This can be changed by editting
the JMeter property
"https.default.protocol" in jmeter.properties or user.properties.
</p>
<p>
<b>
-JMeter is configured to accept all certificates,
+The JMeter HTTP samplers are configured to accept all certificates,
whether trusted or not, regardless of validity periods etc.
</b>
@@ -472,6 +472,11 @@ There is also the
</td></tr>
</table>
</p>
+<p>
+
+The SMTP sampler can optionally use a local trust store or trust all
certificates.
+
+</p>
</blockquote>
</td></tr>
<tr><td><br></td></tr>
Modified: jakarta/jmeter/trunk/xdocs/usermanual/build-test-plan.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/usermanual/build-test-plan.xml?rev=961713&r1=961712&r2=961713&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/usermanual/build-test-plan.xml (original)
+++ jakarta/jmeter/trunk/xdocs/usermanual/build-test-plan.xml Thu Jul 8
11:16:09 2010
@@ -37,7 +37,7 @@ controllers, listeners, timers, assertio
<subsection name="§-num;.1 Adding and Removing Elements"
anchor="add_remove">
<p>Adding <a href="test_plan.html">elements to a test plan</a> can be done by
right-clicking on an element in the
tree, and choosing a new element from the "add" list. Alternatively, elements
can
-be loaded from file and added by choosing the "open" option. </p>
+be loaded from file and added by choosing the "merge" or "open" option.</p>
<p>To remove an element, make sure the element is selected, right-click on the
element,
and choose the "remove" option.</p>
@@ -45,12 +45,12 @@ and choose the "remove" option.</p>
<subsection name="§-num;.2 Loading and Saving Elements" anchor="load_save">
<p>To load an element from file, right click on the existing tree element to
which
-you want to add the loaded element, and select the "open" option. Choose the
file where
-your elements are saved. JMeter will load the elements into the tree.</p>
+you want to add the loaded element, and select the "merge" option. Choose the
file where
+your elements are saved. JMeter will merge the elements into the tree.</p>
-<p>To save tree elements, right click on an element and choose the "save"
option.
+<p>To save tree elements, right click on an element and choose the "Save
Selection As ..." option.
JMeter will save the element selected, plus all child elements beneath it. In
this way,
-you can save test tree fragments, individual elements, or the entire test
plan.</p>
+you can save test tree fragments and individual elements for later use.</p>
<note>The workbench is not automatically saved with the test plan, but it can
be saved separately as above.</note>
</subsection>
@@ -65,15 +65,15 @@ configured for an element depends on wha
<subsection name="§-num;.4 Saving the Test Plan" anchor="saving">
<p>Although it is not required, we recommend that you save the Test Plan to a
-file before running it. To save the Test Plan, select Save Test Plan from the
+file before running it. To save the Test Plan, select "Save" or "Save Test
Plan As ..." from the
File menu (with the latest release, it is no longer necessary to select the
Test Plan element first).</p>
<note>JMeter allows you to save the entire Test Plan tree or
only a portion of it. To save only the elements located in a particular
"branch"
of the Test Plan tree, select the Test Plan element in the tree from which to
start
-the "branch", and then click your right mouse button to access the Save As
menu item.
-Alternatively, select the appropriate Test Plan element and then select Save
As from
+the "branch", and then click your right mouse button to access the "Save
Selection As ..." menu item.
+Alternatively, select the appropriate Test Plan element and then select "Save
Selection As ..." from
the Edit menu.
</note>
</subsection>
@@ -86,6 +86,7 @@ If "Start" is disabled, and "Stop" is en
then JMeter is running your test plan (or, at least, it thinks it is).</p>
<p>
The numbers to the left of the green box are the number of active threads /
total number of threads.
+These only apply to a locally run test; they do not include any threads
started on remote systems when using client-server mode.
</p>
</subsection>
Modified: jakarta/jmeter/trunk/xdocs/usermanual/get-started.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/usermanual/get-started.xml?rev=961713&r1=961712&r2=961713&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/usermanual/get-started.xml (original)
+++ jakarta/jmeter/trunk/xdocs/usermanual/get-started.xml Thu Jul 8 11:16:09
2010
@@ -117,15 +117,18 @@ If your version of Java does not include
Include the necessary encryption packages in JMeter's <a
href="#classpath">classpath</a>.
Also, update <a href="#configuring_jmeter">system.properties</a> to register
the SSL Provider.</p>
<p>
-JMeter defaults to protocol level TLS. This can be changed by editting the
JMeter property
+JMeter HTTP defaults to protocol level TLS. This can be changed by editting
the JMeter property
"https.default.protocol" in jmeter.properties or user.properties.
</p>
-<p><b>JMeter is configured to accept all certificates,
+<p><b>The JMeter HTTP samplers are configured to accept all certificates,
whether trusted or not, regardless of validity periods etc.</b>
This is to allow the maximum flexibility in testing servers.</p>
<p>If the server requires a client certificate, this can be provided.</p>
<p>There is also the <complink name="SSL Manager"/>, for greater control of
certificates.</p>
<note>The JMeter proxy server (see below) supports recording HTTPS (SSL) in
versions after 2.3.4</note>
+<p>
+The SMTP sampler can optionally use a local trust store or trust all
certificates.
+</p>
</subsection>
<subsection name="§-num;.2.5 JDBC Driver" anchor="opt_jdbc">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
