This is an automated email from the ASF dual-hosted git repository.
fschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git
The following commit(s) were added to refs/heads/master by this push:
new c780783 Use new cwiki links
c780783 is described below
commit c780783e832579ae6ec5717f39741d2f8e8b8768
Author: Felix Schumacher <[email protected]>
AuthorDate: Sun Jul 14 15:51:07 2019 +0200
Use new cwiki links
---
xdocs/changes_history.xml | 2 +-
xdocs/index.xml | 6 +++---
xdocs/stylesheets/project.xml | 6 +++---
xdocs/usermanual/boss.xml | 6 +++---
xdocs/usermanual/component_reference.xml | 2 +-
xdocs/usermanual/get-started.xml | 6 +++---
xdocs/usermanual/hints_and_tips.xml | 2 +-
xdocs/usermanual/jmeter_distributed_testing_step_by_step.xml | 2 +-
xdocs/usermanual/jmeter_proxy_step_by_step.xml | 2 +-
9 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/xdocs/changes_history.xml b/xdocs/changes_history.xml
index e06ae26..cd90d89 100644
--- a/xdocs/changes_history.xml
+++ b/xdocs/changes_history.xml
@@ -5330,7 +5330,7 @@ Cookie Manager has now the default HC3.1 implementation
and a new choice HC4 imp
<li>usage of Compilable interface when available to boost CPU usage</li>
<li>caching of Compilation when scripts are used as Files</li>
</ul>
-See <a href="http://wiki.apache.org/jmeter/JMeterPerformance";>JMeter
Performances across versions</a>
+See <a
href="https://cwiki.apache.org/confluence/display/JMETER/JMeterPerformance";>JMeter
Performances across versions</a>
</p>
<h4>OS Process Sampler</h4>
diff --git a/xdocs/index.xml b/xdocs/index.xml
index bfd40c6..4738c42 100644
--- a/xdocs/index.xml
+++ b/xdocs/index.xml
@@ -84,8 +84,8 @@
<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="https://wiki.apache.org/jmeter/JMeterFAQ";>JMeter FAQ
(Wiki)</a></li>
-<li><a href="https://wiki.apache.org/jmeter/";>JMeter Wiki</a></li>
+<li><a
href="https://cwiki.apache.org/confluence/display/JMETER/JMeterFAQ";>JMeter FAQ
(Wiki)</a></li>
+<li><a href="https://cwiki.apache.org/confluence/display/JMETER/Home";>JMeter
Wiki</a></li>
<li><a href="building.html">Building JMeter and Add-Ons</a> for advanced
usage</li>
</ul>
@@ -114,7 +114,7 @@ Nor does it render the HTML pages as a browser does
<li><a href="https://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="https://wiki.apache.org/jmeter/JMeterCommitters";>Contributors</a></li>
+<li><a
href="https://cwiki.apache.org/confluence/display/JMETER/JMeterCommitters";>Contributors</a></li>
</ul>
</section>
</body>
diff --git a/xdocs/stylesheets/project.xml b/xdocs/stylesheets/project.xml
index 00bd712..70d155e 100644
--- a/xdocs/stylesheets/project.xml
+++ b/xdocs/stylesheets/project.xml
@@ -40,8 +40,8 @@
<item name="Properties Reference"
href="/usermanual/properties_reference.html"/>
<item name="Change History" href="/changes_history.html"/>
<item name="Javadocs" href="/api/index.html"/>
- <item name="JMeter Wiki"
href="https://wiki.apache.org/jmeter"/>
- <item name="FAQ (Wiki)"
href="https://wiki.apache.org/jmeter/JMeterFAQ"/>
+ <item name="JMeter Wiki"
href="https://cwiki.apache.org/confluence/display/JMETER/Home"/>
+ <item name="FAQ (Wiki)"
href="https://cwiki.apache.org/confluence/display/JMETER/JMeterFAQ"/>
</menu>
<menu name="Tutorials">
<item name="Distributed Testing"
href="/usermanual/jmeter_distributed_testing_step_by_step.html"/>
@@ -57,7 +57,7 @@
<item name="Source Repositories" href="/svnindex.html"/>
<item name="Building and Contributing" href="/building.html"/>
<item name="Project info at Apache"
href="https://projects.apache.org/project.html?jmeter"/>
- <item name="Contributors"
href="https://wiki.apache.org/jmeter/JMeterCommitters"/>
+ <item name="Contributors"
href="https://cwiki.apache.org/confluence/display/JMETER/JMeterCommitters"/>
</menu>
<menu name="Foundation">
<item name="The Apache Software Foundation (ASF)"
href="https://www.apache.org/"/>
diff --git a/xdocs/usermanual/boss.xml b/xdocs/usermanual/boss.xml
index 404d413..f45179a 100644
--- a/xdocs/usermanual/boss.xml
+++ b/xdocs/usermanual/boss.xml
@@ -163,9 +163,9 @@ and any supplied documentation).
Some of these are listed on the JMeter Wiki.
They are listed under several categories:
<ul>
-<li><a href="http://wiki.apache.org/jmeter/JMeterPlugins";>JMeterPlugins</a> -
plugins for extending JMeter</li>
-<li><a href="http://wiki.apache.org/jmeter/JMeterAddons";>JMeterAddons</a> -
addons for use with JMeter, e.g. plugins for browsers, Maven and Jenkins.</li>
-<li><a href="http://wiki.apache.org/jmeter/JMeterServices";>JMeterServices</a>
- 3<sup>rd</sup> party services, e.g. cloud-based JMeter</li>
+<li><a
href="https://cwiki.apache.org/confluence/display/JMETER/JMeterPlugins";>JMeterPlugins</a>
- plugins for extending JMeter</li>
+<li><a
href="https://cwiki.apache.org/confluence/display/JMETER/JMeterAddons";>JMeterAddons</a>
- addons for use with JMeter, e.g. plugins for browsers, Maven and
Jenkins.</li>
+<li><a
href="https://cwiki.apache.org/confluence/display/JMETER/JMeterServices";>JMeterServices</a>
- 3<sup>rd</sup> party services, e.g. cloud-based JMeter</li>
</ul>
Note that appearance of these on the Wiki does not imply any endorsement by
the Apache JMeter project.
Any requests for support should be directed to the relevant supplier.
diff --git a/xdocs/usermanual/component_reference.xml
b/xdocs/usermanual/component_reference.xml
index 6fa6119..229c69d 100644
--- a/xdocs/usermanual/component_reference.xml
+++ b/xdocs/usermanual/component_reference.xml
@@ -6398,7 +6398,7 @@ Behaviour can be modified with some properties by setting
in user.properties:
<description><p>The HTTP(S) Test Script Recorder allows JMeter to intercept
and record your actions while you browse your web application
with your normal browser. JMeter will create test sample objects and store
them
directly into your test plan as you go (so you can view samples interactively
while you make them).<br/>
-Ensure you read this <a
href="https://wiki.apache.org/jmeter/TestRecording210";>wiki page</a> to setup
correctly JMeter.
+Ensure you read this <a
href="https://cwiki.apache.org/confluence/display/JMETER/TestRecording210";>wiki
page</a> to setup correctly JMeter.
</p>
<p>To use the recorder, <i>add</i> the HTTP(S) Test Script Recorder element.
diff --git a/xdocs/usermanual/get-started.xml b/xdocs/usermanual/get-started.xml
index 4be7598..7e8f0a7 100644
--- a/xdocs/usermanual/get-started.xml
+++ b/xdocs/usermanual/get-started.xml
@@ -125,8 +125,8 @@ JMeter because of JRE implementation issues.</p>
<subsection name="§-num;.1.2 Operating Systems" anchor="os">
<p>JMeter is a 100% Java application and should run correctly on any system
that has a compliant Java implementation.</p>
-<p>Operating systems tested with JMeter can be viewed on
-<a href="http://wiki.apache.org/jmeter/JMeterAndOperatingSystemsTested";>this
page</a>
+<p>Operating systems tested with JMeter can be viewed on
+<a
href="https://cwiki.apache.org/confluence/display/JMETER/JMeterAndOperatingSystemsTested";>this
page</a>
on JMeter wiki.</p>
<p>Even if your OS is not listed on the wiki page, JMeter should run on it
provided that the JVM is compliant.</p>
</subsection>
@@ -185,7 +185,7 @@ Make sure the file is a jar file, not a zip.
<p>
JMeter now includes the JMS API from Apache Geronimo, so you just need to add
the appropriate JMS Client implementation
jar(s) from the JMS provider. Please refer to their documentation for details.
-There may also be some information on the <a
href="http://wiki.apache.org/jmeter/";>JMeter Wiki</a>.
+There may also be some information on the <a
href="https://cwiki.apache.org/confluence/display/JMETER/Home";>JMeter Wiki</a>.
</p>
</subsection>
diff --git a/xdocs/usermanual/hints_and_tips.xml
b/xdocs/usermanual/hints_and_tips.xml
index 6c836ca..bfde901 100644
--- a/xdocs/usermanual/hints_and_tips.xml
+++ b/xdocs/usermanual/hints_and_tips.xml
@@ -30,7 +30,7 @@
<section name="§-num;. Hints and Tips" anchor="hints">
<p>
This section is a collection of various hints and tips that have been
suggested by various questions on the JMeter User list.
-If you don't find what you are looking for here, please check the <a
href="http://wiki.apache.org/jmeter";>JMeter Wiki</a>.
+If you don't find what you are looking for here, please check the <a
href="https://cwiki.apache.org/confluence/display/JMETER/Home";>JMeter Wiki</a>.
Also, try search the JMeter User list; someone may well have already provided
a solution.
</p>
<subsection name="§-num;.1 Passing variables between threads"
anchor="variable_and_threads">
diff --git a/xdocs/usermanual/jmeter_distributed_testing_step_by_step.xml
b/xdocs/usermanual/jmeter_distributed_testing_step_by_step.xml
index 16036e0..54b48fb 100644
--- a/xdocs/usermanual/jmeter_distributed_testing_step_by_step.xml
+++ b/xdocs/usermanual/jmeter_distributed_testing_step_by_step.xml
@@ -155,7 +155,7 @@ There are some basic limitations for distributed testing.
Here's the list of the
<subsection name="§-num;.6 Additional resources"
anchor="additional-resources">
<p>
- <a
href="http://wiki.apache.org/jmeter/JMeterFAQ#How_to_do_remote_testing_the_.27proper_way.27.3F";>Wiki
page on remote testing</a>
+ <a
href="https://cwiki.apache.org/confluence/display/JMETER/JMeterFAQ#JMeterFAQ-Howtodoremotetestingthe'properway'?">Wiki
page on remote testing</a>
</p>
<p>
diff --git a/xdocs/usermanual/jmeter_proxy_step_by_step.xml
b/xdocs/usermanual/jmeter_proxy_step_by_step.xml
index 1d17257..3ad9e2f 100644
--- a/xdocs/usermanual/jmeter_proxy_step_by_step.xml
+++ b/xdocs/usermanual/jmeter_proxy_step_by_step.xml
@@ -41,7 +41,7 @@ This tutorial attempts to explain the exact steps for
recording HTTP/HTTPS. For
<p>
Since JMeter 2.10, recording has been improved to better handle embedded
resources and creation of certificates on the fly.
To enable these features, JMeter uses <code>keytool</code> utility (available
in JRE/JDK) so you need to ensure your
-configuration is correct, read <a
href="https://wiki.apache.org/jmeter/TestRecording210";>this wiki page before
starting.</a>
+configuration is correct, read <a
href="https://cwiki.apache.org/confluence/display/JMETER/TestRecording210";>this
wiki page before starting.</a>
</p>
</subsection>
