jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From milam...@apache.org
Subject svn commit: r1742769 [1/2] - in /jmeter/trunk/docs: ./ localising/ usermanual/
Date Sun, 08 May 2016 06:36:04 GMT
Author: milamber
Date: Sun May  8 06:36:03 2016
New Revision: 1742769

URL: http://svn.apache.org/viewvc?rev=1742769&view=rev
Log:
Prepare next release 3.0: update docs tree and overview (RC4)

Modified:
    jmeter/trunk/docs/changes.html
    jmeter/trunk/docs/localising/index.html
    jmeter/trunk/docs/usermanual/build-test-plan.html
    jmeter/trunk/docs/usermanual/build-web-test-plan.html
    jmeter/trunk/docs/usermanual/component_reference.html
    jmeter/trunk/docs/usermanual/generating-dashboard.html
    jmeter/trunk/docs/usermanual/hints_and_tips.html
    jmeter/trunk/docs/usermanual/ldapanswer_xml.html
    jmeter/trunk/docs/usermanual/properties_reference.html
    jmeter/trunk/docs/usermanual/realtime-results.html
    jmeter/trunk/docs/usermanual/remote-test.html
    jmeter/trunk/docs/usermanual/test_plan.html

Modified: jmeter/trunk/docs/changes.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/changes.html?rev=1742769&r1=1742768&r2=1742769&view=diff
==============================================================================
--- jmeter/trunk/docs/changes.html (original)
+++ jmeter/trunk/docs/changes.html Sun May  8 06:36:03 2016
@@ -43,7 +43,8 @@ It is based on <a href="https://github.c
 <h3 class="ch_title">New validation feature, in one click run a selection of Thread Groups with <span class="code">1</span> user, no pause and <span class="code">1</span> iteration</h3>
 <figure><a href="./images/screenshots/changes/3.0/thread_group_validate.png"><img src="./images/screenshots/changes/3.0/thread_group_validate.png" width="295" height="629" alt=""></a><figcaption></figcaption></figure>
 <h3 class="ch_title">JSR223 Test Elements do not require a Cache Compilation Key anymore</h3>
-<p>Just check <span class="code">Cache compiled script if available</span> checkbox and the elements (Pre-Processor, Post-Processor, Assertions, Listeners...) will pre-compile the script if underlying language supports it and cache the compiled code</p>
+<p>Just check <span class="code">Cache compiled script if available</span> checkbox and the elements (Pre-Processor, Post-Processor, Assertions, Listeners, &hellip;) 
+will pre-compile the script and cache the compiled code if the underlying language supports it</p>
 <figure><a href="./images/screenshots/changes/3.0/jsr223_cache_compiled.png"><img src="./images/screenshots/changes/3.0/jsr223_cache_compiled.png" width="991" height="606" alt=""></a><figcaption></figcaption></figure>
 <h3 class="ch_title">Nashorn can now be used as Javascript engine providing better performance and easier usage</h3>
 To enable <a target="_blank" href="http://www.oracle.com/technetwork/articles/java/jf14-nashorn-2126515.html">Nashorn</a>, you need to set in <span class="code">user.properties</span>:
@@ -77,7 +78,7 @@ See <a href="./usermanual/generating-das
 This report provides the following metrics:
 </p>
 <ul>
-    <li><a href="https://en.wikipedia.org/wiki/Apdex" target="_blank">APDEX</a> table that computes for every transaction the APDEX based on configurable values for tolerated and satisfied thresholds</li>
+    <li><a href="https://en.wikipedia.org/wiki/Apdex" target="_blank">APDEX</a> (Application Performance Index) table that computes the APDEX based on configurable values for tolerated and satisfied thresholds</li>
     <li>A request summary graph showing the Success and failed transaction percentage: <figure><a href="./images/screenshots/changes/3.0/report_apdex_and_summary.png"><img src="./images/screenshots/changes/3.0/report_apdex_and_summary.png" width="1658" height="650" alt=""></a><figcaption></figcaption></figure></li>
     <li>A Statistics table providing in one table a summary of all metrics per transaction including 3 configurable percentiles : <figure><a href="./images/screenshots/changes/3.0/report_statistics.png"><img src="./images/screenshots/changes/3.0/report_statistics.png" width="1376" height="433" alt=""></a><figcaption></figcaption></figure></li>
     <li>An error table providing a summary of all errors and their proportion in the total requests : <figure><a href="./images/screenshots/changes/3.0/report_errors.png"><img src="./images/screenshots/changes/3.0/report_errors.png" width="1344" height="455" alt=""></a><figcaption></figcaption></figure></li>
@@ -121,13 +122,13 @@ Generate Summary Results =  32257 in 00:
 <p>You can now use a regular expression to select the samplers you want to filter. 
 Use parameter: <span class="code">useRegexpForSamplersList=true</span> and put a regex in pararameter <span class="code">samplersList</span>
 </p>
-<figure><a href="./images/screenshots/changes/3.0/graphite_backend_listener_regex.png"><img src="./images/screenshots/changes/3.0/graphite_backend_listener_regex.png" width="815" height="395" alt=""></a><figcaption></figcaption></figure>
+<figure><a href="./images/screenshots/changes/3.0/graphite_backend_listener_regex.png"><img src="./images/screenshots/changes/3.0/graphite_backend_listener_regex.png" width="806" height="380" alt=""></a><figcaption></figcaption></figure>
 <h2 class="ch_category">Protocols and Load Testing improvements</h2>
 <h3 class="ch_title">Migration to HttpClient 4.5.2 has been started. Although not completely finished, it improves many areas in JMeter</h3>
 <p>Migration to HttpClient 4.5.2 improves the following fields of JMeter:
 </p>
 <ul>
-<li>Support of recent RFC like <a href="https://tools.ietf.org/html/rfc6265" target="_blank">HTTP State Management Mechanism RFC-6265 for Cookies</a>, you should use now <span class="code">HC4CookieHandler</span> in HTTP Cookie Manager component</li>
+<li>Support of recent RFC like <a href="https://tools.ietf.org/html/rfc6265" target="_blank">HTTP State Management Mechanism RFC-6265 for Cookies</a>, you should use now <span class="code">HC4CookieHandler</span> in HTTP Cookie Manager component and select <span class="code">standard</span> Cookie policy</li>
 <li><a href="https://en.wikipedia.org/wiki/Server_Name_Indication" target="_blank">Server Name Indication (SNI)</a> support for HttpClient4 implementation</li>
 <li>Improved and better performing validation mechanism for Stale connections and Keep-Alive management, see properties <span class="code">httpclient4.validate_after_inactivity</span> and <span class="code">httpclient4.time_to_live</span></li>
 <li>Many bug fixes since previous version 4.2.6 used in JMeter 2.13, see <a href="http://www.apache.org/dist/httpcomponents/httpclient/RELEASE_NOTES-4.5.x.txt" target="_blank">HttpClient 4.5.X release notes</a></li>
@@ -137,14 +138,14 @@ Use parameter: <span class="code">useReg
 <ul>
 <li>Parsing of CSS imported files (through <span class="code">@import</span>) or embedded resources (background, images, &hellip;)</li>
 <li>Lazy initialization of SSL context: For 15 Threads 138% more sampling in 5 minutes for HTTP only tests. Gain increases as number of threads increases</li>
-<li>Rework of Connection management for Parallel Download: This now reproduces nowadays browsers behaviour and improved throughput. For 15 Threads 135% extra samples in 5 minutes.</li>
+<li>Rework of Connection management for Parallel Download: This better simulates current browser behaviour and improves throughput. For 15 Threads 135% extra samples in 5 minutes.</li>
 <li>Reuse of Threads used for Parallel downloads through a ThreadPool: This improves throughput and increases JMeter scalability for such tests</li>
 <li>Total of 750% more throughput found on test with 15 threads, the more threads you have the more the gain</li>
-<li>You can now compute and store just the MD5 of embedded resources instead of storing the entire response, this can be done by setting <span class="code">httpsampler.embedded_resources_use_md5=true</span> property</li>
+<li>You can now compute and store just the MD5 of embedded resources instead of storing the entire response, this can be done by setting the property <span class="code">httpsampler.embedded_resources_use_md5=true</span></li>
 </ul>
 <h3 class="ch_title">Introduction of Sample Timeout feature</h3>
-<p>This new Pre-Processor allows you to apply a Timeout on the elements that are in its scope. 
-In the screenshot below the 10 seconds timeout applies to <span class="code">Debug Sampler</span> and <span class="code">HTTP Request</span> elements.
+<p>This new <a href="./usermanual/component_reference.html#Sample_Timeout">Sample Timeout</a> Pre-Processor allows you to apply a Timeout on the elements that are in its scope. 
+In the screenshot below the 10 second timeout applies to the <span class="code">Debug Sampler</span> and <span class="code">HTTP Request</span> elements.
 </p>
 <figure><a href="./images/screenshots/changes/3.0/sample_timeout.png"><img src="./images/screenshots/changes/3.0/sample_timeout.png" width="828" height="161" alt=""></a><figcaption></figcaption></figure>
 
@@ -235,9 +236,9 @@ Deprecated Libraries dropped or replaced
     <li>Since version 3.0, you can use Nashorn Engine (default javascript engine is Rhino) under Java8 for Elements that use Javascript Engine (<span class="code">__javaScript</span>, <span class="code">IfController</span>). If you want to use it, use property <span class="code">javascript.use_rhino=false</span>, see <a href="http://bz.apache.org/bugzilla/show_bug.cgi?id=58406">
       Bug
       58406</a>.
-    <div class="clear"></div><div class="note">Note in future versions, we will switch to Nashorn by default, so users are encouraged to report any issue related to broken code when using Nashorn instead of Rhino.</div><div class="clear"></div>
+    <div class="clear"></div><div class="note">Note: in a future version, we will switch to Nashorn by default. Users are encouraged to report any issue related to using Nashorn instead of Rhino.</div><div class="clear"></div>
     </li>
-    <li>Since version 3.0, JMS Publisher will reload contents of file if Message source is "<span class="code">From File</span>" and the "<span class="code">Filename</span>" field changes (e.g. if it uses a variable)</li>
+    <li>Since version 3.0, JMS Publisher will reload contents of file if Message source is "<span class="code">From File</span>" and the "<span class="code">Filename</span>" field changes (e.g. if it uses a variable that has changed)</li>
     <li>org.apache.jmeter.gui.util.ButtonPanel has been removed, if you use it in your 3<sup>rd</sup> party plugin or custom development ensure you update your code. See <a href="http://bz.apache.org/bugzilla/show_bug.cgi?id=58687">
       Bug
       58687</a></li>
@@ -250,33 +251,33 @@ Deprecated Libraries dropped or replaced
     <li>Property <span class="code">jmeterthread.reversePostProcessors</span> has been removed. See <a href="http://bz.apache.org/bugzilla/show_bug.cgi?id=58728">
       Bug
       58728</a></li>
-    <li>Property <span class="code">jmeter.toolbar.display</span> has been removed, toolbar is now always displayed. See <a href="http://bz.apache.org/bugzilla/show_bug.cgi?id=59236">
+    <li>Property <span class="code">jmeter.toolbar.display</span> has been removed, the toolbar is now always displayed. See <a href="http://bz.apache.org/bugzilla/show_bug.cgi?id=59236">
       Bug
       59236</a></li>
-    <li>Property <span class="code">jmeter.errorscounter.display</span> has been removed, errors/warnings counter is now always displayed. See <a href="http://bz.apache.org/bugzilla/show_bug.cgi?id=59236">
+    <li>Property <span class="code">jmeter.errorscounter.display</span> has been removed, the errors/warnings counter is now always displayed. See <a href="http://bz.apache.org/bugzilla/show_bug.cgi?id=59236">
       Bug
       59236</a></li>
-    <li>Property <span class="code">xml.parser</span> has been removed, it is not used anymore as <span class="code">org.apache.jmeter.util.JMeterUtils#getXMLParser</span> has been deprecated and is not used neither. See <a href="http://bz.apache.org/bugzilla/show_bug.cgi?id=59236">
+    <li>Property <span class="code">xml.parser</span> has been removed, it is not used anymore as <span class="code">org.apache.jmeter.util.JMeterUtils#getXMLParser</span> has been deprecated and is not used either. See <a href="http://bz.apache.org/bugzilla/show_bug.cgi?id=59236">
       Bug
       59236</a></li>  
-    <li>Summariser listener now outputs a formated duration in <span class="code">HH:mm:ss</span> (Hour:Minute:Second), it previously outputed seconds. See <a href="http://bz.apache.org/bugzilla/show_bug.cgi?id=58776">
+    <li>Summariser listener now shows the duration in the format <span class="code">HH:mm:ss</span> (Hour:Minute:Second), it previously showed the duration in seconds. See <a href="http://bz.apache.org/bugzilla/show_bug.cgi?id=58776">
       Bug
       58776</a></li>
     <li><span class="code">org.apache.jmeter.protocol.http.visualizers.RequestViewHTTP.getQueryMap</span> signature has changed, if you use it ensure you update your code. See <a href="http://bz.apache.org/bugzilla/show_bug.cgi?id=58845">
       Bug
       58845</a></li>
-    <li>JMS Subscriber will consider a sample to be an error if number of received messages is not equal to expected number of messages. It previously considered a sample OK if at least 1 message was received. See <a href="http://bz.apache.org/bugzilla/show_bug.cgi?id=58980">
+    <li>JMS Subscriber will consider a sample to be an error if the number of received messages is not equal to expected number of messages. It previously considered a sample OK if at least 1 message was received. See <a href="http://bz.apache.org/bugzilla/show_bug.cgi?id=58980">
       Bug
       58980</a></li>
-    <li>Since version 3.0, HTTP(S) Test Script recorder uses default port <span class="code">8888</span> as configured when using Recording Template. See <a href="http://bz.apache.org/bugzilla/show_bug.cgi?id=59006">
+    <li>Since version 3.0, HTTP(S) Test Script recorder defaults to using port <span class="code">8888</span> (as configured when using Recording Template). See <a href="http://bz.apache.org/bugzilla/show_bug.cgi?id=59006">
       Bug
       59006</a></li>
-    <li>Since version 3.0, the parser for embedded resources (replaced since 2.10 by Lagarto based implementation) relying on htmlparser library (HtmlParserHTMLParser) has been dropped along with its dependencies.</li>
-    <li>Since version 3.0, the support for reading old Avalon format JTL (result) files has been removed, see <a href="http://bz.apache.org/bugzilla/show_bug.cgi?id=59064">
+    <li>Since version 3.0, the parser for embedded resources (replaced since 2.10 by Lagarto based implementation) which relied on the htmlparser library (HtmlParserHTMLParser) has been dropped along with its dependencies.</li>
+    <li>Since version 3.0, support for reading old Avalon format JTL (result) files has been removed, see <a href="http://bz.apache.org/bugzilla/show_bug.cgi?id=59064">
       Bug
       59064</a></li>
-    <li>Since version 3.0, the default property value for <span class="code">http.java.sampler.retries</span> has been switched to <span class="code">0</span> (no retry by default) to align it with the behaviour of HttpClient4. 
-    <div class="clear"></div><div class="note">Note also that its meaning has changed: before 3.0, <span class="code">http.java.sampler.retries=1</span> meant <span class="code">No Retry</span>, since 3.0 <span class="code">http.java.sampler.retries=1</span> means <span class="code">1</span> retry.
+    <li>Since version 3.0, the default property value for <span class="code">http.java.sampler.retries</span> has been changed to <span class="code">0</span> (no retry by default) to align it with the behaviour of HttpClient4. 
+    <div class="clear"></div><div class="note">Note also that its meaning has changed: before 3.0, <span class="code">http.java.sampler.retries=1</span> meant <span class="code">No Retry</span> (i.e. total tries = 1), since 3.0 <span class="code">http.java.sampler.retries=1</span> means <span class="code">1</span> retry.
     (Note: this only applies to the Java HTTP Sampler)</div><div class="clear"></div>
     See <a href="http://bz.apache.org/bugzilla/show_bug.cgi?id=59103">
       Bug
@@ -289,9 +290,6 @@ Deprecated Libraries dropped or replaced
     </ul>
     </li>
     <li><span class="code">httpsampler.await_termination_timeout</span> has been replaced by <span class="code">httpsampler.parallel_download_thread_keepalive_inseconds</span> which is now the keep alive time for the parallel download threads (in seconds).</li>
-    <li>For Thread Group Test Element, the property "<span class="code">Action to be taken after a Sample Error</span>" value has been switched from "<span class="code">Continue</span>" to "<span class="code">Start Next thread loop</span>". See <a href="http://bz.apache.org/bugzilla/show_bug.cgi?id=59152">
-      Bug
-      59152</a></li>
     <li>JDBC Request has been updated to use commons-dbcp2, since then the behaviour is slightly different, ensure you have a correct "Validation Query" for your database. See <a href="http://bz.apache.org/bugzilla/show_bug.cgi?id=58786">
       Bug
       58786</a></li>
@@ -324,13 +322,13 @@ Deprecated Libraries dropped or replaced
       59156</a>)</li>
     </ul>
     </li>
-    <li>Number of redirects followed by JMeter is now 20, it was previously 5. This can be changed with property <span class="code">httpsampler.max_redirects</span>. See <a href="http://bz.apache.org/bugzilla/show_bug.cgi?id=59382">
+    <li>Maximum number of redirects allowed by JMeter is now 20, it was previously 5. This can be changed with the property <span class="code">httpsampler.max_redirects</span>. See <a href="http://bz.apache.org/bugzilla/show_bug.cgi?id=59382">
       Bug
       59382</a></li>
 </ul>
 <h3>Deprecated and removed elements</h3>
 <ul>
-    <li>MongoDB elements (MongoDB Source Config, MongoDB Script) have been deprecated and will be removed in the next version of JMeter. They do not appear anymore in the menu, if you need them modify <span class="code">not_in_menu</span> property. JMeter team advises not to use them anymore. See <a href="http://bz.apache.org/bugzilla/show_bug.cgi?id=58772">
+    <li>MongoDB elements (MongoDB Source Config, MongoDB Script) have been deprecated and will be removed in the next version of JMeter. They do not appear anymore in the menu, if you need them modify <span class="code">not_in_menu</span> property. The JMeter team advises not to use them anymore. See <a href="http://bz.apache.org/bugzilla/show_bug.cgi?id=58772">
       Bug
       58772</a></li>
     <li>WebService(SOAP) Request and HTML Parameter Mask which were deprecated in 2.13 version, have now been removed following our <a href="./usermanual/best-practices.html#deprecation">deprecation strategy</a>.
@@ -620,6 +618,11 @@ Deprecated Libraries dropped or replaced
       59099</a>
     -
   Backend listener : Add the possibility to consider samplersList as a Regular Expression. Contributed by Antonio Gomes Rodrigues (ra0077 at gmail.com)</li>
+<li><a href="http://bz.apache.org/bugzilla/show_bug.cgi?id=59424">
+      Bug
+      59424</a>
+    -
+  Visualizer : Add "Clear" in popup menu</li>
 </ul>
 
 <h3>Timers, Assertions, Config, Pre- &amp; Post-Processors</h3>
@@ -804,21 +807,6 @@ Deprecated Libraries dropped or replaced
       58864</a>
     -
   Arguments Panel : when moving parameter with up / down, ensure that the selection remains visible. Based on a contribution by Benoit Wiart (benoit dot wiart at gmail.com)</li>
-<li><a href="http://bz.apache.org/bugzilla/show_bug.cgi?id=58924">
-      Bug
-      58924</a>
-    -
-  Dashboard / report : It should be possible to export the generated graph as image (PNG). Contributed by Benoit Wiart (benoit dot wiart at gmail.com)</li>
-<li><a href="http://bz.apache.org/bugzilla/show_bug.cgi?id=58884">
-      Bug
-      58884</a>
-    -
-  JMeter report generator : need better error message. Developed by Florent Sabbe (f dot sabbe at ubik-ingenierie.com) and contributed by Ubik-Ingenierie</li>
-<li><a href="http://bz.apache.org/bugzilla/show_bug.cgi?id=58957">
-      Bug
-      58957</a>
-    -
-  Report/Dashboard: HTML Exporter does not create parent directories for output directory. Developed by Florent Sabbe (f dot sabbe at ubik-ingenierie.com) and contributed by Ubik-Ingenierie</li>
 <li><a href="http://bz.apache.org/bugzilla/show_bug.cgi?id=58968">
       Bug
       58968</a>
@@ -839,11 +827,6 @@ Deprecated Libraries dropped or replaced
       57182</a>
     -
   Settings defaults : Switch "<span class="code">jmeter.save.saveservice.idle_time</span>" to true (after 2.13)</li>
-<li><a href="http://bz.apache.org/bugzilla/show_bug.cgi?id=58987">
-      Bug
-      58987</a>
-    -
-  Report/Dashboard: Improve error reporting.</li>
 <li><a href="http://bz.apache.org/bugzilla/show_bug.cgi?id=58870">
       Bug
       58870</a>
@@ -899,11 +882,6 @@ Deprecated Libraries dropped or replaced
       59105</a>
     -
   TableEditor : Add ability to paste rows from clipboard and delete multiple selection. Contributed by Vincent Herilier (vherilier at gmail.com)</li>
-<li><a href="http://bz.apache.org/bugzilla/show_bug.cgi?id=59152">
-      Bug
-      59152</a>
-    -
-  Thread Group: Change "<span class="code">Action to be taken after a Sample Error</span>" value from "<span class="code">Continue</span>" to "<span class="code">Start Next thread loop</span>". Contributed by Antonio Gomes Rodrigues (ra0077 at gmail.com)</li>
 <li><a href="http://bz.apache.org/bugzilla/show_bug.cgi?id=59197">
       Bug
       59197</a>
@@ -938,12 +916,17 @@ Deprecated Libraries dropped or replaced
       Bug
       59320</a>
     -
-  Better tooltip in GUI with GenericTestBeanCustomizer (CSV Data Set Config, JDBC Connection Configuration, Keystore Configuration...) . Based on a patch by Antonio Gomes Rodrigues (ra0077 at gmail.com)</li>
+  Better tooltip in GUI with GenericTestBeanCustomizer (CSV Data Set Config, JDBC Connection Configuration, Keystore Configuration, &hellip;) . Based on a patch by Antonio Gomes Rodrigues (ra0077 at gmail.com)</li>
 <li><a href="http://bz.apache.org/bugzilla/show_bug.cgi?id=59171">
       Bug
       59171</a>
     -
   Sample Result SaveConfig Dialog is generated in random order</li>
+<li><a href="http://bz.apache.org/bugzilla/show_bug.cgi?id=59425">
+      Bug
+      59425</a>
+    -
+  Display error about missing help page inside the help pane</li>
 </ul>
 <h2 class="ch_section" id="Non-functional changes">Non-functional changes</h2>
 <ul>
@@ -1387,31 +1370,6 @@ Deprecated Libraries dropped or replaced
       58913</a>
     -
   When closing JMeter should not interpret cancel as "<em>destroy my test plan</em>". Contributed by Benoit Wiart (benoit dot wiart at gmail.com)</li>
-    <li><a href="http://bz.apache.org/bugzilla/show_bug.cgi?id=58952">
-      Bug
-      58952</a>
-    -
-  Report/Dashboard: Generation of aggregated series in graphs does not work. Developed by Florent Sabbe (f dot sabbe at ubik-ingenierie.com) and contributed by Ubik-Ingenierie</li>
-    <li><a href="http://bz.apache.org/bugzilla/show_bug.cgi?id=58931">
-      Bug
-      58931</a>
-    -
-  New Report/Dashboard : Getting font errors under Firefox and Chrome (not Safari)</li>
-    <li><a href="http://bz.apache.org/bugzilla/show_bug.cgi?id=58932">
-      Bug
-      58932</a>
-    -
-  Report / Dashboard: Document clearly and log what report are not generated when saveservice options are not correct. Developed by Florent Sabbe (f dot sabbe at ubik-ingenierie.com) and contributed by Ubik-Ingenierie</li>
-    <li><a href="http://bz.apache.org/bugzilla/show_bug.cgi?id=59055">
-      Bug
-      59055</a>
-    -
-  JMeter report generator : When generation is not launched from <span class="code">jmeter/bin</span> folder <span class="code">report-template</span> is not found</li>
-    <li><a href="http://bz.apache.org/bugzilla/show_bug.cgi?id=58986">
-      Bug
-      58986</a>
-    -
-  Report/Dashboard reuses the same output directory</li>
     <li><a href="http://bz.apache.org/bugzilla/show_bug.cgi?id=59096">
       Bug
       59096</a>
@@ -1432,6 +1390,16 @@ Deprecated Libraries dropped or replaced
       56927</a>
     -
   Disable language change during a test</li>
+    <li><a href="http://bz.apache.org/bugzilla/show_bug.cgi?id=59391">
+      Bug
+      59391</a>
+    -
+  In Distributed mode, the client exits abnormally at the end of test</li>
+    <li><a href="http://bz.apache.org/bugzilla/show_bug.cgi?id=59397">
+      Bug
+      59397</a>
+    -
+  build.xml does not make dist.executables executable on Unix systems</li>    
 </ul>
 
  
@@ -1464,10 +1432,8 @@ Deprecated Libraries dropped or replaced
 <li>Philip Helger (http://www.helger.com) for his <a href="https://github.com/phax" target="_blank">CSS Parser</a> and for taking into account our bug reports very rapidly</li>
 <li>Irek Pastusiak (the.automatic.tester at gmail.com)</li>
 </ul>
-
-<br>
-We also thank bug reporters who helped us improve JMeter. <br>
-For this release we want to give special thanks to the following reporters for the clear reports and tests made after our fixes:
+<p>We also thank bug reporters who helped us improve JMeter. <br>
+For this release we want to give special thanks to the following reporters for the clear reports and tests made after our fixes:</p>
 <ul>
 <li>purnasatyap at gmail dot com  for the tests and reports on nightly build</li>
 <li>Sergey Batalin (sergey_batalin at mail dot ru) for the tests and reports on nightly build</li>

Modified: jmeter/trunk/docs/localising/index.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/localising/index.html?rev=1742769&r1=1742768&r2=1742769&view=diff
==============================================================================
--- jmeter/trunk/docs/localising/index.html (original)
+++ jmeter/trunk/docs/localising/index.html Sun May  8 06:36:03 2016
@@ -1,7 +1,7 @@
 <!DOCTYPE html SYSTEM "about:legacy-compat">
 <html lang="en"><head><META http-equiv="Content-Type" content="text/html; charset=iso-8859-15"><title>Apache JMeter
           -
-          JMeter Localisation (Translator's Guide)</title><meta name="author" value="Jordi Salvat i Alabart"><meta name="email" value="jsalvata@atg.com"><meta name="viewport" content="width=device-width, initial-scale=1"><link href="http://fonts.googleapis.com/css?family=Merriweather:400normal" rel="stylesheet" type="text/css"><link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.1/css/font-awesome.min.css" rel="stylesheet" type="text/css"><link rel="stylesheet" type="text/css" href="../css/new-style.css"><link rel="apple-touch-icon-precomposed" href="../images/apple-touch-icon.png"><link rel="icon" href="../images/favicon.png"><meta name="msapplication-TileColor" content="#ffffff"><meta name="msapplication-TileImage" content="../images/mstile-144x144.png"><meta name="theme-color" content="#ffffff"></head><body role="document"><a href="#content" class="hidden">Main content</a><div class="header"><!--
+          JMeter Localisation (Translator's Guide)</title><meta name="author" value="Apache JMeter developers"><meta name="email" value="dev@jmeter.apache.org"><meta name="viewport" content="width=device-width, initial-scale=1"><link href="http://fonts.googleapis.com/css?family=Merriweather:400normal" rel="stylesheet" type="text/css"><link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.1/css/font-awesome.min.css" rel="stylesheet" type="text/css"><link rel="stylesheet" type="text/css" href="../css/new-style.css"><link rel="apple-touch-icon-precomposed" href="../images/apple-touch-icon.png"><link rel="icon" href="../images/favicon.png"><meta name="msapplication-TileColor" content="#ffffff"><meta name="msapplication-TileImage" content="../images/mstile-144x144.png"><meta name="theme-color" content="#ffffff"></head><body role="document"><a href="#content" class="hidden">Main content</a><div class="header"><!--
             APACHE LOGO
           --><div><a href="http://www.apache.org"><img title="Apache Software Foundation" class="asf-logo logo" src="../images/asf-logo.svg" alt="Logo ASF"></a></div><!--
               PROJECT LOGO

Modified: jmeter/trunk/docs/usermanual/build-test-plan.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/build-test-plan.html?rev=1742769&r1=1742768&r2=1742769&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/build-test-plan.html (original)
+++ jmeter/trunk/docs/usermanual/build-test-plan.html Sun May  8 06:36:03 2016
@@ -109,7 +109,7 @@ The commands will only be accepted if th
 <div class="subsection"><h2 id="error_reporting">3.7 Error reporting<a class="sectionlink" href="#error_reporting" title="Link to here">&para;</a></h2>
 <p>
 JMeter reports warnings and errors to the jmeter.log file, as well as some information on the test run itself.
-JMeter shows at the right hand end of its window, the number of warnings/errors found in jmeter.log file next to the warning icon. 
+JMeter shows the number of warnings/errors found in jmeter.log file next to the warning icon (triangle) at the right hand end of its window. 
 Click on the warning icon to show the jmeter.log file at the bottom of JMeter's window.
 Just occasionally there may be some errors that JMeter is unable to trap and log; these will appear on the command console.
 If a test is not behaving as you expect, please check the log file in case any errors have been reported (e.g. perhaps a syntax error in a function call).

Modified: jmeter/trunk/docs/usermanual/build-web-test-plan.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/build-web-test-plan.html?rev=1742769&r1=1742768&r2=1742769&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/build-web-test-plan.html (original)
+++ jmeter/trunk/docs/usermanual/build-web-test-plan.html Sun May  8 06:36:03 2016
@@ -38,7 +38,7 @@ in the tree, if you have not already sel
 Group Control Panel in the right section of the JMeter window (see Figure 5.1
 below)</p>
 
-<figure><a href="../images/screenshots/webtest/threadgroup.png"><img src="../images/screenshots/webtest/threadgroup.png" width="955" height="406" alt="
+<figure><a href="../images/screenshots/webtest/threadgroup.png"><img src="../images/screenshots/webtest/threadgroup.png" width="640" height="416" alt="
 Figure 5.1. Thread Group with Default Values"></a><figcaption>
 Figure 5.1. Thread Group with Default Values</figcaption></figure>
 

Modified: jmeter/trunk/docs/usermanual/component_reference.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/component_reference.html?rev=1742769&r1=1742768&r2=1742769&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/component_reference.html (original)
+++ jmeter/trunk/docs/usermanual/component_reference.html Sun May  8 06:36:03 2016
@@ -1869,7 +1869,7 @@ count to three, JMeter will send a total
 In this example, we created a Test Plan that sends a particular HTTP Request
 only once and sends another HTTP Request five times.</p>
 
-<figure><a href="../images/screenshots/logic-controller/loop-example.png"><img src="../images/screenshots/logic-controller/loop-example.png" width="50-" height="158" alt="Figure 4 - Loop Controller Example"></a><figcaption>Figure 4 - Loop Controller Example</figcaption></figure>
+<figure><a href="../images/screenshots/logic-controller/loop-example.png"><img src="../images/screenshots/logic-controller/loop-example.png" width="506" height="158" alt="Figure 4 - Loop Controller Example"></a><figcaption>Figure 4 - Loop Controller Example</figcaption></figure>
 
 <p>We configured the Thread Group for a single thread and a loop count value of
 one. Instead of letting the Thread Group control the looping, we used a Loop
@@ -3211,12 +3211,18 @@ By default, a Graphite implementation is
         <div class="property"><div class="name req-true">graphiteMetricsSender</div><div class="description req-true"><span class="code">org.apache.jmeter.visualizers.backend.graphite.TextGraphiteMetricsSender</span> or <span class="code">org.apache.jmeter.visualizers.backend.graphite.PickleGraphiteMetricsSender</span></div><div class="required req-true">Yes</div></div>
         <div class="property"><div class="name req-true">graphiteHost</div><div class="description req-true">Graphite or InfluxDB (with Graphite plugin enabled) server host</div><div class="required req-true">Yes</div></div>
         <div class="property"><div class="name req-true">graphitePort</div><div class="description req-true">Graphite or InfluxDB (with Graphite plugin enabled) server port, defaults to <span class="code">2003</span>. Note <span class="code">PickleGraphiteMetricsSender</span> (port <span class="code">2004</span>) can only talk to Graphite server.</div><div class="required req-true">Yes</div></div>
-        <div class="property"><div class="name req-true">rootMetricsPrefix</div><div class="description req-true">Prefix of metrics sent to backend. Defaults to "<span class="code">jmeter</span>."</div><div class="required req-true">Yes</div></div>
+        <div class="property"><div class="name req-true">rootMetricsPrefix</div><div class="description req-true">Prefix of metrics sent to backend. Defaults to "<span class="code">jmeter</span>."
+        Note that JMeter does not add a separator between the root prefix and the samplerName which is why the trailing dot is currently needed.</div><div class="required req-true">Yes</div></div>
         <div class="property"><div class="name req-true">summaryOnly</div><div class="description req-true">Only send a summary with no detail. Defaults to <span class="code">true</span>.</div><div class="required req-true">Yes</div></div>
-        <div class="property"><div class="name req-true">samplersList</div><div class="description req-true">Semicolon separated list of samplers if <span class="code">useRegexpForSamplersList=false</span> or a regular expression for which you want to report metrics to backend if <span class="code">useRegexpForSamplersList=true</span>.</div><div class="required req-true">Yes</div></div>
+        <div class="property"><div class="name req-true">samplersList</div><div class="description req-true">Defines the names (labels) of sample results to be sent to the back end. 
+        If <span class="code">useRegexpForSamplersList=false</span> this is a list of semi-colon separated names.
+        If <span class="code">useRegexpForSamplersList=true</span> this is a regular expression which will be matched against the names.</div><div class="required req-true">Yes</div></div>
         <div class="property"><div class="name req-true">useRegexpForSamplersList</div><div class="description req-true">Consider samplersList as a regular expression to select the samplers for which you want to report metrics to backend. Defaults to <span class="code">false</span>.</div><div class="required req-true">Yes</div></div>
-        <div class="property"><div class="name req-true">percentiles</div><div class="description req-true">The percentiles you want to send to backend. List must be semicolon separated.</div><div class="required req-true">Yes</div></div>
-    </div><p>Read <a href="realtime-results.html">this</a> for more details.</p><figure><a href="../images/screenshots/grafana_dashboard.png"><img src="../images/screenshots/grafana_dashboard.png" width="1265" height="581" alt="Grafana dashboard"></a><figcaption>Grafana dashboard</figcaption></figure><div class="go-top"><a href="#">^</a></div></div>
+        <div class="property"><div class="name req-true">percentiles</div><div class="description req-true">The percentiles you want to send to the backend.
+        A percentile may contain a fractional part, for example <span class="code">12.5</span>.
+        (The separator is always ".")
+        List must be semicolon separated. Generally 3 or 4 values should be sufficient.</div><div class="required req-true">Yes</div></div>
+    </div><p>See also <a href="realtime-results.html">Real-time results</a> for more details.</p><figure><a href="../images/screenshots/grafana_dashboard.png"><img src="../images/screenshots/grafana_dashboard.png" width="1265" height="581" alt="Grafana dashboard"></a><figcaption>Grafana dashboard</figcaption></figure><div class="go-top"><a href="#">^</a></div></div>
 
 <a href="#">^</a>
 
@@ -5011,7 +5017,7 @@ can be set to <span class="code">true</s
         Parameters
         <a class="sectionlink" href="#Sample_Timeout_parms1" title="Link to here">&para;</a></h3><div class="property title"><div class="name title">Attribute</div><div class="description title">Description</div><div class="required title">Required</div></div>
         <div class="property"><div class="name req-false">Name</div><div class="description req-false">Descriptive name for this timer that is shown in the tree.</div><div class="required req-false">No</div></div>
-        <div class="property"><div class="name req-true">Sampler Timeout</div><div class="description req-true">If the sample takes longer to complete, it will be interrupted.</div><div class="required req-true">Yes</div></div>
+        <div class="property"><div class="name req-true">Sample Timeout</div><div class="description req-true">If the sample takes longer to complete, it will be interrupted.</div><div class="required req-true">Yes</div></div>
 </div><div class="go-top"><a href="#">^</a></div></div>
 
 <a href="#">^</a>

Modified: jmeter/trunk/docs/usermanual/generating-dashboard.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/generating-dashboard.html?rev=1742769&r1=1742768&r2=1742769&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/generating-dashboard.html (original)
+++ jmeter/trunk/docs/usermanual/generating-dashboard.html Sun May  8 06:36:03 2016
@@ -5,7 +5,7 @@
             APACHE LOGO
           --><div><a href="http://www.apache.org"><img title="Apache Software Foundation" class="asf-logo logo" src="../images/asf-logo.svg" alt="Logo ASF"></a></div><!--
               PROJECT LOGO
-            --><div><a href="http://jmeter.apache.org/"><img class="logo" src="../images/logo.svg" alt="Apache JMeter"></a></div><div class="banner"><iframe src="http://www.apache.org/ads/bannerbar.html" style="border-width:0;" frameborder="0" scrolling="no"></iframe><div class="clear"></div></div></div><div class="nav"><ul class="menu"><li onClick="return true"><div class="menu-title">About</div><ul><li><a href="../index.html">Overview</a></li><li><a href="http://www.apache.org/licenses/">License</a></li></ul></li></ul><ul class="menu"><li onClick="return true"><div class="menu-title">Download</div><ul><li><a href="../download_jmeter.cgi">Download Releases</a></li><li><a href="../changes.html">Release Notes</a></li></ul></li></ul><ul class="menu"><li onClick="return true"><div class="menu-title">Documentation</div><ul><li><a href="../usermanual/get-started.html">Get Started</a></li><li><a href="../usermanual/index.html">User Manual</a></li><li><a href="../usermanual/best-practices.
 html">Best Practices</a></li><li><a href="../usermanual/component_reference.html">Component Reference</a></li><li><a href="../usermanual/functions.html">Functions Reference</a></li><li><a href="../changes_history.html">Change History</a></li><li><a href="../api/index.html">Javadocs</a></li><li><a href="../building.html">Building JMeter and Add-Ons</a></li><li><a href="http://wiki.apache.org/jmeter">JMeter Wiki</a></li><li><a href="http://wiki.apache.org/jmeter/JMeterFAQ">FAQ (Wiki)</a></li></ul></li></ul><ul class="menu"><li onClick="return true"><div class="menu-title">Tutorials (PDF format)</div><ul><li><a href="../usermanual/jmeter_distributed_testing_step_by_step.pdf">Distributed Testing</a></li><li><a href="../usermanual/jmeter_proxy_step_by_step.pdf">Recording Tests</a></li><li><a href="../usermanual/junitsampler_tutorial.pdf">JUnit Sampler</a></li><li><a href="../usermanual/jmeter_accesslog_sampler_step_by_step.pdf">Access Log Sampler</a></li><li><a href="../extending/jmeter_
 tutorial.pdf">Extending JMeter</a></li></ul></li></ul><ul class="menu"><li onClick="return true"><div class="menu-title">Community</div><ul><li><a href="../issues.html">Issue Tracking</a></li><li><a href="../mail.html">Mailing Lists</a></li><li><a href="../svnindex.html">Source Repositories</a></li><li><a href="../building.html">Building and Contributing</a></li><li><a href="https://projects.apache.org/project.html?jmeter">Project info at Apache</a></li><li><a href="http://wiki.apache.org/jmeter/JMeterCommitters">Contributors</a></li></ul></li></ul><ul class="menu"><li onClick="return true"><div class="menu-title">Foundation</div><ul><li><a href="http://www.apache.org/">ASF</a></li><li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved in the ASF</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li><li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li></ul></li></ul></div><div class="main" id="content">
 <div class="social-media"><ul class="social-media-links"><li class="twitter"><a href="https://twitter.com/ApacheJMeter" title="Follow us on Twitter"><i class="fa fa-twitter" aria-hidden="true"></i>Twitter</a></li><li class="github"><a href="https://github.com/apache/jmeter" title="Fork us on github"><i class="fa fa-github" aria-hidden="true"></i>github</a></li></ul></div><ul class="pagelinks"><li><a href="regular_expressions.html">&lt; Prev</a></li><li><a href="../index.html">Index</a></li><li><a href="hints_and_tips.html">Next &gt;</a></li></ul><div class="section"><h1 id="generation">16. Generating Report Dashboard<a class="sectionlink" href="#generation" title="Link to here">&para;</a></h1>
+            --><div><a href="http://jmeter.apache.org/"><img class="logo" src="../images/logo.svg" alt="Apache JMeter"></a></div><div class="banner"><iframe src="http://www.apache.org/ads/bannerbar.html" style="border-width:0;" frameborder="0" scrolling="no"></iframe><div class="clear"></div></div></div><div class="nav"><ul class="menu"><li onClick="return true"><div class="menu-title">About</div><ul><li><a href="../index.html">Overview</a></li><li><a href="http://www.apache.org/licenses/">License</a></li></ul></li></ul><ul class="menu"><li onClick="return true"><div class="menu-title">Download</div><ul><li><a href="../download_jmeter.cgi">Download Releases</a></li><li><a href="../changes.html">Release Notes</a></li></ul></li></ul><ul class="menu"><li onClick="return true"><div class="menu-title">Documentation</div><ul><li><a href="../usermanual/get-started.html">Get Started</a></li><li><a href="../usermanual/index.html">User Manual</a></li><li><a href="../usermanual/best-practices.
 html">Best Practices</a></li><li><a href="../usermanual/component_reference.html">Component Reference</a></li><li><a href="../usermanual/functions.html">Functions Reference</a></li><li><a href="../changes_history.html">Change History</a></li><li><a href="../api/index.html">Javadocs</a></li><li><a href="../building.html">Building JMeter and Add-Ons</a></li><li><a href="http://wiki.apache.org/jmeter">JMeter Wiki</a></li><li><a href="http://wiki.apache.org/jmeter/JMeterFAQ">FAQ (Wiki)</a></li></ul></li></ul><ul class="menu"><li onClick="return true"><div class="menu-title">Tutorials (PDF format)</div><ul><li><a href="../usermanual/jmeter_distributed_testing_step_by_step.pdf">Distributed Testing</a></li><li><a href="../usermanual/jmeter_proxy_step_by_step.pdf">Recording Tests</a></li><li><a href="../usermanual/junitsampler_tutorial.pdf">JUnit Sampler</a></li><li><a href="../usermanual/jmeter_accesslog_sampler_step_by_step.pdf">Access Log Sampler</a></li><li><a href="../extending/jmeter_
 tutorial.pdf">Extending JMeter</a></li></ul></li></ul><ul class="menu"><li onClick="return true"><div class="menu-title">Community</div><ul><li><a href="../issues.html">Issue Tracking</a></li><li><a href="../mail.html">Mailing Lists</a></li><li><a href="../svnindex.html">Source Repositories</a></li><li><a href="../building.html">Building and Contributing</a></li><li><a href="https://projects.apache.org/project.html?jmeter">Project info at Apache</a></li><li><a href="http://wiki.apache.org/jmeter/JMeterCommitters">Contributors</a></li></ul></li></ul><ul class="menu"><li onClick="return true"><div class="menu-title">Foundation</div><ul><li><a href="http://www.apache.org/">ASF</a></li><li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved in the ASF</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li><li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li></ul></li></ul></div><div class="main" id="content">
 <div class="social-media"><ul class="social-media-links"><li class="twitter"><a href="https://twitter.com/ApacheJMeter" title="Follow us on Twitter"><i class="fa fa-twitter" aria-hidden="true"></i>Twitter</a></li><li class="github"><a href="https://github.com/apache/jmeter" title="Fork us on github"><i class="fa fa-github" aria-hidden="true"></i>github</a></li></ul></div><ul class="pagelinks"><li><a href="remote-test.html">&lt; Prev</a></li><li><a href="../index.html">Index</a></li><li><a href="realtime-results.html">Next &gt;</a></li></ul><div class="section"><h1 id="generation">16. Generating Report Dashboard<a class="sectionlink" href="#generation" title="Link to here">&para;</a></h1>
             <p>JMeter supports dashboard report generation to get graphs and
             statistics from a test plan.<br>
             This chapter describes how to configure and use the generator.</p>
@@ -47,7 +47,8 @@
                     Dashboard generation uses JMeter properties to customize the
                     report. Some properties are used for general settings and others are
                     used for a particular graph configuration or exporter configuration.
-                    <div class="clear"></div><div class="note">All these properties should be set in <span class="code">user.properties</span> file.</div><div class="clear"></div>
+                    <div class="clear"></div><div class="note">All report generator properties can be found in file <span class="code">reportgenerator.properties</span>.
+                    To customize these properties, you should copy them in <span class="code">user.properties</span> file and modify them.</div><div class="clear"></div>
                 </p>
                 <div class="subsection"><h2 id="configuration_requirements">16.2.1 Requirements<a class="sectionlink" href="#configuration_requirements" title="Link to here">&para;</a></h2>
                     <p>
@@ -64,7 +65,8 @@ jmeter.save.saveservice.successful = tru
 jmeter.save.saveservice.thread_counts = true
 jmeter.save.saveservice.thread_name = true
 jmeter.save.saveservice.time = true
-jmeter.save.saveservice.timestamp_format = yyyy/MM/dd HH:mm:ss (or any other format)
+# You can use any other format than the one shown here
+jmeter.save.saveservice.timestamp_format = yyyy/MM/dd HH:mm:ss
                         </pre>
                         <div class="clear"></div><div class="note">
                             Property <span class="code">jmeter.save.saveservice.timestamp_format</span> must be set
@@ -92,6 +94,14 @@ jmeter.save.saveservice.timestamp_format
                     <div class="properties"><h3>
         Parameters
         </h3><div class="property title"><div class="name title">Attribute</div><div class="description title">Description</div><div class="required title">Required</div></div>
+                        <div class="property"><div class="name req-false">report_title</div><div class="description req-false">
+                            Title used in the generated report. 
+                            Default: "Apache JMeter Dashboard"
+                        </div><div class="required req-false">No</div></div>
+                        <div class="property"><div class="name req-false">overall_granularity</div><div class="description req-false">
+                            Granularity of over time graphs. Data is aggregated to have 1 minute ticks. 
+                            Default: "60000" (1 minute)
+                        </div><div class="required req-false">No</div></div>
                         <div class="property"><div class="name req-false">apdex_satisfied_threshold</div><div class="description req-false">
                             Sets the satisfaction threshold for the
                             <a href="https://en.wikipedia.org/wiki/Apdex" target="_blank">APDEX</a>
@@ -222,9 +232,10 @@ jmeter.save.saveservice.timestamp_format
                             <div class="property"><div class="name req-false">filters_only_sample_series</div><div class="description req-false">
                                 Defines whether <span class="code">series_filter</span> (see below)
                                 apply only on sample series.
-                                Default: <span class="code">false</span></div><div class="required req-false">No</div></div>
+                                Default: <span class="code">true</span></div><div class="required req-false">No</div></div>
                             <div class="property"><div class="name req-false">series_filter</div><div class="description req-false">Sets the filter
                                 of series. An empty value deactivates the filtering.
+                                If not empty, regex should end with <span class="code">(-success|-failure)?</span><br>
                                 Format: regular expression.
                                 Default: ""
                             </div><div class="required req-false">No</div></div>
@@ -457,11 +468,11 @@ jmeter.reportgenerator.apdex_tolerated_t
 # jmeter.reportgenerator.exporter.html.property.output_dir=/tmp/test-report
 
 # Indicates which graph series are filtered (regular expression)
-# In the below example we filter on Sample1 and Sample2
+# In the below example we filter on Search and Order samples
 # Note that the end of the pattern should always include (-success|-failure)? 
 # Transactions per second suffixes Transactions with "-success" or "-failure" depending 
 # on the result
-jmeter.reportgenerator.exporter.html.series_filter=((^s0)|(^s1))(-success|-failure)?
+#jmeter.reportgenerator.exporter.html.series_filter=((^Search)|(^Order))(-success|-failure)?
 
 # Indicates whether series filter apply only on sample series
 jmeter.reportgenerator.exporter.html.filters_only_sample_series=true
@@ -624,7 +635,7 @@ jmeter.reportgenerator.exporter.html.fil
             Read this <a href="../building.html">documentation</a> on contributing.
             </div>
 
-        </div><ul class="pagelinks"><li><a href="regular_expressions.html">&lt; Prev</a></li><li><a href="../index.html">Index</a></li><li><a href="hints_and_tips.html">Next &gt;</a></li></ul><div class="share-links">
+        </div><ul class="pagelinks"><li><a href="remote-test.html">&lt; Prev</a></li><li><a href="../index.html">Index</a></li><li><a href="realtime-results.html">Next &gt;</a></li></ul><div class="share-links">
       Share this page:
       <ul><li class="fb"><a data-social-url="https://facebook.com/sharer/sharer.php?u=" title="Share on facebook"><i class="fa fa-facebook" aria-hidden="true"></i>share</a></li><li class="twitter"><a data-social-url="https://twitter.com/intent/tweet?url=" title="Tweet on twitter"><i class="fa fa-twitter" aria-hidden="true"></i>tweet</a></li><li class="gplus"><a data-social-url="https://plus.google.com/share?url=" title="Share on Google+"><i class="fa fa-google-plus" aria-hidden="true"></i>share</a></li></ul></div></div><div class="footer"><div class="copyright">
             Copyright &copy;

Modified: jmeter/trunk/docs/usermanual/hints_and_tips.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/hints_and_tips.html?rev=1742769&r1=1742768&r2=1742769&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/hints_and_tips.html (original)
+++ jmeter/trunk/docs/usermanual/hints_and_tips.html Sun May  8 06:36:03 2016
@@ -183,6 +183,7 @@ will match any component that contains t
             </dt>
             <dd>View Results Tree</dd>
         </dl>
+        <div class="clear"></div><div class="note">The binding above are made for Windows QWERTY keyboards. For other platforms and keyboards ensure you adapt those values.</div><div class="clear"></div>
         <p>
             To change these binding, please find "<span class="code">gui.quick_*</span>" properties within <span class="code">jmeter.properties</span> file as example,
             it is recommended to put overrides for them into <span class="code">user.properties</span> file.

Modified: jmeter/trunk/docs/usermanual/ldapanswer_xml.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/ldapanswer_xml.html?rev=1742769&r1=1742768&r2=1742769&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/ldapanswer_xml.html (original)
+++ jmeter/trunk/docs/usermanual/ldapanswer_xml.html Sun May  8 06:36:03 2016
@@ -1,7 +1,7 @@
 <!DOCTYPE html SYSTEM "about:legacy-compat">
 <html lang="en"><head><META http-equiv="Content-Type" content="text/html; charset=iso-8859-15"><title>Apache JMeter
           -
-          User's Manual: LDAP answer XML description</title><meta name="author" value="Dolf Smits"><meta name="email" value="Dolf.Smits@Siemens.com"><meta name="viewport" content="width=device-width, initial-scale=1"><link href="http://fonts.googleapis.com/css?family=Merriweather:400normal" rel="stylesheet" type="text/css"><link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.1/css/font-awesome.min.css" rel="stylesheet" type="text/css"><link rel="stylesheet" type="text/css" href="../css/new-style.css"><link rel="apple-touch-icon-precomposed" href="../images/apple-touch-icon.png"><link rel="icon" href="../images/favicon.png"><meta name="msapplication-TileColor" content="#ffffff"><meta name="msapplication-TileImage" content="../images/mstile-144x144.png"><meta name="theme-color" content="#ffffff"></head><body role="document"><a href="#content" class="hidden">Main content</a><div class="header"><!--
+          User's Manual: LDAP answer XML description</title><meta name="author" value="Apache JMeter developers"><meta name="email" value="dev@jmeter.apache.org"><meta name="viewport" content="width=device-width, initial-scale=1"><link href="http://fonts.googleapis.com/css?family=Merriweather:400normal" rel="stylesheet" type="text/css"><link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.1/css/font-awesome.min.css" rel="stylesheet" type="text/css"><link rel="stylesheet" type="text/css" href="../css/new-style.css"><link rel="apple-touch-icon-precomposed" href="../images/apple-touch-icon.png"><link rel="icon" href="../images/favicon.png"><meta name="msapplication-TileColor" content="#ffffff"><meta name="msapplication-TileImage" content="../images/mstile-144x144.png"><meta name="theme-color" content="#ffffff"></head><body role="document"><a href="#content" class="hidden">Main content</a><div class="header"><!--
             APACHE LOGO
           --><div><a href="http://www.apache.org"><img title="Apache Software Foundation" class="asf-logo logo" src="../images/asf-logo.svg" alt="Logo ASF"></a></div><!--
               PROJECT LOGO



Mime
View raw message