Author: milamber Date: Sat Apr 22 18:21:22 2017 New Revision: 1792313 URL: http://svn.apache.org/viewvc?rev=1792313&view=rev Log: Backport (cherry-pick via svn merge -c) the commit r1792287 from docs-3.2 to trunk. Modified: jmeter/trunk/ (props changed) jmeter/trunk/xdocs/usermanual/best-practices.xml jmeter/trunk/xdocs/usermanual/boss.xml jmeter/trunk/xdocs/usermanual/build-jms-topic-test-plan.xml jmeter/trunk/xdocs/usermanual/build-monitor-test-plan.xml jmeter/trunk/xdocs/usermanual/component_reference.xml jmeter/trunk/xdocs/usermanual/functions.xml jmeter/trunk/xdocs/usermanual/generating-dashboard.xml jmeter/trunk/xdocs/usermanual/glossary.xml jmeter/trunk/xdocs/usermanual/hints_and_tips.xml jmeter/trunk/xdocs/usermanual/history_future.xml jmeter/trunk/xdocs/usermanual/index.xml jmeter/trunk/xdocs/usermanual/jmeter_accesslog_sampler_step_by_step.xml jmeter/trunk/xdocs/usermanual/jmeter_distributed_testing_step_by_step.xml jmeter/trunk/xdocs/usermanual/jmeter_proxy_step_by_step.xml jmeter/trunk/xdocs/usermanual/jmeter_tutorial.xml jmeter/trunk/xdocs/usermanual/junitsampler_tutorial.xml jmeter/trunk/xdocs/usermanual/listeners.xml jmeter/trunk/xdocs/usermanual/properties_reference.xml jmeter/trunk/xdocs/usermanual/realtime-results.xml jmeter/trunk/xdocs/usermanual/regular_expressions.xml jmeter/trunk/xdocs/usermanual/remote-test.xml Propchange: jmeter/trunk/ ------------------------------------------------------------------------------ svn:mergeinfo = /jmeter/branches/docs-3.2:1792287 Modified: jmeter/trunk/xdocs/usermanual/best-practices.xml URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/best-practices.xml?rev=1792313&r1=1792312&r2=1792313&view=diff ============================================================================== --- jmeter/trunk/xdocs/usermanual/best-practices.xml (original) +++ jmeter/trunk/xdocs/usermanual/best-practices.xml Sat Apr 22 18:21:22 2017 @@ -18,7 +18,7 @@ --> + ]> Modified: jmeter/trunk/xdocs/usermanual/boss.xml URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/boss.xml?rev=1792313&r1=1792312&r2=1792313&view=diff ============================================================================== --- jmeter/trunk/xdocs/usermanual/boss.xml (original) +++ jmeter/trunk/xdocs/usermanual/boss.xml Sat Apr 22 18:21:22 2017 @@ -17,7 +17,7 @@ --> + ]> Modified: jmeter/trunk/xdocs/usermanual/build-jms-topic-test-plan.xml URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/build-jms-topic-test-plan.xml?rev=1792313&r1=1792312&r2=1792313&view=diff ============================================================================== --- jmeter/trunk/xdocs/usermanual/build-jms-topic-test-plan.xml (original) +++ jmeter/trunk/xdocs/usermanual/build-jms-topic-test-plan.xml Sat Apr 22 18:21:22 2017 @@ -19,7 +19,7 @@ [ ]> - + User's Manual: Building a JMS (Java Messaging Service) Test Plan Modified: jmeter/trunk/xdocs/usermanual/build-monitor-test-plan.xml URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/build-monitor-test-plan.xml?rev=1792313&r1=1792312&r2=1792313&view=diff ============================================================================== --- jmeter/trunk/xdocs/usermanual/build-monitor-test-plan.xml (original) +++ jmeter/trunk/xdocs/usermanual/build-monitor-test-plan.xml Sat Apr 22 18:21:22 2017 @@ -22,12 +22,12 @@ - User's Manual: Building a Monitor Test Plan (DEPRECATED) + User's Manual: Building a Monitor Test Plan (REMOVED since JMeter 3.2) -
+
Note this feature is deprecated since JMeter 3.1

In this section, you will learn how to create a Test Plan to monitor webservers. Monitors Modified: jmeter/trunk/xdocs/usermanual/component_reference.xml URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/component_reference.xml?rev=1792313&r1=1792312&r2=1792313&view=diff ============================================================================== --- jmeter/trunk/xdocs/usermanual/component_reference.xml (original) +++ jmeter/trunk/xdocs/usermanual/component_reference.xml Sat Apr 22 18:21:22 2017 @@ -18,7 +18,7 @@ --> + Modified: jmeter/trunk/xdocs/usermanual/functions.xml URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/functions.xml?rev=1792313&r1=1792312&r2=1792313&view=diff ============================================================================== --- jmeter/trunk/xdocs/usermanual/functions.xml (original) +++ jmeter/trunk/xdocs/usermanual/functions.xml Sat Apr 22 18:21:22 2017 @@ -18,7 +18,7 @@ + Modified: jmeter/trunk/xdocs/usermanual/generating-dashboard.xml URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/generating-dashboard.xml?rev=1792313&r1=1792312&r2=1792313&view=diff ============================================================================== --- jmeter/trunk/xdocs/usermanual/generating-dashboard.xml (original) +++ jmeter/trunk/xdocs/usermanual/generating-dashboard.xml Sat Apr 22 18:21:22 2017 @@ -5,7 +5,7 @@ under the License. --> + ]> Modified: jmeter/trunk/xdocs/usermanual/glossary.xml URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/glossary.xml?rev=1792313&r1=1792312&r2=1792313&view=diff ============================================================================== --- jmeter/trunk/xdocs/usermanual/glossary.xml (original) +++ jmeter/trunk/xdocs/usermanual/glossary.xml Sat Apr 22 18:21:22 2017 @@ -17,7 +17,7 @@ --> + ]> Modified: jmeter/trunk/xdocs/usermanual/hints_and_tips.xml URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/hints_and_tips.xml?rev=1792313&r1=1792312&r2=1792313&view=diff ============================================================================== --- jmeter/trunk/xdocs/usermanual/hints_and_tips.xml (original) +++ jmeter/trunk/xdocs/usermanual/hints_and_tips.xml Sat Apr 22 18:21:22 2017 @@ -17,7 +17,7 @@ --> + ]> Modified: jmeter/trunk/xdocs/usermanual/history_future.xml URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/history_future.xml?rev=1792313&r1=1792312&r2=1792313&view=diff ============================================================================== --- jmeter/trunk/xdocs/usermanual/history_future.xml (original) +++ jmeter/trunk/xdocs/usermanual/history_future.xml Sat Apr 22 18:21:22 2017 @@ -17,7 +17,7 @@ --> + ]> Modified: jmeter/trunk/xdocs/usermanual/index.xml URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/index.xml?rev=1792313&r1=1792312&r2=1792313&view=diff ============================================================================== --- jmeter/trunk/xdocs/usermanual/index.xml (original) +++ jmeter/trunk/xdocs/usermanual/index.xml Sat Apr 22 18:21:22 2017 @@ -41,20 +41,19 @@

  • +...9. Building a Webservice Test Plan
  • +...10. Building a JMS Point to point Test Plan
  • +...11. Building a JMS Topic Test Plan
  • -
  • +...12. Building a Monitor Test Plan
  • -
  • +...13. Listeners
  • -
  • +...14. Remote Testing
  • -
  • +...15. Dashboard Report
  • -
  • +...16. Real time Results
  • -
  • +...17. Best Practices
  • -
  • +...18. Help! My boss wants me to load test our web app!
  • -
  • +...19. Component Reference
  • -
  • +...20. Properties Reference
  • -
  • +...21. Functions
  • -
  • +...22. Regular Expressions
  • -
  • +...23. Hints and Tips
  • -
  • +...24. Glossary
  • -
  • +...25. History / Future
  • +
  • +...12. Listeners
  • +
  • +...13. Remote Testing
  • +
  • +...14. Dashboard Report
  • +
  • +...15. Real time Results
  • +
  • +...16. Best Practices
  • +
  • +...17. Help! My boss wants me to load test our web app!
  • +
  • +...18. Component Reference
  • +
  • +...19. Properties Reference
  • +
  • +...20. Functions
  • +
  • +...21. Regular Expressions
  • +
  • +...22. Hints and Tips
  • +
  • +...23. Glossary
  • +
  • +...24. History / Future
  • @@ -186,28 +185,27 @@
  • 9. Building a Webservice Test Plan
  • 10. Building a JMS Point to point Test Plan
  • 11. Building a JMS topic Test Plan
  • -
  • 12. Building a Monitor Test Plan
  • -
  • 13. Introduction to Listeners
  • -
  • 14. Remote Testing
  • -
  • 15. Dashboard Report +
  • 12. Introduction to Listeners
  • +
  • 13. Remote Testing
  • +
  • 14. Dashboard Report
  • -
  • 16. Real time Results
  • -
  • 17. Best Practices
  • -
  • 18. Help! My boss wants me to load test our web app!
  • -
  • 19. Component Reference
  • -
  • 20. Properties reference
  • -
  • 21. Functions
  • -
  • 22. Regular Expressions
  • -
  • 23. Hints and Tips
  • -
  • 24. Glossary
  • -
  • 25. History / Future
  • +
  • 15. Real time Results
  • +
  • 16. Best Practices
  • +
  • 17. Help! My boss wants me to load test our web app!
  • +
  • 18. Component Reference
  • +
  • 19. Properties reference
  • +
  • 20. Functions
  • +
  • 21. Regular Expressions
  • +
  • 22. Hints and Tips
  • +
  • 23. Glossary
  • +
  • 24. History / Future
  • Modified: jmeter/trunk/xdocs/usermanual/jmeter_accesslog_sampler_step_by_step.xml URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/jmeter_accesslog_sampler_step_by_step.xml?rev=1792313&r1=1792312&r2=1792313&view=diff ============================================================================== --- jmeter/trunk/xdocs/usermanual/jmeter_accesslog_sampler_step_by_step.xml (original) +++ jmeter/trunk/xdocs/usermanual/jmeter_accesslog_sampler_step_by_step.xml Sat Apr 22 18:21:22 2017 @@ -17,7 +17,7 @@ --> + ]> Modified: jmeter/trunk/xdocs/usermanual/jmeter_distributed_testing_step_by_step.xml URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/jmeter_distributed_testing_step_by_step.xml?rev=1792313&r1=1792312&r2=1792313&view=diff ============================================================================== --- jmeter/trunk/xdocs/usermanual/jmeter_distributed_testing_step_by_step.xml (original) +++ jmeter/trunk/xdocs/usermanual/jmeter_distributed_testing_step_by_step.xml Sat Apr 22 18:21:22 2017 @@ -17,7 +17,7 @@ --> + ]> Modified: jmeter/trunk/xdocs/usermanual/jmeter_proxy_step_by_step.xml URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/jmeter_proxy_step_by_step.xml?rev=1792313&r1=1792312&r2=1792313&view=diff ============================================================================== --- jmeter/trunk/xdocs/usermanual/jmeter_proxy_step_by_step.xml (original) +++ jmeter/trunk/xdocs/usermanual/jmeter_proxy_step_by_step.xml Sat Apr 22 18:21:22 2017 @@ -17,7 +17,7 @@ --> + ]> Modified: jmeter/trunk/xdocs/usermanual/jmeter_tutorial.xml URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/jmeter_tutorial.xml?rev=1792313&r1=1792312&r2=1792313&view=diff ============================================================================== --- jmeter/trunk/xdocs/usermanual/jmeter_tutorial.xml (original) +++ jmeter/trunk/xdocs/usermanual/jmeter_tutorial.xml Sat Apr 22 18:21:22 2017 @@ -17,7 +17,7 @@ --> + ]> Modified: jmeter/trunk/xdocs/usermanual/junitsampler_tutorial.xml URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/junitsampler_tutorial.xml?rev=1792313&r1=1792312&r2=1792313&view=diff ============================================================================== --- jmeter/trunk/xdocs/usermanual/junitsampler_tutorial.xml (original) +++ jmeter/trunk/xdocs/usermanual/junitsampler_tutorial.xml Sat Apr 22 18:21:22 2017 @@ -17,7 +17,7 @@ --> + ]> Modified: jmeter/trunk/xdocs/usermanual/listeners.xml URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/listeners.xml?rev=1792313&r1=1792312&r2=1792313&view=diff ============================================================================== --- jmeter/trunk/xdocs/usermanual/listeners.xml (original) +++ jmeter/trunk/xdocs/usermanual/listeners.xml Sat Apr 22 18:21:22 2017 @@ -18,12 +18,12 @@ + ]> - + User's Manual: Listeners Modified: jmeter/trunk/xdocs/usermanual/properties_reference.xml URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/properties_reference.xml?rev=1792313&r1=1792312&r2=1792313&view=diff ============================================================================== --- jmeter/trunk/xdocs/usermanual/properties_reference.xml (original) +++ jmeter/trunk/xdocs/usermanual/properties_reference.xml Sat Apr 22 18:21:22 2017 @@ -18,7 +18,7 @@ --> + Modified: jmeter/trunk/xdocs/usermanual/realtime-results.xml URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/realtime-results.xml?rev=1792313&r1=1792312&r2=1792313&view=diff ============================================================================== --- jmeter/trunk/xdocs/usermanual/realtime-results.xml (original) +++ jmeter/trunk/xdocs/usermanual/realtime-results.xml Sat Apr 22 18:21:22 2017 @@ -17,7 +17,7 @@ --> + ]> Modified: jmeter/trunk/xdocs/usermanual/regular_expressions.xml URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/regular_expressions.xml?rev=1792313&r1=1792312&r2=1792313&view=diff ============================================================================== --- jmeter/trunk/xdocs/usermanual/regular_expressions.xml (original) +++ jmeter/trunk/xdocs/usermanual/regular_expressions.xml Sat Apr 22 18:21:22 2017 @@ -17,7 +17,7 @@ --> + ]> Modified: jmeter/trunk/xdocs/usermanual/remote-test.xml URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/remote-test.xml?rev=1792313&r1=1792312&r2=1792313&view=diff ============================================================================== --- jmeter/trunk/xdocs/usermanual/remote-test.xml (original) +++ jmeter/trunk/xdocs/usermanual/remote-test.xml Sat Apr 22 18:21:22 2017 @@ -17,7 +17,7 @@ --> + ]>