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 2017/09/17 18:22:18 UTC

svn commit: r1808646 [3/22] - in /jmeter/trunk: docs/ docs/css/ docs/images/screenshots/ docs/images/screenshots/changes/3.3/ docs/images/screenshots/jdbc-config/ docs/localising/ docs/usermanual/ src/core/org/apache/jmeter/util/ xdocs/

Modified: jmeter/trunk/docs/css/new-style.css
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/css/new-style.css?rev=1808646&r1=1808645&r2=1808646&view=diff
==============================================================================
--- jmeter/trunk/docs/css/new-style.css (original)
+++ jmeter/trunk/docs/css/new-style.css Sun Sep 17 18:22:16 2017
@@ -163,7 +163,7 @@ h1, h2, h3, h4, h5, .title {
 }
 .banner>iframe img {
   width: auto;
-  max-width: 100%
+  max-width: 100%;
   height: auto;
 }
 
@@ -391,7 +391,6 @@ table {
 
 .section-index {
   font-family: "Merriweather";
-  margin:;
   list-style: none;
 }
 

Modified: jmeter/trunk/docs/devguide-dashboard.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/devguide-dashboard.html?rev=1808646&r1=1808645&r2=1808646&view=diff
==============================================================================
--- jmeter/trunk/docs/devguide-dashboard.html (original)
+++ jmeter/trunk/docs/devguide-dashboard.html Sun Sep 17 18:22:16 2017
@@ -1,113 +1,335 @@
 <!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
+<html lang="en">
+<head>
+<META http-equiv="Content-Type" content="text/html; charset=iso-8859-15">
+<title>Apache JMeter
           -
-          Developer's guide: Dashboard generator</title><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"><!--
+          Developer's guide: Dashboard generator</title>
+<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><!--
+          -->
+<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"><a href="http://www.apache.org/events/current-event.html"><img src="http://www.apache.org/events/current-event-234x60.png" alt="Current Apache event teaser"></a><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="./usermanual/properties_reference.html">Properties 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="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</div><ul><li><a href="./usermanual/jmeter_distributed_testing_step_by_step.html">Distributed Testing</a></li><li><a href="./usermanual/jmeter_proxy_step_by_step.html">Recording Tests</a></li><li><a href="./usermanual/junitsampler_tutorial.html">JUnit Sampler</a></li><li><a href="./usermanual/jmeter_accesslog_sampler_step_by_step.html">Access Log Sampler</a></li>
 <li><a href="./usermanual/jmeter_tutorial.html">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><div class="section"><h1>Dashboard generator</h1>
-            <p>
+            -->
+<div>
+<a href="http://jmeter.apache.org/"><img class="logo" src="./images/logo.svg" alt="Apache JMeter"></a>
+</div>
+<div class="banner">
+<a href="http://www.apache.org/events/current-event.html"><img src="http://www.apache.org/events/current-event-234x60.png" alt="Current Apache event teaser"></a>
+<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="./usermanual/properties_reference.html">Properties 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="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</div>
+<ul>
+<li>
+<a href="./usermanual/jmeter_distributed_testing_step_by_step.html">Distributed Testing</a>
+</li>
+<li>
+<a href="./usermanual/jmeter_proxy_step_by_step.html">Recording Tests</a>
+</li>
+<li>
+<a href="./usermanual/junitsampler_tutorial.html">JUnit Sampler</a>
+</li>
+<li>
+<a href="./usermanual/jmeter_accesslog_sampler_step_by_step.html">Access Log Sampler</a>
+</li>
+<li>
+<a href="./usermanual/jmeter_tutorial.html">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="http://www.apache.org/security/">Security</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/">The Apache Software Foundation (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>
+<div class="section">
+<h1>Dashboard generator</h1>
+            
+<p>
                 This document describes the architecture and operation of the
                 dashboard generation engine.
             </p>
-            <div class="subsection"><h2 id="overview">1 Overview<a class="sectionlink" href="#overview" title="Link to here">&para;</a></h2>
-                <div class="subsection"><h2 id="overview_architecture">1.1 Architecture<a class="sectionlink" href="#overview_architecture" title="Link to here">&para;</a></h2>
-                    <p>
+            
+<div class="subsection">
+<h2 id="overview">1 Overview<a class="sectionlink" href="#overview" title="Link to here">&para;</a>
+</h2>
+                
+<div class="subsection">
+<h2 id="overview_architecture">1.1 Architecture<a class="sectionlink" href="#overview_architecture" title="Link to here">&para;</a>
+</h2>
+                    
+<p>
                         The dashboard generation engine is a modular feature based on
                         samples operation processes.
                         <br>
                         The processes can be represented by the following diagram:
                     </p>
-                    <figure><a href="./images/screenshots/dashboard.png"><img src="./images/screenshots/dashboard.png" width="" height="" alt="Figure 1 - Dashboard generation overview"></a><figcaption>Figure 1 - Dashboard generation overview</figcaption></figure>
-                    <p>
+                    
+<figure>
+<a href="./images/screenshots/dashboard.png"><img src="./images/screenshots/dashboard.png" width="" height="" alt="Figure 1 - Dashboard generation overview"></a>
+<figcaption>Figure 1 - Dashboard generation overview</figcaption>
+</figure>
+                    
+<p>
                         In this view, you can see:
                         <ul>
-                            <li>
+                            
+<li>
                                 A source from where samples are produced (e.g. CSV file).
                             </li>
-                            <li>
+                            
+<li>
                                 A chain of items, named consumers, that operate
                                 on the samples
                                 that go through the chain
                                 (e.g. Filtering, sorting, calculation, &hellip;).
                             </li>
-                            <li>
+                            
+<li>
                                 An execution context, named sample context, where the results
                                 of consumers calculations are stored.
                             </li>
-                            <li>
+                            
+<li>
                                 A set of items, named exporters, that use the content of the
                                 sample context to generate a final result to the user (e.g.
                                 HTML
                                 page generation).
                             </li>
-                        </ul>
-                    </p>
-                </div>
-                <div class="subsection"><h2 id="overview_operation">1.2 Operation<a class="sectionlink" href="#overview_operation" title="Link to here">&para;</a></h2>
-                    <p>
+                        
+</ul>
+                    
+</p>
+                
+</div>
+                
+<div class="subsection">
+<h2 id="overview_operation">1.2 Operation<a class="sectionlink" href="#overview_operation" title="Link to here">&para;</a>
+</h2>
+                    
+<p>
                         Before producing samples, the source is associated with a sample
                         context that will be used to store the consumers results.
                     </p>
-                    <p>
+                    
+<p>
                         Then a chain of consumers is built using JMeter properties
                         (prefixed by
                         <span class="code">jmeter.reportgenerator</span>
                         ) in order to enable the user to customize it.
                     </p>
-                    <p>
+                    
+<p>
                         When the source emits a sample, it sends it to the first consumer
                         of the chain.
                         <br>
                         The consumer can have different behaviors:
                         <ul>
-                            <li>It can process the sample and send it to the next
+                            
+<li>It can process the sample and send it to the next
                                 consumers.</li>
-                            <li>It cannot process the sample, so it stores it and
+                            
+<li>It cannot process the sample, so it stores it and
                                 continues to
                                 receive other samples. When it can process the
                                 stored samples, it
                                 does so and sends the whole to the next
                                 consumers (e.g. sorting).</li>
-                            <li>It can choose to discard the sample (e.g.
+                            
+<li>It can choose to discard the sample (e.g.
                                 filtering).</li>
-                        </ul>
+                        
+</ul>
                         When the source stops producing samples, consumers can publish a
                         result in the sample context.
                         <br>
                         The latter is send to the set of exporters in order to create
                         results used by final user.
                     </p>
-                </div>
-            </div>
+                
+</div>
+            
+</div>
 
-            <div class="subsection"><h2 id="consumers_chain">2 Consumers chain details<a class="sectionlink" href="#consumers_chain" title="Link to here">&para;</a></h2>
-                <p>
+            
+<div class="subsection">
+<h2 id="consumers_chain">2 Consumers chain details<a class="sectionlink" href="#consumers_chain" title="Link to here">&para;</a>
+</h2>
+                
+<p>
 
-                </p>
-                <figure><a href="./images/screenshots/chain.png"><img src="./images/screenshots/chain.png" width="" height="" alt="Figure 2 - Consumers chain"></a><figcaption>Figure 2 - Consumers chain</figcaption></figure>
-                <p>
+                
+</p>
+                
+<figure>
+<a href="./images/screenshots/chain.png"><img src="./images/screenshots/chain.png" width="" height="" alt="Figure 2 - Consumers chain"></a>
+<figcaption>Figure 2 - Consumers chain</figcaption>
+</figure>
+                
+<p>
                     The chain begins with a normalizer consumer in charge of
                     standardizing the timestamp of each sample because JMeter allows
                     different timestamp formats (See
                     <span class="code">jmeter.save.saveservice.timestamp_format</span>
                     ).
                 </p>
-                <p>
+                
+<p>
                     Then two consumers have to define the start time and end time of
                     the load tests.
                 </p>
-                <p>
+                
+<p>
                     At the same level a filter consumer keeps or
                     discards samples
                     depending on the
                     <span class="code">jmeter.reportgenerator.sample_filter</span>
                     property.
                 </p>
-                <p> Another filter is plugged after to discard controller
+                
+<p> Another filter is plugged after to discard controller
                     samples.
                 </p>
-                <p>
+                
+<p>
                     Depending on the property
                     <span class="code">jmeter.reportgenerator.graph.&lt;graph_id&gt;.exclude_controllers</span>
                     , the graph consumer matching the
@@ -119,11 +341,19 @@
                     <span class="code">B</span>
                     .
                 </p>
-            </div>
+            
+</div>
 
-            <div class="subsection"><h2 id="process_template">3 Template processing<a class="sectionlink" href="#process_template" title="Link to here">&para;</a></h2>
-                <div class="subsection"><h2 id="template_overview">3.1 Overview<a class="sectionlink" href="#template_overview" title="Link to here">&para;</a></h2>
-                    <p>
+            
+<div class="subsection">
+<h2 id="process_template">3 Template processing<a class="sectionlink" href="#process_template" title="Link to here">&para;</a>
+</h2>
+                
+<div class="subsection">
+<h2 id="template_overview">3.1 Overview<a class="sectionlink" href="#template_overview" title="Link to here">&para;</a>
+</h2>
+                    
+<p>
                         The default exporter of the generator use the template engine
                         <a href="http://freemarker.org/">freemarker</a>
                         to produce html pages.
@@ -135,72 +365,122 @@
                         and have
                         the extension "<span class="code">.fmkr</span>".
                     </p>
-                    <p>
+                    
+<p>
                         The graph references in the template
                         files use the syntax :
                         <span class="code">${&lt;graph_id&gt;.&lt;value&gt;}</span> where :
                         <dl>
-                            <dt><span class="code">graph_id</span></dt>
-                            <dd>is the identifier of the graph matching the JMeter
+                            
+<dt>
+<span class="code">graph_id</span>
+</dt>
+                            
+<dd>is the identifier of the graph matching the JMeter
                                 properties definition</dd>
-                            <dt><span class="code">value</span></dt>
-                            <dd>is the name of the value where data are stored.</dd>
-                        </dl>
-                    </p>
-                    <p>
+                            
+<dt>
+<span class="code">value</span>
+</dt>
+                            
+<dd>is the name of the value where data are stored.</dd>
+                        
+</dl>
+                    
+</p>
+                    
+<p>
                         Each graph produces the following values :
                         <dl>
-                            <dt><span class="code">maxX</span>:</dt>
-                            <dd>The maximum abscissa of the graph (double).</dd>
-                            <dt><span class="code">maxY</span>:</dt>
-                            <dd>The maximum ordinate of the graph (double).</dd>
-                            <dt><span class="code">minX</span>:</dt>
-                            <dd>The minimum abscissa of the graph (double).</dd>
-                            <dt><span class="code">minY</span>:</dt>
-                            <dd>The maximum ordinate of the graph (double).</dd>
-                            <dt><span class="code">title</span>:</dt>
-                            <dd>The title of the graph (string).</dd>
-                            <dt><span class="code">values</span>:</dt>
-                            <dd>A JSON object representing the data of the graph series
+                            
+<dt>
+<span class="code">maxX</span>:</dt>
+                            
+<dd>The maximum abscissa of the graph (double).</dd>
+                            
+<dt>
+<span class="code">maxY</span>:</dt>
+                            
+<dd>The maximum ordinate of the graph (double).</dd>
+                            
+<dt>
+<span class="code">minX</span>:</dt>
+                            
+<dd>The minimum abscissa of the graph (double).</dd>
+                            
+<dt>
+<span class="code">minY</span>:</dt>
+                            
+<dd>The maximum ordinate of the graph (double).</dd>
+                            
+<dt>
+<span class="code">title</span>:</dt>
+                            
+<dd>The title of the graph (string).</dd>
+                            
+<dt>
+<span class="code">values</span>:</dt>
+                            
+<dd>A JSON object representing the data of the graph series
                                   (string).</dd>
-                        </dl>
-                    </p>
+                        
+</dl>
                     
+</p>
                     
                     
                     
                     
                     
-                </div>
-                <div class="subsection"><h2 id="template_customization">3.2 Customization<a class="sectionlink" href="#template_customization" title="Link to here">&para;</a></h2>
-                    <p>You can customize the dashboard generation by modifying the
+                    
+                
+</div>
+                
+<div class="subsection">
+<h2 id="template_customization">3.2 Customization<a class="sectionlink" href="#template_customization" title="Link to here">&para;</a>
+</h2>
+                    
+<p>You can customize the dashboard generation by modifying the
                         files in the
                         template directory.
                     </p>
-                    <p>
+                    
+<p>
                         If you want to add a graph to the dashboard,
                         you have to
                         <a href="#configure_graph">declare it among the JMeter properties</a>
                         and use its references in the template files.
                     </p>
-                    <p>If you want to remove
+                    
+<p>If you want to remove
                         a graph from the dashboard, you must remove
                         all its references in
                         the template
                         files and clear JMeter
                         properties.</p>
-                </div>
-            </div>
+                
+</div>
+            
+</div>
 
-            <div class="subsection"><h2 id="outlooks">4 Limitations and Outlooks<a class="sectionlink" href="#outlooks" title="Link to here">&para;</a></h2>
-                <ul>
-                    <li>
-                        <p>Till now, there is only one sample source implementation which
+            
+<div class="subsection">
+<h2 id="outlooks">4 Limitations and Outlooks<a class="sectionlink" href="#outlooks" title="Link to here">&para;</a>
+</h2>
+                
+<ul>
+                    
+<li>
+                        
+<p>Till now, there is only one sample source implementation which
                             is strongly coupled with the CSV file format, we should allow
                             other kinds of source by using a sample source interface.</p>
-                    </li>
-                    <li>
-                        <p>
+                    
+</li>
+                    
+<li>
+                        
+<p>
                             To add customized graph, users must extend the
                             <span class="code">AbstractGraphConsumer</span>
                             or use one of the implementations provided
@@ -217,9 +497,12 @@
                             keys
                             selector and time rate aggregator).
                         </p>
-                    </li>
-                    <li>
-                        <p>
+                    
+</li>
+                    
+<li>
+                        
+<p>
                             The chain building is dispatched between the
                             <span class="code">org.apache.jmeter.report.dashboard.ReporGenerator.generate</span>
                             method
@@ -230,7 +513,8 @@
                             redundant and harm the performance of report generation, not
                             load testing.
                         </p>
-                        <p>
+                        
+<p>
                             E.g. Each
                             <span class="code">LatencyVSRequestGraphConsumer</span>
                             and
@@ -243,7 +527,8 @@
                             <span class="code">exclude_controllers</span>
                             properties.
                         </p>
-                        <p>
+                        
+<p>
                             So we should enable the consumers to define the chain they
                             require and provide a single chain builder that processes these
                             chain requirements to instantiate needed consumers on demand.
@@ -252,48 +537,82 @@
                             instances are used. Otherwise if the declaration differs, a new
                             branch of consumers is created.
                         </p>
-                    </li>
-                    <li>
-                        <p>
+                    
+</li>
+                    
+<li>
+                        
+<p>
                             The graphs (DOM elements) in the generated HTML page should be
                             dynamically build in order to match the graphs defined in JMeter
                             properties.
                         </p>
-                    </li>
-                    <li>
-                        <p>
+                    
+</li>
+                    
+<li>
+                        
+<p>
                             Some improvements can be done on the generated html pages:
                             <ul>
-                                <li>Using a single page, and hide graphs depending on the
+                                
+<li>Using a single page, and hide graphs depending on the
                                     navigation menu selection.</li>
-                                <li>Adding a loading animation when graphs are build or
+                                
+<li>Adding a loading animation when graphs are build or
                                     refreshed.</li>
-                                <li>Let the user determine if a graph is zoomable using a JMeter
+                                
+<li>Let the user determine if a graph is zoomable using a JMeter
                                     property.</li>
-                                <li>
+                                
+<li>
                                     Using the
                                     <span class="code">jquery.plot.setData()</span>
                                     method to handle series
                                     activation/deactivation rather than
                                     rebuild the graph.
                                 </li>
-                            </ul>
-                        </p>
-                    </li>
-                </ul>
-            </div>
-        </div><div class="share-links">
+                            
+</ul>
+                        
+</p>
+                    
+</li>
+                
+</ul>
+            
+</div>
+        
+</div>
+<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">
+      <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;
             1999 &ndash;
             2017
             , Apache Software Foundation
-          </div><div class="trademarks">Apache, Apache JMeter, JMeter, the Apache
+          </div>
+<div class="trademarks">Apache, Apache JMeter, JMeter, the Apache
             feather, and the Apache JMeter logo are
             trademarks of the
             Apache Software Foundation.
-          </div></div><script>(function(){
+          </div>
+</div>
+<script>(function(){
             // fill in the current location into social links on this page.
             "use strict";
             var as = document.getElementsByTagName('a');
@@ -307,4 +626,6 @@
                     as[i].href = href + encodeURIComponent(loc);
                 }
             }
-        })();</script></body></html>
\ No newline at end of file
+        })();</script>
+</body>
+</html>

Modified: jmeter/trunk/docs/download_jmeter.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/download_jmeter.html?rev=1808646&r1=1808645&r2=1808646&view=diff
==============================================================================
--- jmeter/trunk/docs/download_jmeter.html (original)
+++ jmeter/trunk/docs/download_jmeter.html Sun Sep 17 18:22:16 2017
@@ -1,12 +1,189 @@
 <!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
+<html lang="en">
+<head>
+<META http-equiv="Content-Type" content="text/html; charset=iso-8859-15">
+<title>Apache JMeter
           -
-          Download Apache JMeter</title><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"><!--
+          Download Apache JMeter</title>
+<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><!--
+          -->
+<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"><a href="http://www.apache.org/events/current-event.html"><img src="http://www.apache.org/events/current-event-234x60.png" alt="Current Apache event teaser"></a><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="./usermanual/properties_reference.html">Properties 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="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</div><ul><li><a href="./usermanual/jmeter_distributed_testing_step_by_step.html">Distributed Testing</a></li><li><a href="./usermanual/jmeter_proxy_step_by_step.html">Recording Tests</a></li><li><a href="./usermanual/junitsampler_tutorial.html">JUnit Sampler</a></li><li><a href="./usermanual/jmeter_accesslog_sampler_step_by_step.html">Access Log Sampler</a></li>
 <li><a href="./usermanual/jmeter_tutorial.html">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><div class="section"><h1>Download Apache JMeter</h1>
-      <p>
+            -->
+<div>
+<a href="http://jmeter.apache.org/"><img class="logo" src="./images/logo.svg" alt="Apache JMeter"></a>
+</div>
+<div class="banner">
+<a href="http://www.apache.org/events/current-event.html"><img src="http://www.apache.org/events/current-event-234x60.png" alt="Current Apache event teaser"></a>
+<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="./usermanual/properties_reference.html">Properties 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="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</div>
+<ul>
+<li>
+<a href="./usermanual/jmeter_distributed_testing_step_by_step.html">Distributed Testing</a>
+</li>
+<li>
+<a href="./usermanual/jmeter_proxy_step_by_step.html">Recording Tests</a>
+</li>
+<li>
+<a href="./usermanual/junitsampler_tutorial.html">JUnit Sampler</a>
+</li>
+<li>
+<a href="./usermanual/jmeter_accesslog_sampler_step_by_step.html">Access Log Sampler</a>
+</li>
+<li>
+<a href="./usermanual/jmeter_tutorial.html">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="http://www.apache.org/security/">Security</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/">The Apache Software Foundation (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>
+<div class="section">
+<h1>Download Apache JMeter</h1>
+      
+<p>
         We recommend you use a mirror to download our release
         builds, but you <strong>must</strong> <a href="http://www.apache.org/info/verification.html">verify the integrity</a> of
         the downloaded files using signatures downloaded from our main 
@@ -14,7 +191,8 @@
         be available from all the mirrors.
       </p>
 
-      <p>
+      
+<p>
         You are currently using <b>[preferred]</b>.  If you
         encounter a problem with this mirror, please select another
         mirror.  If all mirrors are failing, there are <i>backup</i>
@@ -24,8 +202,10 @@
         [if-any logo]<a href="[link]"><img align="right" src="[logo]" border="0"></a>[end]
       </p>
 
-      <form action="[location]" method="get" id="SelectMirror">
-        <p>
+      
+<form action="[location]" method="get" id="SelectMirror">
+        
+<p>
           Other mirrors: 
           <select name="Preferred">
           [if-any http]
@@ -39,82 +219,154 @@
           [end]
           </select>
           <input type="submit" value="Change">
-        </p>
-      </form>
+        
+</p>
+      
+</form>
 
-      <p>
+      
+<p>
         The <span class="code">KEYS</span> link links to the code signing keys used to sign the product.
         The <span class="code">PGP</span> link downloads the OpenPGP compatible signature from our main site. 
         The <span class="code">MD5</span> link downloads the md5 checksum from the main site.
-        The <span class="code">SHA</span> link downloads the sha checksum from the main site.
+        The <span class="code">SHA-512</span> link downloads the sha512 checksum from the main site.
         Please <a href="http://www.apache.org/info/verification.html">verify the integrity</a>
         of the downloaded file.
       </p>
-      <p>
+      
+<p>
       For more information concerning Apache JMeter, see the <a href="http://jmeter.apache.org/">Apache JMeter</a> site. 
       </p>
-      <p>
-      <a href="https://www.apache.org/dist/jmeter/KEYS">KEYS</a>
-      </p>
-    </div><div class="section"><h1>Apache JMeter 3.2 (Requires Java 8 or later)</h1>
-      <div class="subsection"><h2 id="binaries">Binaries<a class="sectionlink" href="#binaries" title="Link to here">&para;</a></h2>
-        <table>
-          <tr>
-              <td><a href="[preferred]/jmeter/binaries/apache-jmeter-3.2.tgz">apache-jmeter-3.2.tgz</a></td>
-              <td><a href="https://www.apache.org/dist/jmeter/binaries/apache-jmeter-3.2.tgz.md5">md5</a></td>
-              <td><a href="https://www.apache.org/dist/jmeter/binaries/apache-jmeter-3.2.tgz.sha">sha</a></td>
-              <td><a href="https://www.apache.org/dist/jmeter/binaries/apache-jmeter-3.2.tgz.asc">pgp</a></td>
-          </tr>
-          <tr>
-              <td><a href="[preferred]/jmeter/binaries/apache-jmeter-3.2.zip">apache-jmeter-3.2.zip</a></td>
-              <td><a href="https://www.apache.org/dist/jmeter/binaries/apache-jmeter-3.2.zip.md5">md5</a></td>
-              <td><a href="https://www.apache.org/dist/jmeter/binaries/apache-jmeter-3.2.zip.sha">sha</a></td>
-              <td><a href="https://www.apache.org/dist/jmeter/binaries/apache-jmeter-3.2.zip.asc">pgp</a></td>
-          </tr>
-        </table>
-      </div>
-      <div class="subsection"><h2 id="source">Source<a class="sectionlink" href="#source" title="Link to here">&para;</a></h2>
-        <table>
-          <tr>
-              <td><a href="[preferred]/jmeter/source/apache-jmeter-3.2_src.tgz">apache-jmeter-3.2_src.tgz</a></td>
-              <td><a href="https://www.apache.org/dist/jmeter/source/apache-jmeter-3.2_src.tgz.md5">md5</a></td>
-              <td><a href="https://www.apache.org/dist/jmeter/source/apache-jmeter-3.2_src.tgz.sha">sha</a></td>
-              <td><a href="https://www.apache.org/dist/jmeter/source/apache-jmeter-3.2_src.tgz.asc">pgp</a></td>
-          </tr>
-          <tr>
-              <td><a href="[preferred]/jmeter/source/apache-jmeter-3.2_src.zip">apache-jmeter-3.2_src.zip</a></td>
-              <td><a href="https://www.apache.org/dist/jmeter/source/apache-jmeter-3.2_src.zip.md5">md5</a></td>
-              <td><a href="https://www.apache.org/dist/jmeter/source/apache-jmeter-3.2_src.zip.sha">sha</a></td>
-              <td><a href="https://www.apache.org/dist/jmeter/source/apache-jmeter-3.2_src.zip.asc">pgp</a></td>
-          </tr>
-        </table>
-      </div>
-    </div><div class="section"><h1>Archives</h1>
-        <p>
+      
+<p>
+      
+<a href="https://www.apache.org/dist/jmeter/KEYS">KEYS</a>
+      
+</p>
+    
+</div>
+<div class="section">
+<h1>Apache JMeter 3.3 (Requires Java 8 or later)</h1>
+      
+<div class="subsection">
+<h2 id="binaries">Binaries<a class="sectionlink" href="#binaries" title="Link to here">&para;</a>
+</h2>
+        
+<table>
+          
+<tr>
+              
+<td><a href="[preferred]/jmeter/binaries/apache-jmeter-3.3.tgz">apache-jmeter-3.3.tgz</a></td>
+              <td><a href="https://www.apache.org/dist/jmeter/binaries/apache-jmeter-3.3.tgz.md5">md5</a></td>
+              <td><a href="https://www.apache.org/dist/jmeter/binaries/apache-jmeter-3.3.tgz.sha512">sha512</a></td>
+              <td><a href="https://www.apache.org/dist/jmeter/binaries/apache-jmeter-3.3.tgz.asc">pgp</a></td>
+          
+</tr>
+          
+<tr>
+              
+<td><a href="[preferred]/jmeter/binaries/apache-jmeter-3.3.zip">apache-jmeter-3.3.zip</a></td>
+              <td><a href="https://www.apache.org/dist/jmeter/binaries/apache-jmeter-3.3.zip.md5">md5</a></td>
+              <td><a href="https://www.apache.org/dist/jmeter/binaries/apache-jmeter-3.3.zip.sha512">sha512</a></td>
+              <td><a href="https://www.apache.org/dist/jmeter/binaries/apache-jmeter-3.3.zip.asc">pgp</a></td>
+          
+</tr>
+        
+</table>
+      
+</div>
+      
+<div class="subsection">
+<h2 id="source">Source<a class="sectionlink" href="#source" title="Link to here">&para;</a>
+</h2>
+        
+<table>
+          
+<tr>
+              
+<td><a href="[preferred]/jmeter/source/apache-jmeter-3.3_src.tgz">apache-jmeter-3.3_src.tgz</a></td>
+              <td><a href="https://www.apache.org/dist/jmeter/source/apache-jmeter-3.3_src.tgz.md5">md5</a></td>
+              <td><a href="https://www.apache.org/dist/jmeter/source/apache-jmeter-3.3_src.tgz.sha512">sha512</a></td>
+              <td><a href="https://www.apache.org/dist/jmeter/source/apache-jmeter-3.3_src.tgz.asc">pgp</a></td>
+          
+</tr>
+          
+<tr>
+              
+<td><a href="[preferred]/jmeter/source/apache-jmeter-3.3_src.zip">apache-jmeter-3.3_src.zip</a></td>
+              <td><a href="https://www.apache.org/dist/jmeter/source/apache-jmeter-3.3_src.zip.md5">md5</a></td>
+              <td><a href="https://www.apache.org/dist/jmeter/source/apache-jmeter-3.3_src.zip.sha512">sha512</a></td>
+              <td><a href="https://www.apache.org/dist/jmeter/source/apache-jmeter-3.3_src.zip.asc">pgp</a></td>
+          
+</tr>
+        
+</table>
+      
+</div>
+    
+</div>
+<div class="section">
+<h1>Archives</h1>
+        
+<p>
           Older releases can be obtained from the archives.
         </p>
-        <ul>
-          <li class="download"><a href="[preferred]/jmeter/">browse download area</a></li>
-          <li><a href="https://archive.apache.org/dist/jmeter/">Apache JMeter archives&hellip;</a></li>
-          <li><a href="https://archive.apache.org/dist/jakarta/jmeter/">Apache Jakarta JMeter archives&hellip;</a></li>
-        </ul>
-    </div><div class="section"><h1>Verification of downloads</h1>
-    <p>
+        
+<ul>
+          
+<li class="download">
+<a href="[preferred]/jmeter/">browse download area</a>
+</li>
+          
+<li>
+<a href="https://archive.apache.org/dist/jmeter/">Apache JMeter archives&hellip;</a>
+</li>
+          
+<li>
+<a href="https://archive.apache.org/dist/jakarta/jmeter/">Apache Jakarta JMeter archives&hellip;</a>
+</li>
+        
+</ul>
+    
+</div>
+<div class="section">
+<h1>Verification of downloads</h1>
+    
+<p>
     It is essential that you verify the integrity of the downloaded files using the PGP signature. 
     Please read <a href="http://www.apache.org/info/verification.html">Verifying Apache Software Foundation Releases</a> for more information on why you should verify our releases.
     </p>
-    </div><div class="share-links">
+    
+</div>
+<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">
+      <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;
             1999 &ndash;
             2017
             , Apache Software Foundation
-          </div><div class="trademarks">Apache, Apache JMeter, JMeter, the Apache
+          </div>
+<div class="trademarks">Apache, Apache JMeter, JMeter, the Apache
             feather, and the Apache JMeter logo are
             trademarks of the
             Apache Software Foundation.
-          </div></div><script>(function(){
+          </div>
+</div>
+<script>(function(){
             // fill in the current location into social links on this page.
             "use strict";
             var as = document.getElementsByTagName('a');
@@ -128,4 +380,6 @@
                     as[i].href = href + encodeURIComponent(loc);
                 }
             }
-        })();</script></body></html>
\ No newline at end of file
+        })();</script>
+</body>
+</html>

Added: jmeter/trunk/docs/images/screenshots/changes/3.3/influxdb_udp.png
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/images/screenshots/changes/3.3/influxdb_udp.png?rev=1808646&view=auto
==============================================================================
Binary file - no diff available.

Propchange: jmeter/trunk/docs/images/screenshots/changes/3.3/influxdb_udp.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: jmeter/trunk/docs/images/screenshots/changes/3.3/jdbc_config_validation_driver_url.png
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/images/screenshots/changes/3.3/jdbc_config_validation_driver_url.png?rev=1808646&view=auto
==============================================================================
Binary file - no diff available.

Propchange: jmeter/trunk/docs/images/screenshots/changes/3.3/jdbc_config_validation_driver_url.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: jmeter/trunk/docs/images/screenshots/changes/3.3/jdbc_config_validation_query.png
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/images/screenshots/changes/3.3/jdbc_config_validation_query.png?rev=1808646&view=auto
==============================================================================
Binary file - no diff available.

Propchange: jmeter/trunk/docs/images/screenshots/changes/3.3/jdbc_config_validation_query.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: jmeter/trunk/docs/images/screenshots/changes/3.3/jmeter_export_transactions_menu.png
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/images/screenshots/changes/3.3/jmeter_export_transactions_menu.png?rev=1808646&view=auto
==============================================================================
Binary file - no diff available.

Propchange: jmeter/trunk/docs/images/screenshots/changes/3.3/jmeter_export_transactions_menu.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: jmeter/trunk/docs/images/screenshots/changes/3.3/jmeter_export_transactions_result.png
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/images/screenshots/changes/3.3/jmeter_export_transactions_result.png?rev=1808646&view=auto
==============================================================================
Binary file - no diff available.

Propchange: jmeter/trunk/docs/images/screenshots/changes/3.3/jmeter_export_transactions_result.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: jmeter/trunk/docs/images/screenshots/changes/3.3/jmeter_function_add_time.png
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/images/screenshots/changes/3.3/jmeter_function_add_time.png?rev=1808646&view=auto
==============================================================================
Binary file - no diff available.

Propchange: jmeter/trunk/docs/images/screenshots/changes/3.3/jmeter_function_add_time.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: jmeter/trunk/docs/images/screenshots/changes/3.3/jmeter_function_random_date.png
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/images/screenshots/changes/3.3/jmeter_function_random_date.png?rev=1808646&view=auto
==============================================================================
Binary file - no diff available.

Propchange: jmeter/trunk/docs/images/screenshots/changes/3.3/jmeter_function_random_date.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: jmeter/trunk/docs/images/screenshots/changes/3.3/jmeter_function_result.png
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/images/screenshots/changes/3.3/jmeter_function_result.png?rev=1808646&view=auto
==============================================================================
Binary file - no diff available.

Propchange: jmeter/trunk/docs/images/screenshots/changes/3.3/jmeter_function_result.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: jmeter/trunk/docs/images/screenshots/changes/3.3/jmeter_if_controller.png
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/images/screenshots/changes/3.3/jmeter_if_controller.png?rev=1808646&view=auto
==============================================================================
Binary file - no diff available.

Propchange: jmeter/trunk/docs/images/screenshots/changes/3.3/jmeter_if_controller.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Modified: jmeter/trunk/docs/images/screenshots/counter.png
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/images/screenshots/counter.png?rev=1808646&r1=1808645&r2=1808646&view=diff
==============================================================================
Binary files - no diff available.

Modified: jmeter/trunk/docs/images/screenshots/csvdatasetconfig.png
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/images/screenshots/csvdatasetconfig.png?rev=1808646&r1=1808645&r2=1808646&view=diff
==============================================================================
Binary files - no diff available.

Modified: jmeter/trunk/docs/images/screenshots/jdbc-config/jdbc-conn-config.png
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/images/screenshots/jdbc-config/jdbc-conn-config.png?rev=1808646&r1=1808645&r2=1808646&view=diff
==============================================================================
Binary files - no diff available.

Modified: jmeter/trunk/docs/images/screenshots/os_process_sampler.png
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/images/screenshots/os_process_sampler.png?rev=1808646&r1=1808645&r2=1808646&view=diff
==============================================================================
Binary files - no diff available.

Modified: jmeter/trunk/docs/images/screenshots/proxy_control.png
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/images/screenshots/proxy_control.png?rev=1808646&r1=1808645&r2=1808646&view=diff
==============================================================================
Binary files - no diff available.

Modified: jmeter/trunk/docs/index.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/index.html?rev=1808646&r1=1808645&r2=1808646&view=diff
==============================================================================
--- jmeter/trunk/docs/index.html (original)
+++ jmeter/trunk/docs/index.html Sun Sep 17 18:22:16 2017
@@ -1,76 +1,318 @@
 <!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
+<html lang="en">
+<head>
+<META http-equiv="Content-Type" content="text/html; charset=iso-8859-15">
+<title>Apache JMeter
           -
-          Apache JMeter&trade;</title><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 JMeter&trade;</title>
+<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><!--
+          -->
+<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"><a href="http://www.apache.org/events/current-event.html"><img src="http://www.apache.org/events/current-event-234x60.png" alt="Current Apache event teaser"></a><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="./usermanual/properties_reference.html">Properties 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="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</div><ul><li><a href="./usermanual/jmeter_distributed_testing_step_by_step.html">Distributed Testing</a></li><li><a href="./usermanual/jmeter_proxy_step_by_step.html">Recording Tests</a></li><li><a href="./usermanual/junitsampler_tutorial.html">JUnit Sampler</a></li><li><a href="./usermanual/jmeter_accesslog_sampler_step_by_step.html">Access Log Sampler</a></li>
 <li><a href="./usermanual/jmeter_tutorial.html">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><div class="section"><h1>Apache JMeter&trade;</h1>
-    <p>
+            -->
+<div>
+<a href="http://jmeter.apache.org/"><img class="logo" src="./images/logo.svg" alt="Apache JMeter"></a>
+</div>
+<div class="banner">
+<a href="http://www.apache.org/events/current-event.html"><img src="http://www.apache.org/events/current-event-234x60.png" alt="Current Apache event teaser"></a>
+<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="./usermanual/properties_reference.html">Properties 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="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</div>
+<ul>
+<li>
+<a href="./usermanual/jmeter_distributed_testing_step_by_step.html">Distributed Testing</a>
+</li>
+<li>
+<a href="./usermanual/jmeter_proxy_step_by_step.html">Recording Tests</a>
+</li>
+<li>
+<a href="./usermanual/junitsampler_tutorial.html">JUnit Sampler</a>
+</li>
+<li>
+<a href="./usermanual/jmeter_accesslog_sampler_step_by_step.html">Access Log Sampler</a>
+</li>
+<li>
+<a href="./usermanual/jmeter_tutorial.html">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="http://www.apache.org/security/">Security</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/">The Apache Software Foundation (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>
+<div class="section">
+<h1>Apache JMeter&trade;</h1>
+    
+<p>
       The <b>Apache JMeter&trade;</b> application is open source software,
       a 100% pure Java application designed
       to load test functional behavior and measure performance.  It was
       originally designed for testing Web Applications but has
       since expanded to other test functions.
     </p>
-    <h2>What can I do with it?</h2>
-    <p>
+    
+<h2>What can I do with it?</h2>
+    
+<p>
       Apache JMeter may be used to test performance both on static and dynamic
       resources, Web dynamic applications. <br> 
       It can be used to simulate a heavy load on a server, group of servers, 
       network or object to test its strength or to analyze overall performance 
       under different load types.<br> 
-    </p>
+    
+</p>
+
 <p>Apache JMeter features include:</p>
+
 <ul>
-    <li>Ability to load and performance test many different applications/server/protocol types:
+    
+<li>Ability to load and performance test many different applications/server/protocol types:
         <ul>
-        <li>Web - HTTP, HTTPS (Java, NodeJS, PHP, ASP.NET, &hellip;)</li>
-        <li>SOAP / REST Webservices</li>
-        <li>FTP</li>
-        <li>Database via JDBC</li>
-        <li>LDAP</li>
-        <li>Message-oriented middleware (MOM) via JMS</li>
-        <li>Mail - SMTP(S), POP3(S) and IMAP(S)</li>
-        <li>Native commands or shell scripts</li>
-        <li>TCP</li>
-        <li>Java Objects</li>
-        </ul>
-    </li>
-    <li>Full featured Test IDE that allows fast Test Plan <b>recording (from Browsers or native applications), building and debugging</b>.</li>
-    <li><b><a href="usermanual/get-started.html#non_gui">Command-line mode (Non GUI / headless mode)</a></b> to load test from any Java compatible OS (Linux, Windows, Mac OSX, &hellip;)</li>
-    <li>A complete and <b><a href="usermanual/generating-dashboard.html">ready to present dynamic HTML report</a></b></li>
-    <li>Easy correlation through ability to extract data from most popular response formats, <b><a href="usermanual/component_reference.html#CSS/JQuery_Extractor">HTML</a>, <a href="usermanual/component_reference.html#JSON_Extractor">JSON </a>, 
-        <a href="usermanual/component_reference.html#XPath_Extractor">XML</a> or <a href="usermanual/component_reference.html#Regular_Expression_Extractor">any textual format</a></b></li>
-    <li>Complete portability and <b>100% Java purity</b>.</li>
-    <li>Full <b>multi-threading</b> framework allows concurrent sampling by many threads and
+        
+<li>Web - HTTP, HTTPS (Java, NodeJS, PHP, ASP.NET, &hellip;)</li>
+        
+<li>SOAP / REST Webservices</li>
+        
+<li>FTP</li>
+        
+<li>Database via JDBC</li>
+        
+<li>LDAP</li>
+        
+<li>Message-oriented middleware (MOM) via JMS</li>
+        
+<li>Mail - SMTP(S), POP3(S) and IMAP(S)</li>
+        
+<li>Native commands or shell scripts</li>
+        
+<li>TCP</li>
+        
+<li>Java Objects</li>
+        
+</ul>
+    
+</li>
+    
+<li>Full featured Test IDE that allows fast Test Plan <b>recording (from Browsers or native applications), building and debugging</b>.</li>
+    
+<li>
+<b><a href="usermanual/get-started.html#non_gui">Command-line mode (Non GUI / headless mode)</a></b> to load test from any Java compatible OS (Linux, Windows, Mac OSX, &hellip;)</li>
+    
+<li>A complete and <b><a href="usermanual/generating-dashboard.html">ready to present dynamic HTML report</a></b>
+</li>
+    
+<li>Easy correlation through ability to extract data from most popular response formats, <b><a href="usermanual/component_reference.html#CSS/JQuery_Extractor">HTML</a>, <a href="usermanual/component_reference.html#JSON_Extractor">JSON </a>, 
+        <a href="usermanual/component_reference.html#XPath_Extractor">XML</a> or <a href="usermanual/component_reference.html#Regular_Expression_Extractor">any textual format</a></b>
+</li>
+    
+<li>Complete portability and <b>100% Java purity</b>.</li>
+    
+<li>Full <b>multi-threading</b> framework allows concurrent sampling by many threads and
         simultaneous sampling of different functions by separate thread groups.</li>
-    <li>Caching and offline analysis/replaying of test results.</li>
-    <li><b>Highly Extensible core:</b>
-      <ul>
-        <li>Pluggable Samplers allow unlimited testing capabilities.</li>
-        <li><b>Scriptable Samplers</b> (JSR223-compatible languages like <a href="http://groovy-lang.org">Groovy</a> and BeanShell)</li>
-        <li>Several load statistics may be chosen with <b>pluggable timers</b>.</li>
-        <li>Data analysis and <b>visualization plugins</b> allow great extensibility
+    
+<li>Caching and offline analysis/replaying of test results.</li>
+    
+<li>
+<b>Highly Extensible core:</b>
+      
+<ul>
+        
+<li>Pluggable Samplers allow unlimited testing capabilities.</li>
+        
+<li>
+<b>Scriptable Samplers</b> (JSR223-compatible languages like <a href="http://groovy-lang.org">Groovy</a> and BeanShell)</li>
+        
+<li>Several load statistics may be chosen with <b>pluggable timers</b>.</li>
+        
+<li>Data analysis and <b>visualization plugins</b> allow great extensibility
         as well as personalization.</li>
-        <li>Functions can be used to provide dynamic input to a test or provide data manipulation.</li>
-        <li>Easy Continuous Integration through 3<sup>rd</sup> party Open Source libraries for Maven, Graddle and Jenkins</li>
-      </ul>
-    </li>
+        
+<li>Functions can be used to provide dynamic input to a test or provide data manipulation.</li>
+        
+<li>Easy Continuous Integration through 3<sup>rd</sup> party Open Source libraries for Maven, Graddle and Jenkins</li>
+      
 </ul>
+    
+</li>
+
+</ul>
+
 <h2>How do I do it?</h2>
+
 <ul>
-<li><a href="usermanual/index.html">Using JMeter</a> to understand how to use it</li>
-<li><a href="usermanual/component_reference.html">Component reference</a> to have detailed information for every Test element</li>
-<li><a href="usermanual/functions.html">Functions reference</a> to have detailed information and examples for every function</li>
-<li><a href="usermanual/properties_reference.html">Properties reference</a> for all properties that allow you to customize JMeter</li>
-<li><a href="api/index.html">Javadoc API documentation</a></li>
-<li><a href="http://wiki.apache.org/jmeter/JMeterFAQ">JMeter FAQ (Wiki)</a></li>
-<li><a href="http://wiki.apache.org/jmeter/">JMeter Wiki</a></li>
-<li><a href="building.html">Building JMeter and Add-Ons</a> for advanced usage</li>
+
+<li>
+<a href="usermanual/index.html">Using JMeter</a> to understand how to use it</li>
+
+<li>
+<a href="usermanual/component_reference.html">Component reference</a> to have detailed information for every Test element</li>
+
+<li>
+<a href="usermanual/functions.html">Functions reference</a> to have detailed information and examples for every function</li>
+
+<li>
+<a href="usermanual/properties_reference.html">Properties reference</a> for all properties that allow you to customize JMeter</li>
+
+<li>
+<a href="api/index.html">Javadoc API documentation</a>
+</li>
+
+<li>
+<a href="http://wiki.apache.org/jmeter/JMeterFAQ">JMeter FAQ (Wiki)</a>
+</li>
+
+<li>
+<a href="http://wiki.apache.org/jmeter/">JMeter Wiki</a>
+</li>
+
+<li>
+<a href="building.html">Building JMeter and Add-Ons</a> for advanced usage</li>
+
 </ul>
 
+
 <h2>JMeter is not a browser</h2>
+
 <p>
 JMeter is not a browser, it works at protocol level.
 As far as web-services and remote services are concerned, JMeter looks like a browser (or rather, multiple browsers);
@@ -80,35 +322,93 @@ Nor does it render the HTML pages as a b
 (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 displayed at a time).
 </p>
 
+
 <h2>Tutorials</h2>
+
 <ul>
-<li><a href="usermanual/jmeter_distributed_testing_step_by_step.html">Distributed Testing</a></li>
-<li><a href="usermanual/jmeter_proxy_step_by_step.html">Recording Tests</a></li>
-<li><a href="usermanual/junitsampler_tutorial.html">JUnit Sampler</a></li>
-<li><a href="usermanual/jmeter_accesslog_sampler_step_by_step.html">Access Log Sampler</a></li>
-<li><a href="usermanual/jmeter_tutorial.html">Extending JMeter</a></li>
+
+<li>
+<a href="usermanual/jmeter_distributed_testing_step_by_step.html">Distributed Testing</a>
+</li>
+
+<li>
+<a href="usermanual/jmeter_proxy_step_by_step.html">Recording Tests</a>
+</li>
+
+<li>
+<a href="usermanual/junitsampler_tutorial.html">JUnit Sampler</a>
+</li>
+
+<li>
+<a href="usermanual/jmeter_accesslog_sampler_step_by_step.html">Access Log Sampler</a>
+</li>
+
+<li>
+<a href="usermanual/jmeter_tutorial.html">Extending JMeter</a>
+</li>
+
 </ul>
+
 <h2>Further Information About JMeter</h2>
+
 <ul>
-<li><a href="changes.html">Changes List</a></li>
-<li><a href="issues.html">Read about existings Issues (Bugs or Enhancements) or reporting new ones (please do it !)</a></li>
-<li><a href="http://www.apache.org/licenses/">License</a></li>
-<li><a href="mail.html">Mailing Lists</a></li>
-<li><a href="svnindex.html">Source Repositories</a></li>
-<li><a href="http://wiki.apache.org/jmeter/JMeterCommitters">Contributors</a></li>
+
+<li>
+<a href="changes.html">Changes List</a>
+</li>
+
+<li>
+<a href="issues.html">Read about existing Issues (Bugs or Enhancements) or reporting new ones (please do it !)</a>
+</li>
+
+<li>
+<a href="http://www.apache.org/licenses/">License</a>
+</li>
+
+<li>
+<a href="mail.html">Mailing Lists</a>
+</li>
+
+<li>
+<a href="svnindex.html">Source Repositories</a>
+</li>
+
+<li>
+<a href="http://wiki.apache.org/jmeter/JMeterCommitters">Contributors</a>
+</li>
+
 </ul>
-</div><div class="share-links">
+
+</div>
+<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">
+      <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;
             1999 &ndash;
             2017
             , Apache Software Foundation
-          </div><div class="trademarks">Apache, Apache JMeter, JMeter, the Apache
+          </div>
+<div class="trademarks">Apache, Apache JMeter, JMeter, the Apache
             feather, and the Apache JMeter logo are
             trademarks of the
             Apache Software Foundation.
-          </div></div><script>(function(){
+          </div>
+</div>
+<script>(function(){
             // fill in the current location into social links on this page.
             "use strict";
             var as = document.getElementsByTagName('a');
@@ -122,4 +422,6 @@ Nor does it render the HTML pages as a b
                     as[i].href = href + encodeURIComponent(loc);
                 }
             }
-        })();</script></body></html>
\ No newline at end of file
+        })();</script>
+</body>
+</html>