diff --git a/xdocs/usermanual/get-started.xml b/xdocs/usermanual/get-started.xml
index 3a45d6b960..810ec716c1 100644
--- a/xdocs/usermanual/get-started.xml
+++ b/xdocs/usermanual/get-started.xml
@@ -144,17 +144,13 @@ There may also be some information on the <a href="http://wiki.apache.org/jmeter
 
 <subsection name="&sect-num;.2.7 Libraries for ActiveMQ JMS" anchor="libraries_activemq">
 <p>
-At the time of writing, the current version of ActiveMQ is 5.3.2.
-You will need to add the jar activemq-all-5.3.2.jar to your classpath, e.g. by storing it in the lib/ directory.
+You will need to add the jar activemq-all-X.X.X.jar to your classpath, e.g. by storing it in the lib/ directory.
 </p>
 <p>
-Alternatively, add the jar activemq-core-5.3.2.jar to the classpath; 
-this requires the javax/management/j2ee classes which can be found in the 
-Apache Geronimo jar geronimo-j2ee-management_1.0_spec-1.0.jar.
 The other required jars (such as commons-logging) are already included with JMeter. 
 </p>
 <p>
-See <a href="http://activemq.apache.org/initial-configuration.html">http://activemq.apache.org/initial-configuration.html</a>
+See <a href="http://activemq.apache.org/initial-configuration.html">ActiveMQ initial configuration page</a>
 for details.
 </p>
 </subsection>
diff --git a/xdocs/usermanual/index.xml b/xdocs/usermanual/index.xml
index a5297ebe12..28e918ec82 100644
--- a/xdocs/usermanual/index.xml
+++ b/xdocs/usermanual/index.xml
@@ -76,24 +76,21 @@
         <li><a href="get-started.html#opt_email">2.2.3 Email Support</a></li>
         <li><a href="get-started.html#opt_ssl">2.2.4 SSL Encryption</a></li>
         <li><a href="get-started.html#opt_jdbc">2.2.5 JDBC Driver</a></li>
-        <li><a href="get-started.html#opt_soap">2.2.6 Apache SOAP</a></li>
-        <li><a href="get-started.html#opt_beanshell">2.2.7 BeanShell</a></li>
-        <li><a href="get-started.html#libraries_activemq">2.2.8 Libraries for ActiveMQ 3.0</a></li>
+        <li><a href="get-started.html#opt_jms">2.2.6 JMS client</a></li>
+        <li><a href="get-started.html#libraries_activemq">2.2.7 Libraries for ActiveMQ JMS</a></li>
      </ul>
      <li><a href="get-started.html#install">2.3 Installation</a></li>
-     <ul>
-        <li><a href="get-started.html#download_release">2.3.1 Downloading the Latest Release</a></li>
-        <li><a href="get-started.html#download_nightly">2.3.2 Downloading Nightly Builds</a></li>
-     </ul>
      <li><a href="get-started.html#running">2.4 Running JMeter</a></li>
      <ul>
         <li><a href="get-started.html#classpath">2.4.1 JMeter's Classpath</a></li>
-        <li><a href="get-started.html#proxy_server">2.4.2 Using a Proxy Server</a></li>
-        <li><a href="get-started.html#non_gui">2.4.3 Non-GUI Mode</a></li>
-        <li><a href="get-started.html#server">2.4.4 Distributed Mode</a></li>
-        <li><a href="get-started.html#override">2.4.5 Overriding Properties Via The Command Line</a></li>
-        <li><a href="get-started.html#logging">2.4.6 Logging and Error Messages</a></li>
-        <li><a href="get-started.html#options">2.4.7 Full list of command-line options</a></li>
+        <li><a href="get-started.html#template">2.4.2 Create Test Plan from Template</a></li>
+        <li><a href="get-started.html#proxy_server">2.4.3 Using JMeter behing a proxy</a></li>
+        <li><a href="get-started.html#non_gui">2.4.4 Non-GUI Mode</a></li>
+        <li><a href="get-started.html#server">2.4.5 Server Mode</a></li>
+        <li><a href="get-started.html#override">2.4.6 Overriding Properties Via The Command Line</a></li>
+        <li><a href="get-started.html#logging">2.4.7 Logging and Error Messages</a></li>
+        <li><a href="get-started.html#options">2.4.8 Full list of command-line options</a></li>
+        <li><a href="get-started.html#shutdown">2.4.9 non-GUI shutdown</a></li>
      </ul>
      <li><a href="get-started.html#configuring_jmeter">2.5 Configuring JMeter</a></li>
   </ul>
@@ -104,7 +101,8 @@
      <li><a href="build-test-plan.html#config_element">3.3 Configuring Tree Elements</a></li>
      <li><a href="build-test-plan.html#save">3.4 Saving the Test Plan</a></li>
      <li><a href="build-test-plan.html#run">3.5 Running a Test Plan</a></li>
-     <li><a href="build-test-plan.html#error_reporting">3.6 Error reporting</a></li>
+     <li><a href="build-test-plan.html#stop">3.6 Stopping a Test</a></li>
+     <li><a href="build-test-plan.html#error_reporting">3.7 Error reporting</a></li>
   </ul>
   <li><a name="test_plan"/><a href="test_plan.html">4. Elements of a Test Plan</a></li>
   <ul>
@@ -113,6 +111,7 @@
      <ul>
         <li><a href="test_plan.html#samplers">4.2.1 Samplers</a></li>
         <li><a href="test_plan.html#logic_controller">4.2.2 Logic Controllers</a></li>
+        <li><a href="test_plan.html#test_fragments">4.2.3 Test Fragments</a></li>
      </ul>
      <li><a href="test_plan.html#listeners">4.3 Listeners</a></li>
      <li><a href="test_plan.html#timers">4.4 Timers</a></li>
@@ -158,7 +157,8 @@
     <li><a href="build-ldap-test-plan.html#add_login">9a.2 Adding Login Config Element</a></li>
     <li><a href="build-ldap-test-plan.html#add_defaults">9a.3 Adding LDAP Request Defaults</a></li>
     <li><a href="build-ldap-test-plan.html#add_requests">9a.4 Adding LDAP Requests</a></li>
-    <li><a href="build-ldap-test-plan.html#add_listener">9a.5 Adding a Listener to View/Store the Test Results</a></li>
+    <li><a href="build-ldap-test-plan.html#ResponseAssertion">9a.5 Adding a Response Assertion</a></li>
+    <li><a href="build-ldap-test-plan.html#add_listener">9a.6 Adding a Listener to View/Store the Test Results</a></li>
   </ul>
  <li><a name="build-ldapext-test-plan"/><a href="build-ldap-test-plan.html">9b. Building an Extended LDAP Test Plan</a></li>
   <ul>
@@ -171,20 +171,24 @@
  <li><a name="build-jms-point-to-point-test-plan"/><a href="build-jms-point-to-point-test-plan.html">11. Building a JMS Point to point Test Plan</a></li>
  <li><a name="build-jms-topic-test-plan"/><a href="build-jms-topic-test-plan.html">12. Building a JMS topic Test Plan</a></li>
  <li><a name="build-monitor-test-plan"/><a href="build-monitor-test-plan.html">13. Building a Monitor Test Plan</a></li>
- <li><a name="listeners"/><a href="listeners.html">14. Listeners</a></li>
+ <li><a name="listeners"/><a href="listeners.html">14. Introduction to Listeners</a></li>
  <li><a name="remote-test"/><a href="remote-test.html">15. Remote Testing</a></li>
  <li><a name="best-practices"/><a href="best-practices.html">16. Best Practices</a></li>
-  <ul>
-     <li><a href="best-practices.html#limit_threads">16.1 Limit the Number of Threads</a></li>
-     <li><a href="best-practices.html#put_cookie_manager">16.2 Where to Put the Cookie Manager</a></li>
-     <li><a href="best-practices.html#put_auth_manager">16.3 Where to Put the Authorization Manager</a></li>
-     <li><a href="best-practices.html#proxy_server">16.4 Using the HTTP(S) Test Script Recorder to record test scripts</a></li>
-     <li><a href="best-practices.html#user_variables">16.5 User variables</a></li>
-     <li><a href="best-practices.html#lean_mean">16.6 Reducing resource requirements</a></li>
-     <li><a href="best-practices.html#beanshell_server">16.7 BeanShell server</a></li>
-     <li><a href="best-practices.html#bsh_scripting">16.8 BeanShell scripting</a></li>
-     <li><a href="best-practices.html#developing_scripts">16.9 Developing script functions in BeanShell, Javascript or Jexl etc.</a></li>
-     <li><a href="best-practices.html#parameterising_tests">16.10 Parameterising tests</a></li>
+  <ul>    
+     <li><a href="best-practices.html#best_practices">16. Best Practices</a></li>
+     <li><a href="best-practices.html#use_latest_version">16.1 Always use latest version of JMeter</a></li>
+     <li><a href="best-practices.html#sizing_threads">16.2 Use the correct Number of Threads</a></li>
+     <li><a href="best-practices.html#put_cookie_manager">16.3 Where to Put the Cookie Manager</a></li>
+     <li><a href="best-practices.html#put_auth_manager">16.4 Where to Put the Authorization Manager</a></li>
+     <li><a href="best-practices.html#proxy_server">16.5 Using the HTTP(S) Test Script Recorder</a></li>
+     <li><a href="best-practices.html#user_variables">16.6 User variables</a></li>
+     <li><a href="best-practices.html#lean_mean">16.7 Reducing resource requirements</a></li>
+     <li><a href="best-practices.html#beanshell_server">16.8 BeanShell server</a></li>
+     <li><a href="best-practices.html#bsh_scripting">16.9 BeanShell scripting</a></li>
+     <li><a href="best-practices.html#developing_scripts">16.10 Developing script functions in BeanShell, Javascript or Jexl etc.</a></li>
+     <li><a href="best-practices.html#parameterising_tests">16.11 Parameterising tests</a></li>
+     <li><a href="best-practices.html#jsr223">16.12 JSR223 Elements</a></li>
+     <li><a href="best-practices.html#sharing_variables">16.13 Sharing variables between threads and thread groups</a></li>
   </ul>
  <li><a name="boss"/><a href="boss.html">17. Help! My boss wants me to load test our web app!</a></li>
 
diff --git a/xdocs/usermanual/test_plan.xml b/xdocs/usermanual/test_plan.xml
index 06e636560d..0aa0e30773 100644
--- a/xdocs/usermanual/test_plan.xml
+++ b/xdocs/usermanual/test_plan.xml
@@ -40,7 +40,7 @@ is off by default).  </p>
 <p>If you are not recording the data to file, this option makes no difference.</p>
 <p>You can also use the Configuration button on a listener to decide what fields to save.</p>
 
-<subsection name="&sect-num;.1 ThreadGroup" anchor="thread_group">
+<subsection name="&sect-num;.1 Thread Group" anchor="thread_group">
 <p>Thread group elements are the beginning points of any test plan.
 All controllers and samplers must be under a thread group.
 Other elements, e.g. Listeners, may be placed directly under the test plan,