You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by se...@apache.org on 2011/11/03 02:36:27 UTC

svn commit: r1196914 [1/2] - in /jmeter/branches/docs-2.5.1/docs: ./ localising/ usermanual/

Author: sebb
Date: Thu Nov  3 01:36:26 2011
New Revision: 1196914

URL: http://svn.apache.org/viewvc?rev=1196914&view=rev
Log:
Remove Jakarta references from navigation

Modified:
    jmeter/branches/docs-2.5.1/docs/building.html
    jmeter/branches/docs-2.5.1/docs/changes.html
    jmeter/branches/docs-2.5.1/docs/changes_history.html
    jmeter/branches/docs-2.5.1/docs/index.html
    jmeter/branches/docs-2.5.1/docs/issues.html
    jmeter/branches/docs-2.5.1/docs/jmeter_irc.html
    jmeter/branches/docs-2.5.1/docs/localising/index.html
    jmeter/branches/docs-2.5.1/docs/nightly.html
    jmeter/branches/docs-2.5.1/docs/usermanual/best-practices.html
    jmeter/branches/docs-2.5.1/docs/usermanual/boss.html
    jmeter/branches/docs-2.5.1/docs/usermanual/build-adv-web-test-plan.html
    jmeter/branches/docs-2.5.1/docs/usermanual/build-db-test-plan.html
    jmeter/branches/docs-2.5.1/docs/usermanual/build-ftp-test-plan.html
    jmeter/branches/docs-2.5.1/docs/usermanual/build-jms-point-to-point-test-plan.html
    jmeter/branches/docs-2.5.1/docs/usermanual/build-jms-topic-test-plan.html
    jmeter/branches/docs-2.5.1/docs/usermanual/build-ldap-test-plan.html
    jmeter/branches/docs-2.5.1/docs/usermanual/build-ldapext-test-plan.html
    jmeter/branches/docs-2.5.1/docs/usermanual/build-monitor-test-plan.html
    jmeter/branches/docs-2.5.1/docs/usermanual/build-test-plan.html
    jmeter/branches/docs-2.5.1/docs/usermanual/build-web-test-plan.html
    jmeter/branches/docs-2.5.1/docs/usermanual/build-ws-test-plan.html
    jmeter/branches/docs-2.5.1/docs/usermanual/component_reference.html
    jmeter/branches/docs-2.5.1/docs/usermanual/functions.html
    jmeter/branches/docs-2.5.1/docs/usermanual/get-started.html
    jmeter/branches/docs-2.5.1/docs/usermanual/glossary.html
    jmeter/branches/docs-2.5.1/docs/usermanual/hints_and_tips.html
    jmeter/branches/docs-2.5.1/docs/usermanual/index.html
    jmeter/branches/docs-2.5.1/docs/usermanual/intro.html
    jmeter/branches/docs-2.5.1/docs/usermanual/ldapanswer_xml.html
    jmeter/branches/docs-2.5.1/docs/usermanual/ldapops_tutor.html
    jmeter/branches/docs-2.5.1/docs/usermanual/listeners.html
    jmeter/branches/docs-2.5.1/docs/usermanual/regular_expressions.html
    jmeter/branches/docs-2.5.1/docs/usermanual/remote-test.html
    jmeter/branches/docs-2.5.1/docs/usermanual/test_plan.html

Modified: jmeter/branches/docs-2.5.1/docs/building.html
URL: http://svn.apache.org/viewvc/jmeter/branches/docs-2.5.1/docs/building.html?rev=1196914&r1=1196913&r2=1196914&view=diff
==============================================================================
--- jmeter/branches/docs-2.5.1/docs/building.html (original)
+++ jmeter/branches/docs-2.5.1/docs/building.html Thu Nov  3 01:36:26 2011
@@ -30,7 +30,7 @@
 
 
 
-<title>JMeter - Building JMeter and Add-Ons</title>
+<title>Apache JMeter - Building JMeter and Add-Ons</title>
 </head>
 
 <body bgcolor="#ffffff" text="#000000" link="#525D76">
@@ -43,10 +43,10 @@
 style="border-width:0; float: left" frameborder="0" scrolling="no"></iframe>
 </td>
 <td align="left">
-<a href="http://jakarta.apache.org"><img width="505" height="48" src="./images/jakarta-logo.gif" alt="Jakarta" title="Jakarta" border="0"/></a>
+<a href="http://www.apache.org"><img title="Apache Software Foundation" width="387" height="100" src="./images/asf-logo.gif" border="0"/></a>
 </td>
 <td align="right">
-<a href="http://jakarta.apache.org/jmeter/"><img width="221" height="102" src="./images/logo.jpg" alt="JMeter" title="JMeter" border="0"/></a>
+<a href="http://jakarta.apache.org/jmeter/"><img width="221" height="102" src="./images/logo.jpg" alt="Apache JMeter" title="Apache JMeter" border="0"/></a>
 </td>
 </tr>
 </table>
@@ -67,12 +67,12 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="http://www.apache.org/licenses/">License</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterCommitters">Contributors</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterCommitters">Contributors</a>
 </li>
 </ul>
 <p><strong>Download</strong></p>
 <ul>
-<li><a href="http://jakarta.apache.org/site/downloads/downloads_jmeter.cgi">Download Releases</a>
+<li><a href="./download_jmeter.cgi">Download Releases</a>
 </li>
 <li><a href="./nightly.html">Developer (Nightly) Builds</a>
 </li>
@@ -87,9 +87,9 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="./building.html">Building JMeter and Add-Ons</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter">JMeter Wiki</a>
+<li><a href="http://wiki.apache.org/jmeter">JMeter Wiki</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterFAQ">FAQ (Wiki)</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterFAQ">FAQ (Wiki)</a>
 </li>
 </ul>
 <p><strong>Tutorials (PDF format)</strong></p>
@@ -107,11 +107,11 @@ style="border-width:0; float: left" fram
 </ul>
 <p><strong>Community</strong></p>
 <ul>
-<li><a href="http://jakarta.apache.org/site/getinvolved.html">Get Involved</a>
+<li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved</a>
 </li>
-<li><a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
+<li><a href="./mail.html">Mailing Lists</a>
 </li>
-<li><a href="http://jakarta.apache.org/site/cvsindex.html">SVN Repositories</a>
+<li><a href="./svnindex.html">SVN Repositories</a>
 </li>
 </ul>
 <p><strong>Foundation</strong></p>

Modified: jmeter/branches/docs-2.5.1/docs/changes.html
URL: http://svn.apache.org/viewvc/jmeter/branches/docs-2.5.1/docs/changes.html?rev=1196914&r1=1196913&r2=1196914&view=diff
==============================================================================
--- jmeter/branches/docs-2.5.1/docs/changes.html (original)
+++ jmeter/branches/docs-2.5.1/docs/changes.html Thu Nov  3 01:36:26 2011
@@ -32,7 +32,7 @@
 <meta name="author" value="JMeter developers">
 <meta name="email" value="dev AT jakarta.apache.org">
 
-<title>JMeter - Changes</title>
+<title>Apache JMeter - Changes</title>
 </head>
 
 <body bgcolor="#ffffff" text="#000000" link="#525D76">
@@ -45,10 +45,10 @@
 style="border-width:0; float: left" frameborder="0" scrolling="no"></iframe>
 </td>
 <td align="left">
-<a href="http://jakarta.apache.org"><img width="505" height="48" src="./images/jakarta-logo.gif" alt="Jakarta" title="Jakarta" border="0"/></a>
+<a href="http://www.apache.org"><img title="Apache Software Foundation" width="387" height="100" src="./images/asf-logo.gif" border="0"/></a>
 </td>
 <td align="right">
-<a href="http://jakarta.apache.org/jmeter/"><img width="221" height="102" src="./images/logo.jpg" alt="JMeter" title="JMeter" border="0"/></a>
+<a href="http://jakarta.apache.org/jmeter/"><img width="221" height="102" src="./images/logo.jpg" alt="Apache JMeter" title="Apache JMeter" border="0"/></a>
 </td>
 </tr>
 </table>
@@ -69,12 +69,12 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="http://www.apache.org/licenses/">License</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterCommitters">Contributors</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterCommitters">Contributors</a>
 </li>
 </ul>
 <p><strong>Download</strong></p>
 <ul>
-<li><a href="http://jakarta.apache.org/site/downloads/downloads_jmeter.cgi">Download Releases</a>
+<li><a href="./download_jmeter.cgi">Download Releases</a>
 </li>
 <li><a href="./nightly.html">Developer (Nightly) Builds</a>
 </li>
@@ -89,9 +89,9 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="./building.html">Building JMeter and Add-Ons</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter">JMeter Wiki</a>
+<li><a href="http://wiki.apache.org/jmeter">JMeter Wiki</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterFAQ">FAQ (Wiki)</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterFAQ">FAQ (Wiki)</a>
 </li>
 </ul>
 <p><strong>Tutorials (PDF format)</strong></p>
@@ -109,11 +109,11 @@ style="border-width:0; float: left" fram
 </ul>
 <p><strong>Community</strong></p>
 <ul>
-<li><a href="http://jakarta.apache.org/site/getinvolved.html">Get Involved</a>
+<li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved</a>
 </li>
-<li><a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
+<li><a href="./mail.html">Mailing Lists</a>
 </li>
-<li><a href="http://jakarta.apache.org/site/cvsindex.html">SVN Repositories</a>
+<li><a href="./svnindex.html">SVN Repositories</a>
 </li>
 </ul>
 <p><strong>Foundation</strong></p>

Modified: jmeter/branches/docs-2.5.1/docs/changes_history.html
URL: http://svn.apache.org/viewvc/jmeter/branches/docs-2.5.1/docs/changes_history.html?rev=1196914&r1=1196913&r2=1196914&view=diff
==============================================================================
--- jmeter/branches/docs-2.5.1/docs/changes_history.html (original)
+++ jmeter/branches/docs-2.5.1/docs/changes_history.html Thu Nov  3 01:36:26 2011
@@ -32,7 +32,7 @@
 <meta name="author" value="JMeter developers">
 <meta name="email" value="jmeter-dev AT jakarta.apache.org">
 
-<title>JMeter - History of Previous Changes</title>
+<title>Apache JMeter - History of Previous Changes</title>
 </head>
 
 <body bgcolor="#ffffff" text="#000000" link="#525D76">
@@ -45,10 +45,10 @@
 style="border-width:0; float: left" frameborder="0" scrolling="no"></iframe>
 </td>
 <td align="left">
-<a href="http://jakarta.apache.org"><img width="505" height="48" src="./images/jakarta-logo.gif" alt="Jakarta" title="Jakarta" border="0"/></a>
+<a href="http://www.apache.org"><img title="Apache Software Foundation" width="387" height="100" src="./images/asf-logo.gif" border="0"/></a>
 </td>
 <td align="right">
-<a href="http://jakarta.apache.org/jmeter/"><img width="221" height="102" src="./images/logo.jpg" alt="JMeter" title="JMeter" border="0"/></a>
+<a href="http://jakarta.apache.org/jmeter/"><img width="221" height="102" src="./images/logo.jpg" alt="Apache JMeter" title="Apache JMeter" border="0"/></a>
 </td>
 </tr>
 </table>
@@ -69,12 +69,12 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="http://www.apache.org/licenses/">License</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterCommitters">Contributors</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterCommitters">Contributors</a>
 </li>
 </ul>
 <p><strong>Download</strong></p>
 <ul>
-<li><a href="http://jakarta.apache.org/site/downloads/downloads_jmeter.cgi">Download Releases</a>
+<li><a href="./download_jmeter.cgi">Download Releases</a>
 </li>
 <li><a href="./nightly.html">Developer (Nightly) Builds</a>
 </li>
@@ -89,9 +89,9 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="./building.html">Building JMeter and Add-Ons</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter">JMeter Wiki</a>
+<li><a href="http://wiki.apache.org/jmeter">JMeter Wiki</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterFAQ">FAQ (Wiki)</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterFAQ">FAQ (Wiki)</a>
 </li>
 </ul>
 <p><strong>Tutorials (PDF format)</strong></p>
@@ -109,11 +109,11 @@ style="border-width:0; float: left" fram
 </ul>
 <p><strong>Community</strong></p>
 <ul>
-<li><a href="http://jakarta.apache.org/site/getinvolved.html">Get Involved</a>
+<li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved</a>
 </li>
-<li><a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
+<li><a href="./mail.html">Mailing Lists</a>
 </li>
-<li><a href="http://jakarta.apache.org/site/cvsindex.html">SVN Repositories</a>
+<li><a href="./svnindex.html">SVN Repositories</a>
 </li>
 </ul>
 <p><strong>Foundation</strong></p>

Modified: jmeter/branches/docs-2.5.1/docs/index.html
URL: http://svn.apache.org/viewvc/jmeter/branches/docs-2.5.1/docs/index.html?rev=1196914&r1=1196913&r2=1196914&view=diff
==============================================================================
--- jmeter/branches/docs-2.5.1/docs/index.html (original)
+++ jmeter/branches/docs-2.5.1/docs/index.html Thu Nov  3 01:36:26 2011
@@ -30,7 +30,7 @@
 
 
 
-<title>JMeter - Apache JMeter</title>
+<title>Apache JMeter - Apache JMeter</title>
 </head>
 
 <body bgcolor="#ffffff" text="#000000" link="#525D76">
@@ -43,10 +43,10 @@
 style="border-width:0; float: left" frameborder="0" scrolling="no"></iframe>
 </td>
 <td align="left">
-<a href="http://jakarta.apache.org"><img width="505" height="48" src="./images/jakarta-logo.gif" alt="Jakarta" title="Jakarta" border="0"/></a>
+<a href="http://www.apache.org"><img title="Apache Software Foundation" width="387" height="100" src="./images/asf-logo.gif" border="0"/></a>
 </td>
 <td align="right">
-<a href="http://jakarta.apache.org/jmeter/"><img width="221" height="102" src="./images/logo.jpg" alt="JMeter" title="JMeter" border="0"/></a>
+<a href="http://jakarta.apache.org/jmeter/"><img width="221" height="102" src="./images/logo.jpg" alt="Apache JMeter" title="Apache JMeter" border="0"/></a>
 </td>
 </tr>
 </table>
@@ -67,12 +67,12 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="http://www.apache.org/licenses/">License</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterCommitters">Contributors</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterCommitters">Contributors</a>
 </li>
 </ul>
 <p><strong>Download</strong></p>
 <ul>
-<li><a href="http://jakarta.apache.org/site/downloads/downloads_jmeter.cgi">Download Releases</a>
+<li><a href="./download_jmeter.cgi">Download Releases</a>
 </li>
 <li><a href="./nightly.html">Developer (Nightly) Builds</a>
 </li>
@@ -87,9 +87,9 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="./building.html">Building JMeter and Add-Ons</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter">JMeter Wiki</a>
+<li><a href="http://wiki.apache.org/jmeter">JMeter Wiki</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterFAQ">FAQ (Wiki)</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterFAQ">FAQ (Wiki)</a>
 </li>
 </ul>
 <p><strong>Tutorials (PDF format)</strong></p>
@@ -107,11 +107,11 @@ style="border-width:0; float: left" fram
 </ul>
 <p><strong>Community</strong></p>
 <ul>
-<li><a href="http://jakarta.apache.org/site/getinvolved.html">Get Involved</a>
+<li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved</a>
 </li>
-<li><a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
+<li><a href="./mail.html">Mailing Lists</a>
 </li>
-<li><a href="http://jakarta.apache.org/site/cvsindex.html">SVN Repositories</a>
+<li><a href="./svnindex.html">SVN Repositories</a>
 </li>
 </ul>
 <p><strong>Foundation</strong></p>

Modified: jmeter/branches/docs-2.5.1/docs/issues.html
URL: http://svn.apache.org/viewvc/jmeter/branches/docs-2.5.1/docs/issues.html?rev=1196914&r1=1196913&r2=1196914&view=diff
==============================================================================
--- jmeter/branches/docs-2.5.1/docs/issues.html (original)
+++ jmeter/branches/docs-2.5.1/docs/issues.html Thu Nov  3 01:36:26 2011
@@ -30,7 +30,7 @@
 
 
 
-<title>JMeter - Issues</title>
+<title>Apache JMeter - Issues</title>
 </head>
 
 <body bgcolor="#ffffff" text="#000000" link="#525D76">
@@ -43,10 +43,10 @@
 style="border-width:0; float: left" frameborder="0" scrolling="no"></iframe>
 </td>
 <td align="left">
-<a href="http://jakarta.apache.org"><img width="505" height="48" src="./images/jakarta-logo.gif" alt="Jakarta" title="Jakarta" border="0"/></a>
+<a href="http://www.apache.org"><img title="Apache Software Foundation" width="387" height="100" src="./images/asf-logo.gif" border="0"/></a>
 </td>
 <td align="right">
-<a href="http://jakarta.apache.org/jmeter/"><img width="221" height="102" src="./images/logo.jpg" alt="JMeter" title="JMeter" border="0"/></a>
+<a href="http://jakarta.apache.org/jmeter/"><img width="221" height="102" src="./images/logo.jpg" alt="Apache JMeter" title="Apache JMeter" border="0"/></a>
 </td>
 </tr>
 </table>
@@ -67,12 +67,12 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="http://www.apache.org/licenses/">License</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterCommitters">Contributors</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterCommitters">Contributors</a>
 </li>
 </ul>
 <p><strong>Download</strong></p>
 <ul>
-<li><a href="http://jakarta.apache.org/site/downloads/downloads_jmeter.cgi">Download Releases</a>
+<li><a href="./download_jmeter.cgi">Download Releases</a>
 </li>
 <li><a href="./nightly.html">Developer (Nightly) Builds</a>
 </li>
@@ -87,9 +87,9 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="./building.html">Building JMeter and Add-Ons</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter">JMeter Wiki</a>
+<li><a href="http://wiki.apache.org/jmeter">JMeter Wiki</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterFAQ">FAQ (Wiki)</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterFAQ">FAQ (Wiki)</a>
 </li>
 </ul>
 <p><strong>Tutorials (PDF format)</strong></p>
@@ -107,11 +107,11 @@ style="border-width:0; float: left" fram
 </ul>
 <p><strong>Community</strong></p>
 <ul>
-<li><a href="http://jakarta.apache.org/site/getinvolved.html">Get Involved</a>
+<li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved</a>
 </li>
-<li><a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
+<li><a href="./mail.html">Mailing Lists</a>
 </li>
-<li><a href="http://jakarta.apache.org/site/cvsindex.html">SVN Repositories</a>
+<li><a href="./svnindex.html">SVN Repositories</a>
 </li>
 </ul>
 <p><strong>Foundation</strong></p>

Modified: jmeter/branches/docs-2.5.1/docs/jmeter_irc.html
URL: http://svn.apache.org/viewvc/jmeter/branches/docs-2.5.1/docs/jmeter_irc.html?rev=1196914&r1=1196913&r2=1196914&view=diff
==============================================================================
--- jmeter/branches/docs-2.5.1/docs/jmeter_irc.html (original)
+++ jmeter/branches/docs-2.5.1/docs/jmeter_irc.html Thu Nov  3 01:36:26 2011
@@ -30,7 +30,7 @@
 
 
 
-<title>JMeter - JMeter on IRC</title>
+<title>Apache JMeter - JMeter on IRC</title>
 </head>
 
 <body bgcolor="#ffffff" text="#000000" link="#525D76">
@@ -43,10 +43,10 @@
 style="border-width:0; float: left" frameborder="0" scrolling="no"></iframe>
 </td>
 <td align="left">
-<a href="http://jakarta.apache.org"><img width="505" height="48" src="./images/jakarta-logo.gif" alt="Jakarta" title="Jakarta" border="0"/></a>
+<a href="http://www.apache.org"><img title="Apache Software Foundation" width="387" height="100" src="./images/asf-logo.gif" border="0"/></a>
 </td>
 <td align="right">
-<a href="http://jakarta.apache.org/jmeter/"><img width="221" height="102" src="./images/logo.jpg" alt="JMeter" title="JMeter" border="0"/></a>
+<a href="http://jakarta.apache.org/jmeter/"><img width="221" height="102" src="./images/logo.jpg" alt="Apache JMeter" title="Apache JMeter" border="0"/></a>
 </td>
 </tr>
 </table>
@@ -67,12 +67,12 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="http://www.apache.org/licenses/">License</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterCommitters">Contributors</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterCommitters">Contributors</a>
 </li>
 </ul>
 <p><strong>Download</strong></p>
 <ul>
-<li><a href="http://jakarta.apache.org/site/downloads/downloads_jmeter.cgi">Download Releases</a>
+<li><a href="./download_jmeter.cgi">Download Releases</a>
 </li>
 <li><a href="./nightly.html">Developer (Nightly) Builds</a>
 </li>
@@ -87,9 +87,9 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="./building.html">Building JMeter and Add-Ons</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter">JMeter Wiki</a>
+<li><a href="http://wiki.apache.org/jmeter">JMeter Wiki</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterFAQ">FAQ (Wiki)</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterFAQ">FAQ (Wiki)</a>
 </li>
 </ul>
 <p><strong>Tutorials (PDF format)</strong></p>
@@ -107,11 +107,11 @@ style="border-width:0; float: left" fram
 </ul>
 <p><strong>Community</strong></p>
 <ul>
-<li><a href="http://jakarta.apache.org/site/getinvolved.html">Get Involved</a>
+<li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved</a>
 </li>
-<li><a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
+<li><a href="./mail.html">Mailing Lists</a>
 </li>
-<li><a href="http://jakarta.apache.org/site/cvsindex.html">SVN Repositories</a>
+<li><a href="./svnindex.html">SVN Repositories</a>
 </li>
 </ul>
 <p><strong>Foundation</strong></p>

Modified: jmeter/branches/docs-2.5.1/docs/localising/index.html
URL: http://svn.apache.org/viewvc/jmeter/branches/docs-2.5.1/docs/localising/index.html?rev=1196914&r1=1196913&r2=1196914&view=diff
==============================================================================
--- jmeter/branches/docs-2.5.1/docs/localising/index.html (original)
+++ jmeter/branches/docs-2.5.1/docs/localising/index.html Thu Nov  3 01:36:26 2011
@@ -32,7 +32,7 @@
 <meta name="author" value="Jordi Salvat i Alabart">
 <meta name="email" value="jsalvata@atg.com">
 
-<title>JMeter - JMeter Localisation (Translator's Guide)</title>
+<title>Apache JMeter - JMeter Localisation (Translator's Guide)</title>
 </head>
 
 <body bgcolor="#ffffff" text="#000000" link="#525D76">
@@ -45,10 +45,10 @@
 style="border-width:0; float: left" frameborder="0" scrolling="no"></iframe>
 </td>
 <td align="left">
-<a href="http://jakarta.apache.org"><img width="505" height="48" src="../images/jakarta-logo.gif" alt="Jakarta" title="Jakarta" border="0"/></a>
+<a href="http://www.apache.org"><img title="Apache Software Foundation" width="387" height="100" src="../images/asf-logo.gif" border="0"/></a>
 </td>
 <td align="right">
-<a href="http://jakarta.apache.org/jmeter/"><img width="221" height="102" src="../images/logo.jpg" alt="JMeter" title="JMeter" border="0"/></a>
+<a href="http://jakarta.apache.org/jmeter/"><img width="221" height="102" src="../images/logo.jpg" alt="Apache JMeter" title="Apache JMeter" border="0"/></a>
 </td>
 </tr>
 </table>
@@ -69,12 +69,12 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="http://www.apache.org/licenses/">License</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterCommitters">Contributors</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterCommitters">Contributors</a>
 </li>
 </ul>
 <p><strong>Download</strong></p>
 <ul>
-<li><a href="http://jakarta.apache.org/site/downloads/downloads_jmeter.cgi">Download Releases</a>
+<li><a href="../download_jmeter.cgi">Download Releases</a>
 </li>
 <li><a href="../nightly.html">Developer (Nightly) Builds</a>
 </li>
@@ -89,9 +89,9 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="../building.html">Building JMeter and Add-Ons</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter">JMeter Wiki</a>
+<li><a href="http://wiki.apache.org/jmeter">JMeter Wiki</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterFAQ">FAQ (Wiki)</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterFAQ">FAQ (Wiki)</a>
 </li>
 </ul>
 <p><strong>Tutorials (PDF format)</strong></p>
@@ -109,11 +109,11 @@ style="border-width:0; float: left" fram
 </ul>
 <p><strong>Community</strong></p>
 <ul>
-<li><a href="http://jakarta.apache.org/site/getinvolved.html">Get Involved</a>
+<li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved</a>
 </li>
-<li><a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
+<li><a href="../mail.html">Mailing Lists</a>
 </li>
-<li><a href="http://jakarta.apache.org/site/cvsindex.html">SVN Repositories</a>
+<li><a href="../svnindex.html">SVN Repositories</a>
 </li>
 </ul>
 <p><strong>Foundation</strong></p>

Modified: jmeter/branches/docs-2.5.1/docs/nightly.html
URL: http://svn.apache.org/viewvc/jmeter/branches/docs-2.5.1/docs/nightly.html?rev=1196914&r1=1196913&r2=1196914&view=diff
==============================================================================
--- jmeter/branches/docs-2.5.1/docs/nightly.html (original)
+++ jmeter/branches/docs-2.5.1/docs/nightly.html Thu Nov  3 01:36:26 2011
@@ -30,7 +30,7 @@
 
 
 
-<title>JMeter - Nightly builds for developers</title>
+<title>Apache JMeter - Nightly builds for developers</title>
 </head>
 
 <body bgcolor="#ffffff" text="#000000" link="#525D76">
@@ -43,10 +43,10 @@
 style="border-width:0; float: left" frameborder="0" scrolling="no"></iframe>
 </td>
 <td align="left">
-<a href="http://jakarta.apache.org"><img width="505" height="48" src="./images/jakarta-logo.gif" alt="Jakarta" title="Jakarta" border="0"/></a>
+<a href="http://www.apache.org"><img title="Apache Software Foundation" width="387" height="100" src="./images/asf-logo.gif" border="0"/></a>
 </td>
 <td align="right">
-<a href="http://jakarta.apache.org/jmeter/"><img width="221" height="102" src="./images/logo.jpg" alt="JMeter" title="JMeter" border="0"/></a>
+<a href="http://jakarta.apache.org/jmeter/"><img width="221" height="102" src="./images/logo.jpg" alt="Apache JMeter" title="Apache JMeter" border="0"/></a>
 </td>
 </tr>
 </table>
@@ -67,12 +67,12 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="http://www.apache.org/licenses/">License</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterCommitters">Contributors</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterCommitters">Contributors</a>
 </li>
 </ul>
 <p><strong>Download</strong></p>
 <ul>
-<li><a href="http://jakarta.apache.org/site/downloads/downloads_jmeter.cgi">Download Releases</a>
+<li><a href="./download_jmeter.cgi">Download Releases</a>
 </li>
 <li><a href="./nightly.html">Developer (Nightly) Builds</a>
 </li>
@@ -87,9 +87,9 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="./building.html">Building JMeter and Add-Ons</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter">JMeter Wiki</a>
+<li><a href="http://wiki.apache.org/jmeter">JMeter Wiki</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterFAQ">FAQ (Wiki)</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterFAQ">FAQ (Wiki)</a>
 </li>
 </ul>
 <p><strong>Tutorials (PDF format)</strong></p>
@@ -107,11 +107,11 @@ style="border-width:0; float: left" fram
 </ul>
 <p><strong>Community</strong></p>
 <ul>
-<li><a href="http://jakarta.apache.org/site/getinvolved.html">Get Involved</a>
+<li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved</a>
 </li>
-<li><a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
+<li><a href="./mail.html">Mailing Lists</a>
 </li>
-<li><a href="http://jakarta.apache.org/site/cvsindex.html">SVN Repositories</a>
+<li><a href="./svnindex.html">SVN Repositories</a>
 </li>
 </ul>
 <p><strong>Foundation</strong></p>

Modified: jmeter/branches/docs-2.5.1/docs/usermanual/best-practices.html
URL: http://svn.apache.org/viewvc/jmeter/branches/docs-2.5.1/docs/usermanual/best-practices.html?rev=1196914&r1=1196913&r2=1196914&view=diff
==============================================================================
--- jmeter/branches/docs-2.5.1/docs/usermanual/best-practices.html (original)
+++ jmeter/branches/docs-2.5.1/docs/usermanual/best-practices.html Thu Nov  3 01:36:26 2011
@@ -30,7 +30,7 @@
 
 
 
-<title>JMeter - User's Manual: Best Practices</title>
+<title>Apache JMeter - User's Manual: Best Practices</title>
 </head>
 
 <body bgcolor="#ffffff" text="#000000" link="#525D76">
@@ -43,10 +43,10 @@
 style="border-width:0; float: left" frameborder="0" scrolling="no"></iframe>
 </td>
 <td align="left">
-<a href="http://jakarta.apache.org"><img width="505" height="48" src="../images/jakarta-logo.gif" alt="Jakarta" title="Jakarta" border="0"/></a>
+<a href="http://www.apache.org"><img title="Apache Software Foundation" width="387" height="100" src="../images/asf-logo.gif" border="0"/></a>
 </td>
 <td align="right">
-<a href="http://jakarta.apache.org/jmeter/"><img width="221" height="102" src="../images/logo.jpg" alt="JMeter" title="JMeter" border="0"/></a>
+<a href="http://jakarta.apache.org/jmeter/"><img width="221" height="102" src="../images/logo.jpg" alt="Apache JMeter" title="Apache JMeter" border="0"/></a>
 </td>
 </tr>
 </table>
@@ -67,12 +67,12 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="http://www.apache.org/licenses/">License</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterCommitters">Contributors</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterCommitters">Contributors</a>
 </li>
 </ul>
 <p><strong>Download</strong></p>
 <ul>
-<li><a href="http://jakarta.apache.org/site/downloads/downloads_jmeter.cgi">Download Releases</a>
+<li><a href="../download_jmeter.cgi">Download Releases</a>
 </li>
 <li><a href="../nightly.html">Developer (Nightly) Builds</a>
 </li>
@@ -87,9 +87,9 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="../building.html">Building JMeter and Add-Ons</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter">JMeter Wiki</a>
+<li><a href="http://wiki.apache.org/jmeter">JMeter Wiki</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterFAQ">FAQ (Wiki)</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterFAQ">FAQ (Wiki)</a>
 </li>
 </ul>
 <p><strong>Tutorials (PDF format)</strong></p>
@@ -107,11 +107,11 @@ style="border-width:0; float: left" fram
 </ul>
 <p><strong>Community</strong></p>
 <ul>
-<li><a href="http://jakarta.apache.org/site/getinvolved.html">Get Involved</a>
+<li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved</a>
 </li>
-<li><a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
+<li><a href="../mail.html">Mailing Lists</a>
 </li>
-<li><a href="http://jakarta.apache.org/site/cvsindex.html">SVN Repositories</a>
+<li><a href="../svnindex.html">SVN Repositories</a>
 </li>
 </ul>
 <p><strong>Foundation</strong></p>

Modified: jmeter/branches/docs-2.5.1/docs/usermanual/boss.html
URL: http://svn.apache.org/viewvc/jmeter/branches/docs-2.5.1/docs/usermanual/boss.html?rev=1196914&r1=1196913&r2=1196914&view=diff
==============================================================================
--- jmeter/branches/docs-2.5.1/docs/usermanual/boss.html (original)
+++ jmeter/branches/docs-2.5.1/docs/usermanual/boss.html Thu Nov  3 01:36:26 2011
@@ -32,7 +32,7 @@
 <meta name="author" value="Martin Ramshaw">
 <meta name="email" value="mramshaw@alumni.concordia.ca">
 
-<title>JMeter - User's Manual: My boss wants me to...</title>
+<title>Apache JMeter - User's Manual: My boss wants me to...</title>
 </head>
 
 <body bgcolor="#ffffff" text="#000000" link="#525D76">
@@ -45,10 +45,10 @@
 style="border-width:0; float: left" frameborder="0" scrolling="no"></iframe>
 </td>
 <td align="left">
-<a href="http://jakarta.apache.org"><img width="505" height="48" src="../images/jakarta-logo.gif" alt="Jakarta" title="Jakarta" border="0"/></a>
+<a href="http://www.apache.org"><img title="Apache Software Foundation" width="387" height="100" src="../images/asf-logo.gif" border="0"/></a>
 </td>
 <td align="right">
-<a href="http://jakarta.apache.org/jmeter/"><img width="221" height="102" src="../images/logo.jpg" alt="JMeter" title="JMeter" border="0"/></a>
+<a href="http://jakarta.apache.org/jmeter/"><img width="221" height="102" src="../images/logo.jpg" alt="Apache JMeter" title="Apache JMeter" border="0"/></a>
 </td>
 </tr>
 </table>
@@ -69,12 +69,12 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="http://www.apache.org/licenses/">License</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterCommitters">Contributors</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterCommitters">Contributors</a>
 </li>
 </ul>
 <p><strong>Download</strong></p>
 <ul>
-<li><a href="http://jakarta.apache.org/site/downloads/downloads_jmeter.cgi">Download Releases</a>
+<li><a href="../download_jmeter.cgi">Download Releases</a>
 </li>
 <li><a href="../nightly.html">Developer (Nightly) Builds</a>
 </li>
@@ -89,9 +89,9 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="../building.html">Building JMeter and Add-Ons</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter">JMeter Wiki</a>
+<li><a href="http://wiki.apache.org/jmeter">JMeter Wiki</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterFAQ">FAQ (Wiki)</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterFAQ">FAQ (Wiki)</a>
 </li>
 </ul>
 <p><strong>Tutorials (PDF format)</strong></p>
@@ -109,11 +109,11 @@ style="border-width:0; float: left" fram
 </ul>
 <p><strong>Community</strong></p>
 <ul>
-<li><a href="http://jakarta.apache.org/site/getinvolved.html">Get Involved</a>
+<li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved</a>
 </li>
-<li><a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
+<li><a href="../mail.html">Mailing Lists</a>
 </li>
-<li><a href="http://jakarta.apache.org/site/cvsindex.html">SVN Repositories</a>
+<li><a href="../svnindex.html">SVN Repositories</a>
 </li>
 </ul>
 <p><strong>Foundation</strong></p>

Modified: jmeter/branches/docs-2.5.1/docs/usermanual/build-adv-web-test-plan.html
URL: http://svn.apache.org/viewvc/jmeter/branches/docs-2.5.1/docs/usermanual/build-adv-web-test-plan.html?rev=1196914&r1=1196913&r2=1196914&view=diff
==============================================================================
--- jmeter/branches/docs-2.5.1/docs/usermanual/build-adv-web-test-plan.html (original)
+++ jmeter/branches/docs-2.5.1/docs/usermanual/build-adv-web-test-plan.html Thu Nov  3 01:36:26 2011
@@ -30,7 +30,7 @@
 
 
 
-<title>JMeter - User's Manual: Building an Advanced Web Test Plan</title>
+<title>Apache JMeter - User's Manual: Building an Advanced Web Test Plan</title>
 </head>
 
 <body bgcolor="#ffffff" text="#000000" link="#525D76">
@@ -43,10 +43,10 @@
 style="border-width:0; float: left" frameborder="0" scrolling="no"></iframe>
 </td>
 <td align="left">
-<a href="http://jakarta.apache.org"><img width="505" height="48" src="../images/jakarta-logo.gif" alt="Jakarta" title="Jakarta" border="0"/></a>
+<a href="http://www.apache.org"><img title="Apache Software Foundation" width="387" height="100" src="../images/asf-logo.gif" border="0"/></a>
 </td>
 <td align="right">
-<a href="http://jakarta.apache.org/jmeter/"><img width="221" height="102" src="../images/logo.jpg" alt="JMeter" title="JMeter" border="0"/></a>
+<a href="http://jakarta.apache.org/jmeter/"><img width="221" height="102" src="../images/logo.jpg" alt="Apache JMeter" title="Apache JMeter" border="0"/></a>
 </td>
 </tr>
 </table>
@@ -67,12 +67,12 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="http://www.apache.org/licenses/">License</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterCommitters">Contributors</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterCommitters">Contributors</a>
 </li>
 </ul>
 <p><strong>Download</strong></p>
 <ul>
-<li><a href="http://jakarta.apache.org/site/downloads/downloads_jmeter.cgi">Download Releases</a>
+<li><a href="../download_jmeter.cgi">Download Releases</a>
 </li>
 <li><a href="../nightly.html">Developer (Nightly) Builds</a>
 </li>
@@ -87,9 +87,9 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="../building.html">Building JMeter and Add-Ons</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter">JMeter Wiki</a>
+<li><a href="http://wiki.apache.org/jmeter">JMeter Wiki</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterFAQ">FAQ (Wiki)</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterFAQ">FAQ (Wiki)</a>
 </li>
 </ul>
 <p><strong>Tutorials (PDF format)</strong></p>
@@ -107,11 +107,11 @@ style="border-width:0; float: left" fram
 </ul>
 <p><strong>Community</strong></p>
 <ul>
-<li><a href="http://jakarta.apache.org/site/getinvolved.html">Get Involved</a>
+<li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved</a>
 </li>
-<li><a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
+<li><a href="../mail.html">Mailing Lists</a>
 </li>
-<li><a href="http://jakarta.apache.org/site/cvsindex.html">SVN Repositories</a>
+<li><a href="../svnindex.html">SVN Repositories</a>
 </li>
 </ul>
 <p><strong>Foundation</strong></p>

Modified: jmeter/branches/docs-2.5.1/docs/usermanual/build-db-test-plan.html
URL: http://svn.apache.org/viewvc/jmeter/branches/docs-2.5.1/docs/usermanual/build-db-test-plan.html?rev=1196914&r1=1196913&r2=1196914&view=diff
==============================================================================
--- jmeter/branches/docs-2.5.1/docs/usermanual/build-db-test-plan.html (original)
+++ jmeter/branches/docs-2.5.1/docs/usermanual/build-db-test-plan.html Thu Nov  3 01:36:26 2011
@@ -32,7 +32,7 @@
 <meta name="author" value="Martin Ramshaw">
 <meta name="email" value="mramshaw@alumni.concordia.ca">
 
-<title>JMeter - User's Manual: Building a Database Test Plan</title>
+<title>Apache JMeter - User's Manual: Building a Database Test Plan</title>
 </head>
 
 <body bgcolor="#ffffff" text="#000000" link="#525D76">
@@ -45,10 +45,10 @@
 style="border-width:0; float: left" frameborder="0" scrolling="no"></iframe>
 </td>
 <td align="left">
-<a href="http://jakarta.apache.org"><img width="505" height="48" src="../images/jakarta-logo.gif" alt="Jakarta" title="Jakarta" border="0"/></a>
+<a href="http://www.apache.org"><img title="Apache Software Foundation" width="387" height="100" src="../images/asf-logo.gif" border="0"/></a>
 </td>
 <td align="right">
-<a href="http://jakarta.apache.org/jmeter/"><img width="221" height="102" src="../images/logo.jpg" alt="JMeter" title="JMeter" border="0"/></a>
+<a href="http://jakarta.apache.org/jmeter/"><img width="221" height="102" src="../images/logo.jpg" alt="Apache JMeter" title="Apache JMeter" border="0"/></a>
 </td>
 </tr>
 </table>
@@ -69,12 +69,12 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="http://www.apache.org/licenses/">License</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterCommitters">Contributors</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterCommitters">Contributors</a>
 </li>
 </ul>
 <p><strong>Download</strong></p>
 <ul>
-<li><a href="http://jakarta.apache.org/site/downloads/downloads_jmeter.cgi">Download Releases</a>
+<li><a href="../download_jmeter.cgi">Download Releases</a>
 </li>
 <li><a href="../nightly.html">Developer (Nightly) Builds</a>
 </li>
@@ -89,9 +89,9 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="../building.html">Building JMeter and Add-Ons</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter">JMeter Wiki</a>
+<li><a href="http://wiki.apache.org/jmeter">JMeter Wiki</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterFAQ">FAQ (Wiki)</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterFAQ">FAQ (Wiki)</a>
 </li>
 </ul>
 <p><strong>Tutorials (PDF format)</strong></p>
@@ -109,11 +109,11 @@ style="border-width:0; float: left" fram
 </ul>
 <p><strong>Community</strong></p>
 <ul>
-<li><a href="http://jakarta.apache.org/site/getinvolved.html">Get Involved</a>
+<li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved</a>
 </li>
-<li><a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
+<li><a href="../mail.html">Mailing Lists</a>
 </li>
-<li><a href="http://jakarta.apache.org/site/cvsindex.html">SVN Repositories</a>
+<li><a href="../svnindex.html">SVN Repositories</a>
 </li>
 </ul>
 <p><strong>Foundation</strong></p>

Modified: jmeter/branches/docs-2.5.1/docs/usermanual/build-ftp-test-plan.html
URL: http://svn.apache.org/viewvc/jmeter/branches/docs-2.5.1/docs/usermanual/build-ftp-test-plan.html?rev=1196914&r1=1196913&r2=1196914&view=diff
==============================================================================
--- jmeter/branches/docs-2.5.1/docs/usermanual/build-ftp-test-plan.html (original)
+++ jmeter/branches/docs-2.5.1/docs/usermanual/build-ftp-test-plan.html Thu Nov  3 01:36:26 2011
@@ -32,7 +32,7 @@
 <meta name="author" value="Martin Ramshaw">
 <meta name="email" value="mramshaw@alumni.concordia.ca">
 
-<title>JMeter - User's Manual: Building an FTP Test Plan</title>
+<title>Apache JMeter - User's Manual: Building an FTP Test Plan</title>
 </head>
 
 <body bgcolor="#ffffff" text="#000000" link="#525D76">
@@ -45,10 +45,10 @@
 style="border-width:0; float: left" frameborder="0" scrolling="no"></iframe>
 </td>
 <td align="left">
-<a href="http://jakarta.apache.org"><img width="505" height="48" src="../images/jakarta-logo.gif" alt="Jakarta" title="Jakarta" border="0"/></a>
+<a href="http://www.apache.org"><img title="Apache Software Foundation" width="387" height="100" src="../images/asf-logo.gif" border="0"/></a>
 </td>
 <td align="right">
-<a href="http://jakarta.apache.org/jmeter/"><img width="221" height="102" src="../images/logo.jpg" alt="JMeter" title="JMeter" border="0"/></a>
+<a href="http://jakarta.apache.org/jmeter/"><img width="221" height="102" src="../images/logo.jpg" alt="Apache JMeter" title="Apache JMeter" border="0"/></a>
 </td>
 </tr>
 </table>
@@ -69,12 +69,12 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="http://www.apache.org/licenses/">License</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterCommitters">Contributors</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterCommitters">Contributors</a>
 </li>
 </ul>
 <p><strong>Download</strong></p>
 <ul>
-<li><a href="http://jakarta.apache.org/site/downloads/downloads_jmeter.cgi">Download Releases</a>
+<li><a href="../download_jmeter.cgi">Download Releases</a>
 </li>
 <li><a href="../nightly.html">Developer (Nightly) Builds</a>
 </li>
@@ -89,9 +89,9 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="../building.html">Building JMeter and Add-Ons</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter">JMeter Wiki</a>
+<li><a href="http://wiki.apache.org/jmeter">JMeter Wiki</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterFAQ">FAQ (Wiki)</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterFAQ">FAQ (Wiki)</a>
 </li>
 </ul>
 <p><strong>Tutorials (PDF format)</strong></p>
@@ -109,11 +109,11 @@ style="border-width:0; float: left" fram
 </ul>
 <p><strong>Community</strong></p>
 <ul>
-<li><a href="http://jakarta.apache.org/site/getinvolved.html">Get Involved</a>
+<li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved</a>
 </li>
-<li><a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
+<li><a href="../mail.html">Mailing Lists</a>
 </li>
-<li><a href="http://jakarta.apache.org/site/cvsindex.html">SVN Repositories</a>
+<li><a href="../svnindex.html">SVN Repositories</a>
 </li>
 </ul>
 <p><strong>Foundation</strong></p>

Modified: jmeter/branches/docs-2.5.1/docs/usermanual/build-jms-point-to-point-test-plan.html
URL: http://svn.apache.org/viewvc/jmeter/branches/docs-2.5.1/docs/usermanual/build-jms-point-to-point-test-plan.html?rev=1196914&r1=1196913&r2=1196914&view=diff
==============================================================================
--- jmeter/branches/docs-2.5.1/docs/usermanual/build-jms-point-to-point-test-plan.html (original)
+++ jmeter/branches/docs-2.5.1/docs/usermanual/build-jms-point-to-point-test-plan.html Thu Nov  3 01:36:26 2011
@@ -30,7 +30,7 @@
 
 
 
-<title>JMeter - User's Manual: Building a JMS (Java Messaging Service) Point-to-Point Test Plan</title>
+<title>Apache JMeter - User's Manual: Building a JMS (Java Messaging Service) Point-to-Point Test Plan</title>
 </head>
 
 <body bgcolor="#ffffff" text="#000000" link="#525D76">
@@ -43,10 +43,10 @@
 style="border-width:0; float: left" frameborder="0" scrolling="no"></iframe>
 </td>
 <td align="left">
-<a href="http://jakarta.apache.org"><img width="505" height="48" src="../images/jakarta-logo.gif" alt="Jakarta" title="Jakarta" border="0"/></a>
+<a href="http://www.apache.org"><img title="Apache Software Foundation" width="387" height="100" src="../images/asf-logo.gif" border="0"/></a>
 </td>
 <td align="right">
-<a href="http://jakarta.apache.org/jmeter/"><img width="221" height="102" src="../images/logo.jpg" alt="JMeter" title="JMeter" border="0"/></a>
+<a href="http://jakarta.apache.org/jmeter/"><img width="221" height="102" src="../images/logo.jpg" alt="Apache JMeter" title="Apache JMeter" border="0"/></a>
 </td>
 </tr>
 </table>
@@ -67,12 +67,12 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="http://www.apache.org/licenses/">License</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterCommitters">Contributors</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterCommitters">Contributors</a>
 </li>
 </ul>
 <p><strong>Download</strong></p>
 <ul>
-<li><a href="http://jakarta.apache.org/site/downloads/downloads_jmeter.cgi">Download Releases</a>
+<li><a href="../download_jmeter.cgi">Download Releases</a>
 </li>
 <li><a href="../nightly.html">Developer (Nightly) Builds</a>
 </li>
@@ -87,9 +87,9 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="../building.html">Building JMeter and Add-Ons</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter">JMeter Wiki</a>
+<li><a href="http://wiki.apache.org/jmeter">JMeter Wiki</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterFAQ">FAQ (Wiki)</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterFAQ">FAQ (Wiki)</a>
 </li>
 </ul>
 <p><strong>Tutorials (PDF format)</strong></p>
@@ -107,11 +107,11 @@ style="border-width:0; float: left" fram
 </ul>
 <p><strong>Community</strong></p>
 <ul>
-<li><a href="http://jakarta.apache.org/site/getinvolved.html">Get Involved</a>
+<li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved</a>
 </li>
-<li><a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
+<li><a href="../mail.html">Mailing Lists</a>
 </li>
-<li><a href="http://jakarta.apache.org/site/cvsindex.html">SVN Repositories</a>
+<li><a href="../svnindex.html">SVN Repositories</a>
 </li>
 </ul>
 <p><strong>Foundation</strong></p>

Modified: jmeter/branches/docs-2.5.1/docs/usermanual/build-jms-topic-test-plan.html
URL: http://svn.apache.org/viewvc/jmeter/branches/docs-2.5.1/docs/usermanual/build-jms-topic-test-plan.html?rev=1196914&r1=1196913&r2=1196914&view=diff
==============================================================================
--- jmeter/branches/docs-2.5.1/docs/usermanual/build-jms-topic-test-plan.html (original)
+++ jmeter/branches/docs-2.5.1/docs/usermanual/build-jms-topic-test-plan.html Thu Nov  3 01:36:26 2011
@@ -30,7 +30,7 @@
 
 
 
-<title>JMeter - User's Manual: Building a JMS (Java Messaging Service) Test Plan</title>
+<title>Apache JMeter - User's Manual: Building a JMS (Java Messaging Service) Test Plan</title>
 </head>
 
 <body bgcolor="#ffffff" text="#000000" link="#525D76">
@@ -43,10 +43,10 @@
 style="border-width:0; float: left" frameborder="0" scrolling="no"></iframe>
 </td>
 <td align="left">
-<a href="http://jakarta.apache.org"><img width="505" height="48" src="../images/jakarta-logo.gif" alt="Jakarta" title="Jakarta" border="0"/></a>
+<a href="http://www.apache.org"><img title="Apache Software Foundation" width="387" height="100" src="../images/asf-logo.gif" border="0"/></a>
 </td>
 <td align="right">
-<a href="http://jakarta.apache.org/jmeter/"><img width="221" height="102" src="../images/logo.jpg" alt="JMeter" title="JMeter" border="0"/></a>
+<a href="http://jakarta.apache.org/jmeter/"><img width="221" height="102" src="../images/logo.jpg" alt="Apache JMeter" title="Apache JMeter" border="0"/></a>
 </td>
 </tr>
 </table>
@@ -67,12 +67,12 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="http://www.apache.org/licenses/">License</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterCommitters">Contributors</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterCommitters">Contributors</a>
 </li>
 </ul>
 <p><strong>Download</strong></p>
 <ul>
-<li><a href="http://jakarta.apache.org/site/downloads/downloads_jmeter.cgi">Download Releases</a>
+<li><a href="../download_jmeter.cgi">Download Releases</a>
 </li>
 <li><a href="../nightly.html">Developer (Nightly) Builds</a>
 </li>
@@ -87,9 +87,9 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="../building.html">Building JMeter and Add-Ons</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter">JMeter Wiki</a>
+<li><a href="http://wiki.apache.org/jmeter">JMeter Wiki</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterFAQ">FAQ (Wiki)</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterFAQ">FAQ (Wiki)</a>
 </li>
 </ul>
 <p><strong>Tutorials (PDF format)</strong></p>
@@ -107,11 +107,11 @@ style="border-width:0; float: left" fram
 </ul>
 <p><strong>Community</strong></p>
 <ul>
-<li><a href="http://jakarta.apache.org/site/getinvolved.html">Get Involved</a>
+<li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved</a>
 </li>
-<li><a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
+<li><a href="../mail.html">Mailing Lists</a>
 </li>
-<li><a href="http://jakarta.apache.org/site/cvsindex.html">SVN Repositories</a>
+<li><a href="../svnindex.html">SVN Repositories</a>
 </li>
 </ul>
 <p><strong>Foundation</strong></p>

Modified: jmeter/branches/docs-2.5.1/docs/usermanual/build-ldap-test-plan.html
URL: http://svn.apache.org/viewvc/jmeter/branches/docs-2.5.1/docs/usermanual/build-ldap-test-plan.html?rev=1196914&r1=1196913&r2=1196914&view=diff
==============================================================================
--- jmeter/branches/docs-2.5.1/docs/usermanual/build-ldap-test-plan.html (original)
+++ jmeter/branches/docs-2.5.1/docs/usermanual/build-ldap-test-plan.html Thu Nov  3 01:36:26 2011
@@ -30,7 +30,7 @@
 
 
 
-<title>JMeter - User's Manual: Building an LDAP Test Plan</title>
+<title>Apache JMeter - User's Manual: Building an LDAP Test Plan</title>
 </head>
 
 <body bgcolor="#ffffff" text="#000000" link="#525D76">
@@ -43,10 +43,10 @@
 style="border-width:0; float: left" frameborder="0" scrolling="no"></iframe>
 </td>
 <td align="left">
-<a href="http://jakarta.apache.org"><img width="505" height="48" src="../images/jakarta-logo.gif" alt="Jakarta" title="Jakarta" border="0"/></a>
+<a href="http://www.apache.org"><img title="Apache Software Foundation" width="387" height="100" src="../images/asf-logo.gif" border="0"/></a>
 </td>
 <td align="right">
-<a href="http://jakarta.apache.org/jmeter/"><img width="221" height="102" src="../images/logo.jpg" alt="JMeter" title="JMeter" border="0"/></a>
+<a href="http://jakarta.apache.org/jmeter/"><img width="221" height="102" src="../images/logo.jpg" alt="Apache JMeter" title="Apache JMeter" border="0"/></a>
 </td>
 </tr>
 </table>
@@ -67,12 +67,12 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="http://www.apache.org/licenses/">License</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterCommitters">Contributors</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterCommitters">Contributors</a>
 </li>
 </ul>
 <p><strong>Download</strong></p>
 <ul>
-<li><a href="http://jakarta.apache.org/site/downloads/downloads_jmeter.cgi">Download Releases</a>
+<li><a href="../download_jmeter.cgi">Download Releases</a>
 </li>
 <li><a href="../nightly.html">Developer (Nightly) Builds</a>
 </li>
@@ -87,9 +87,9 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="../building.html">Building JMeter and Add-Ons</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter">JMeter Wiki</a>
+<li><a href="http://wiki.apache.org/jmeter">JMeter Wiki</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterFAQ">FAQ (Wiki)</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterFAQ">FAQ (Wiki)</a>
 </li>
 </ul>
 <p><strong>Tutorials (PDF format)</strong></p>
@@ -107,11 +107,11 @@ style="border-width:0; float: left" fram
 </ul>
 <p><strong>Community</strong></p>
 <ul>
-<li><a href="http://jakarta.apache.org/site/getinvolved.html">Get Involved</a>
+<li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved</a>
 </li>
-<li><a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
+<li><a href="../mail.html">Mailing Lists</a>
 </li>
-<li><a href="http://jakarta.apache.org/site/cvsindex.html">SVN Repositories</a>
+<li><a href="../svnindex.html">SVN Repositories</a>
 </li>
 </ul>
 <p><strong>Foundation</strong></p>

Modified: jmeter/branches/docs-2.5.1/docs/usermanual/build-ldapext-test-plan.html
URL: http://svn.apache.org/viewvc/jmeter/branches/docs-2.5.1/docs/usermanual/build-ldapext-test-plan.html?rev=1196914&r1=1196913&r2=1196914&view=diff
==============================================================================
--- jmeter/branches/docs-2.5.1/docs/usermanual/build-ldapext-test-plan.html (original)
+++ jmeter/branches/docs-2.5.1/docs/usermanual/build-ldapext-test-plan.html Thu Nov  3 01:36:26 2011
@@ -30,7 +30,7 @@
 
 
 
-<title>JMeter - User's Manual: Building an Extended LDAP Test Plan</title>
+<title>Apache JMeter - User's Manual: Building an Extended LDAP Test Plan</title>
 </head>
 
 <body bgcolor="#ffffff" text="#000000" link="#525D76">
@@ -43,10 +43,10 @@
 style="border-width:0; float: left" frameborder="0" scrolling="no"></iframe>
 </td>
 <td align="left">
-<a href="http://jakarta.apache.org"><img width="505" height="48" src="../images/jakarta-logo.gif" alt="Jakarta" title="Jakarta" border="0"/></a>
+<a href="http://www.apache.org"><img title="Apache Software Foundation" width="387" height="100" src="../images/asf-logo.gif" border="0"/></a>
 </td>
 <td align="right">
-<a href="http://jakarta.apache.org/jmeter/"><img width="221" height="102" src="../images/logo.jpg" alt="JMeter" title="JMeter" border="0"/></a>
+<a href="http://jakarta.apache.org/jmeter/"><img width="221" height="102" src="../images/logo.jpg" alt="Apache JMeter" title="Apache JMeter" border="0"/></a>
 </td>
 </tr>
 </table>
@@ -67,12 +67,12 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="http://www.apache.org/licenses/">License</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterCommitters">Contributors</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterCommitters">Contributors</a>
 </li>
 </ul>
 <p><strong>Download</strong></p>
 <ul>
-<li><a href="http://jakarta.apache.org/site/downloads/downloads_jmeter.cgi">Download Releases</a>
+<li><a href="../download_jmeter.cgi">Download Releases</a>
 </li>
 <li><a href="../nightly.html">Developer (Nightly) Builds</a>
 </li>
@@ -87,9 +87,9 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="../building.html">Building JMeter and Add-Ons</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter">JMeter Wiki</a>
+<li><a href="http://wiki.apache.org/jmeter">JMeter Wiki</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterFAQ">FAQ (Wiki)</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterFAQ">FAQ (Wiki)</a>
 </li>
 </ul>
 <p><strong>Tutorials (PDF format)</strong></p>
@@ -107,11 +107,11 @@ style="border-width:0; float: left" fram
 </ul>
 <p><strong>Community</strong></p>
 <ul>
-<li><a href="http://jakarta.apache.org/site/getinvolved.html">Get Involved</a>
+<li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved</a>
 </li>
-<li><a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
+<li><a href="../mail.html">Mailing Lists</a>
 </li>
-<li><a href="http://jakarta.apache.org/site/cvsindex.html">SVN Repositories</a>
+<li><a href="../svnindex.html">SVN Repositories</a>
 </li>
 </ul>
 <p><strong>Foundation</strong></p>

Modified: jmeter/branches/docs-2.5.1/docs/usermanual/build-monitor-test-plan.html
URL: http://svn.apache.org/viewvc/jmeter/branches/docs-2.5.1/docs/usermanual/build-monitor-test-plan.html?rev=1196914&r1=1196913&r2=1196914&view=diff
==============================================================================
--- jmeter/branches/docs-2.5.1/docs/usermanual/build-monitor-test-plan.html (original)
+++ jmeter/branches/docs-2.5.1/docs/usermanual/build-monitor-test-plan.html Thu Nov  3 01:36:26 2011
@@ -30,7 +30,7 @@
 
 
 
-<title>JMeter - User's Manual: Building a Monitor Test Plan</title>
+<title>Apache JMeter - User's Manual: Building a Monitor Test Plan</title>
 </head>
 
 <body bgcolor="#ffffff" text="#000000" link="#525D76">
@@ -43,10 +43,10 @@
 style="border-width:0; float: left" frameborder="0" scrolling="no"></iframe>
 </td>
 <td align="left">
-<a href="http://jakarta.apache.org"><img width="505" height="48" src="../images/jakarta-logo.gif" alt="Jakarta" title="Jakarta" border="0"/></a>
+<a href="http://www.apache.org"><img title="Apache Software Foundation" width="387" height="100" src="../images/asf-logo.gif" border="0"/></a>
 </td>
 <td align="right">
-<a href="http://jakarta.apache.org/jmeter/"><img width="221" height="102" src="../images/logo.jpg" alt="JMeter" title="JMeter" border="0"/></a>
+<a href="http://jakarta.apache.org/jmeter/"><img width="221" height="102" src="../images/logo.jpg" alt="Apache JMeter" title="Apache JMeter" border="0"/></a>
 </td>
 </tr>
 </table>
@@ -67,12 +67,12 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="http://www.apache.org/licenses/">License</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterCommitters">Contributors</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterCommitters">Contributors</a>
 </li>
 </ul>
 <p><strong>Download</strong></p>
 <ul>
-<li><a href="http://jakarta.apache.org/site/downloads/downloads_jmeter.cgi">Download Releases</a>
+<li><a href="../download_jmeter.cgi">Download Releases</a>
 </li>
 <li><a href="../nightly.html">Developer (Nightly) Builds</a>
 </li>
@@ -87,9 +87,9 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="../building.html">Building JMeter and Add-Ons</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter">JMeter Wiki</a>
+<li><a href="http://wiki.apache.org/jmeter">JMeter Wiki</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterFAQ">FAQ (Wiki)</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterFAQ">FAQ (Wiki)</a>
 </li>
 </ul>
 <p><strong>Tutorials (PDF format)</strong></p>
@@ -107,11 +107,11 @@ style="border-width:0; float: left" fram
 </ul>
 <p><strong>Community</strong></p>
 <ul>
-<li><a href="http://jakarta.apache.org/site/getinvolved.html">Get Involved</a>
+<li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved</a>
 </li>
-<li><a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
+<li><a href="../mail.html">Mailing Lists</a>
 </li>
-<li><a href="http://jakarta.apache.org/site/cvsindex.html">SVN Repositories</a>
+<li><a href="../svnindex.html">SVN Repositories</a>
 </li>
 </ul>
 <p><strong>Foundation</strong></p>

Modified: jmeter/branches/docs-2.5.1/docs/usermanual/build-test-plan.html
URL: http://svn.apache.org/viewvc/jmeter/branches/docs-2.5.1/docs/usermanual/build-test-plan.html?rev=1196914&r1=1196913&r2=1196914&view=diff
==============================================================================
--- jmeter/branches/docs-2.5.1/docs/usermanual/build-test-plan.html (original)
+++ jmeter/branches/docs-2.5.1/docs/usermanual/build-test-plan.html Thu Nov  3 01:36:26 2011
@@ -30,7 +30,7 @@
 
 
 
-<title>JMeter - User's Manual: Building a Test Plan</title>
+<title>Apache JMeter - User's Manual: Building a Test Plan</title>
 </head>
 
 <body bgcolor="#ffffff" text="#000000" link="#525D76">
@@ -43,10 +43,10 @@
 style="border-width:0; float: left" frameborder="0" scrolling="no"></iframe>
 </td>
 <td align="left">
-<a href="http://jakarta.apache.org"><img width="505" height="48" src="../images/jakarta-logo.gif" alt="Jakarta" title="Jakarta" border="0"/></a>
+<a href="http://www.apache.org"><img title="Apache Software Foundation" width="387" height="100" src="../images/asf-logo.gif" border="0"/></a>
 </td>
 <td align="right">
-<a href="http://jakarta.apache.org/jmeter/"><img width="221" height="102" src="../images/logo.jpg" alt="JMeter" title="JMeter" border="0"/></a>
+<a href="http://jakarta.apache.org/jmeter/"><img width="221" height="102" src="../images/logo.jpg" alt="Apache JMeter" title="Apache JMeter" border="0"/></a>
 </td>
 </tr>
 </table>
@@ -67,12 +67,12 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="http://www.apache.org/licenses/">License</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterCommitters">Contributors</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterCommitters">Contributors</a>
 </li>
 </ul>
 <p><strong>Download</strong></p>
 <ul>
-<li><a href="http://jakarta.apache.org/site/downloads/downloads_jmeter.cgi">Download Releases</a>
+<li><a href="../download_jmeter.cgi">Download Releases</a>
 </li>
 <li><a href="../nightly.html">Developer (Nightly) Builds</a>
 </li>
@@ -87,9 +87,9 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="../building.html">Building JMeter and Add-Ons</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter">JMeter Wiki</a>
+<li><a href="http://wiki.apache.org/jmeter">JMeter Wiki</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterFAQ">FAQ (Wiki)</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterFAQ">FAQ (Wiki)</a>
 </li>
 </ul>
 <p><strong>Tutorials (PDF format)</strong></p>
@@ -107,11 +107,11 @@ style="border-width:0; float: left" fram
 </ul>
 <p><strong>Community</strong></p>
 <ul>
-<li><a href="http://jakarta.apache.org/site/getinvolved.html">Get Involved</a>
+<li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved</a>
 </li>
-<li><a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
+<li><a href="../mail.html">Mailing Lists</a>
 </li>
-<li><a href="http://jakarta.apache.org/site/cvsindex.html">SVN Repositories</a>
+<li><a href="../svnindex.html">SVN Repositories</a>
 </li>
 </ul>
 <p><strong>Foundation</strong></p>

Modified: jmeter/branches/docs-2.5.1/docs/usermanual/build-web-test-plan.html
URL: http://svn.apache.org/viewvc/jmeter/branches/docs-2.5.1/docs/usermanual/build-web-test-plan.html?rev=1196914&r1=1196913&r2=1196914&view=diff
==============================================================================
--- jmeter/branches/docs-2.5.1/docs/usermanual/build-web-test-plan.html (original)
+++ jmeter/branches/docs-2.5.1/docs/usermanual/build-web-test-plan.html Thu Nov  3 01:36:26 2011
@@ -30,7 +30,7 @@
 
 
 
-<title>JMeter - User's Manual: Building a Web Test Plan</title>
+<title>Apache JMeter - User's Manual: Building a Web Test Plan</title>
 </head>
 
 <body bgcolor="#ffffff" text="#000000" link="#525D76">
@@ -43,10 +43,10 @@
 style="border-width:0; float: left" frameborder="0" scrolling="no"></iframe>
 </td>
 <td align="left">
-<a href="http://jakarta.apache.org"><img width="505" height="48" src="../images/jakarta-logo.gif" alt="Jakarta" title="Jakarta" border="0"/></a>
+<a href="http://www.apache.org"><img title="Apache Software Foundation" width="387" height="100" src="../images/asf-logo.gif" border="0"/></a>
 </td>
 <td align="right">
-<a href="http://jakarta.apache.org/jmeter/"><img width="221" height="102" src="../images/logo.jpg" alt="JMeter" title="JMeter" border="0"/></a>
+<a href="http://jakarta.apache.org/jmeter/"><img width="221" height="102" src="../images/logo.jpg" alt="Apache JMeter" title="Apache JMeter" border="0"/></a>
 </td>
 </tr>
 </table>
@@ -67,12 +67,12 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="http://www.apache.org/licenses/">License</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterCommitters">Contributors</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterCommitters">Contributors</a>
 </li>
 </ul>
 <p><strong>Download</strong></p>
 <ul>
-<li><a href="http://jakarta.apache.org/site/downloads/downloads_jmeter.cgi">Download Releases</a>
+<li><a href="../download_jmeter.cgi">Download Releases</a>
 </li>
 <li><a href="../nightly.html">Developer (Nightly) Builds</a>
 </li>
@@ -87,9 +87,9 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="../building.html">Building JMeter and Add-Ons</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter">JMeter Wiki</a>
+<li><a href="http://wiki.apache.org/jmeter">JMeter Wiki</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterFAQ">FAQ (Wiki)</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterFAQ">FAQ (Wiki)</a>
 </li>
 </ul>
 <p><strong>Tutorials (PDF format)</strong></p>
@@ -107,11 +107,11 @@ style="border-width:0; float: left" fram
 </ul>
 <p><strong>Community</strong></p>
 <ul>
-<li><a href="http://jakarta.apache.org/site/getinvolved.html">Get Involved</a>
+<li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved</a>
 </li>
-<li><a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
+<li><a href="../mail.html">Mailing Lists</a>
 </li>
-<li><a href="http://jakarta.apache.org/site/cvsindex.html">SVN Repositories</a>
+<li><a href="../svnindex.html">SVN Repositories</a>
 </li>
 </ul>
 <p><strong>Foundation</strong></p>

Modified: jmeter/branches/docs-2.5.1/docs/usermanual/build-ws-test-plan.html
URL: http://svn.apache.org/viewvc/jmeter/branches/docs-2.5.1/docs/usermanual/build-ws-test-plan.html?rev=1196914&r1=1196913&r2=1196914&view=diff
==============================================================================
--- jmeter/branches/docs-2.5.1/docs/usermanual/build-ws-test-plan.html (original)
+++ jmeter/branches/docs-2.5.1/docs/usermanual/build-ws-test-plan.html Thu Nov  3 01:36:26 2011
@@ -30,7 +30,7 @@
 
 
 
-<title>JMeter - User's Manual: Building a WebService Test Plan</title>
+<title>Apache JMeter - User's Manual: Building a WebService Test Plan</title>
 </head>
 
 <body bgcolor="#ffffff" text="#000000" link="#525D76">
@@ -43,10 +43,10 @@
 style="border-width:0; float: left" frameborder="0" scrolling="no"></iframe>
 </td>
 <td align="left">
-<a href="http://jakarta.apache.org"><img width="505" height="48" src="../images/jakarta-logo.gif" alt="Jakarta" title="Jakarta" border="0"/></a>
+<a href="http://www.apache.org"><img title="Apache Software Foundation" width="387" height="100" src="../images/asf-logo.gif" border="0"/></a>
 </td>
 <td align="right">
-<a href="http://jakarta.apache.org/jmeter/"><img width="221" height="102" src="../images/logo.jpg" alt="JMeter" title="JMeter" border="0"/></a>
+<a href="http://jakarta.apache.org/jmeter/"><img width="221" height="102" src="../images/logo.jpg" alt="Apache JMeter" title="Apache JMeter" border="0"/></a>
 </td>
 </tr>
 </table>
@@ -67,12 +67,12 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="http://www.apache.org/licenses/">License</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterCommitters">Contributors</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterCommitters">Contributors</a>
 </li>
 </ul>
 <p><strong>Download</strong></p>
 <ul>
-<li><a href="http://jakarta.apache.org/site/downloads/downloads_jmeter.cgi">Download Releases</a>
+<li><a href="../download_jmeter.cgi">Download Releases</a>
 </li>
 <li><a href="../nightly.html">Developer (Nightly) Builds</a>
 </li>
@@ -87,9 +87,9 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="../building.html">Building JMeter and Add-Ons</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter">JMeter Wiki</a>
+<li><a href="http://wiki.apache.org/jmeter">JMeter Wiki</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterFAQ">FAQ (Wiki)</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterFAQ">FAQ (Wiki)</a>
 </li>
 </ul>
 <p><strong>Tutorials (PDF format)</strong></p>
@@ -107,11 +107,11 @@ style="border-width:0; float: left" fram
 </ul>
 <p><strong>Community</strong></p>
 <ul>
-<li><a href="http://jakarta.apache.org/site/getinvolved.html">Get Involved</a>
+<li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved</a>
 </li>
-<li><a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
+<li><a href="../mail.html">Mailing Lists</a>
 </li>
-<li><a href="http://jakarta.apache.org/site/cvsindex.html">SVN Repositories</a>
+<li><a href="../svnindex.html">SVN Repositories</a>
 </li>
 </ul>
 <p><strong>Foundation</strong></p>

Modified: jmeter/branches/docs-2.5.1/docs/usermanual/component_reference.html
URL: http://svn.apache.org/viewvc/jmeter/branches/docs-2.5.1/docs/usermanual/component_reference.html?rev=1196914&r1=1196913&r2=1196914&view=diff
==============================================================================
--- jmeter/branches/docs-2.5.1/docs/usermanual/component_reference.html (original)
+++ jmeter/branches/docs-2.5.1/docs/usermanual/component_reference.html Thu Nov  3 01:36:26 2011
@@ -30,7 +30,7 @@
 
 
 
-<title>JMeter - User's Manual: Component Reference</title>
+<title>Apache JMeter - User's Manual: Component Reference</title>
 </head>
 
 <body bgcolor="#ffffff" text="#000000" link="#525D76">
@@ -43,10 +43,10 @@
 style="border-width:0; float: left" frameborder="0" scrolling="no"></iframe>
 </td>
 <td align="left">
-<a href="http://jakarta.apache.org"><img width="505" height="48" src="../images/jakarta-logo.gif" alt="Jakarta" title="Jakarta" border="0"/></a>
+<a href="http://www.apache.org"><img title="Apache Software Foundation" width="387" height="100" src="../images/asf-logo.gif" border="0"/></a>
 </td>
 <td align="right">
-<a href="http://jakarta.apache.org/jmeter/"><img width="221" height="102" src="../images/logo.jpg" alt="JMeter" title="JMeter" border="0"/></a>
+<a href="http://jakarta.apache.org/jmeter/"><img width="221" height="102" src="../images/logo.jpg" alt="Apache JMeter" title="Apache JMeter" border="0"/></a>
 </td>
 </tr>
 </table>
@@ -67,12 +67,12 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="http://www.apache.org/licenses/">License</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterCommitters">Contributors</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterCommitters">Contributors</a>
 </li>
 </ul>
 <p><strong>Download</strong></p>
 <ul>
-<li><a href="http://jakarta.apache.org/site/downloads/downloads_jmeter.cgi">Download Releases</a>
+<li><a href="../download_jmeter.cgi">Download Releases</a>
 </li>
 <li><a href="../nightly.html">Developer (Nightly) Builds</a>
 </li>
@@ -87,9 +87,9 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="../building.html">Building JMeter and Add-Ons</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter">JMeter Wiki</a>
+<li><a href="http://wiki.apache.org/jmeter">JMeter Wiki</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterFAQ">FAQ (Wiki)</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterFAQ">FAQ (Wiki)</a>
 </li>
 </ul>
 <p><strong>Tutorials (PDF format)</strong></p>
@@ -107,11 +107,11 @@ style="border-width:0; float: left" fram
 </ul>
 <p><strong>Community</strong></p>
 <ul>
-<li><a href="http://jakarta.apache.org/site/getinvolved.html">Get Involved</a>
+<li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved</a>
 </li>
-<li><a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
+<li><a href="../mail.html">Mailing Lists</a>
 </li>
-<li><a href="http://jakarta.apache.org/site/cvsindex.html">SVN Repositories</a>
+<li><a href="../svnindex.html">SVN Repositories</a>
 </li>
 </ul>
 <p><strong>Foundation</strong></p>

Modified: jmeter/branches/docs-2.5.1/docs/usermanual/functions.html
URL: http://svn.apache.org/viewvc/jmeter/branches/docs-2.5.1/docs/usermanual/functions.html?rev=1196914&r1=1196913&r2=1196914&view=diff
==============================================================================
--- jmeter/branches/docs-2.5.1/docs/usermanual/functions.html (original)
+++ jmeter/branches/docs-2.5.1/docs/usermanual/functions.html Thu Nov  3 01:36:26 2011
@@ -30,7 +30,7 @@
 
 
 
-<title>JMeter - User's Manual: Functions and Variables</title>
+<title>Apache JMeter - User's Manual: Functions and Variables</title>
 </head>
 
 <body bgcolor="#ffffff" text="#000000" link="#525D76">
@@ -43,10 +43,10 @@
 style="border-width:0; float: left" frameborder="0" scrolling="no"></iframe>
 </td>
 <td align="left">
-<a href="http://jakarta.apache.org"><img width="505" height="48" src="../images/jakarta-logo.gif" alt="Jakarta" title="Jakarta" border="0"/></a>
+<a href="http://www.apache.org"><img title="Apache Software Foundation" width="387" height="100" src="../images/asf-logo.gif" border="0"/></a>
 </td>
 <td align="right">
-<a href="http://jakarta.apache.org/jmeter/"><img width="221" height="102" src="../images/logo.jpg" alt="JMeter" title="JMeter" border="0"/></a>
+<a href="http://jakarta.apache.org/jmeter/"><img width="221" height="102" src="../images/logo.jpg" alt="Apache JMeter" title="Apache JMeter" border="0"/></a>
 </td>
 </tr>
 </table>
@@ -67,12 +67,12 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="http://www.apache.org/licenses/">License</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterCommitters">Contributors</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterCommitters">Contributors</a>
 </li>
 </ul>
 <p><strong>Download</strong></p>
 <ul>
-<li><a href="http://jakarta.apache.org/site/downloads/downloads_jmeter.cgi">Download Releases</a>
+<li><a href="../download_jmeter.cgi">Download Releases</a>
 </li>
 <li><a href="../nightly.html">Developer (Nightly) Builds</a>
 </li>
@@ -87,9 +87,9 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="../building.html">Building JMeter and Add-Ons</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter">JMeter Wiki</a>
+<li><a href="http://wiki.apache.org/jmeter">JMeter Wiki</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterFAQ">FAQ (Wiki)</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterFAQ">FAQ (Wiki)</a>
 </li>
 </ul>
 <p><strong>Tutorials (PDF format)</strong></p>
@@ -107,11 +107,11 @@ style="border-width:0; float: left" fram
 </ul>
 <p><strong>Community</strong></p>
 <ul>
-<li><a href="http://jakarta.apache.org/site/getinvolved.html">Get Involved</a>
+<li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved</a>
 </li>
-<li><a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
+<li><a href="../mail.html">Mailing Lists</a>
 </li>
-<li><a href="http://jakarta.apache.org/site/cvsindex.html">SVN Repositories</a>
+<li><a href="../svnindex.html">SVN Repositories</a>
 </li>
 </ul>
 <p><strong>Foundation</strong></p>

Modified: jmeter/branches/docs-2.5.1/docs/usermanual/get-started.html
URL: http://svn.apache.org/viewvc/jmeter/branches/docs-2.5.1/docs/usermanual/get-started.html?rev=1196914&r1=1196913&r2=1196914&view=diff
==============================================================================
--- jmeter/branches/docs-2.5.1/docs/usermanual/get-started.html (original)
+++ jmeter/branches/docs-2.5.1/docs/usermanual/get-started.html Thu Nov  3 01:36:26 2011
@@ -30,7 +30,7 @@
 
 
 
-<title>JMeter - User's Manual: Getting Started</title>
+<title>Apache JMeter - User's Manual: Getting Started</title>
 </head>
 
 <body bgcolor="#ffffff" text="#000000" link="#525D76">
@@ -43,10 +43,10 @@
 style="border-width:0; float: left" frameborder="0" scrolling="no"></iframe>
 </td>
 <td align="left">
-<a href="http://jakarta.apache.org"><img width="505" height="48" src="../images/jakarta-logo.gif" alt="Jakarta" title="Jakarta" border="0"/></a>
+<a href="http://www.apache.org"><img title="Apache Software Foundation" width="387" height="100" src="../images/asf-logo.gif" border="0"/></a>
 </td>
 <td align="right">
-<a href="http://jakarta.apache.org/jmeter/"><img width="221" height="102" src="../images/logo.jpg" alt="JMeter" title="JMeter" border="0"/></a>
+<a href="http://jakarta.apache.org/jmeter/"><img width="221" height="102" src="../images/logo.jpg" alt="Apache JMeter" title="Apache JMeter" border="0"/></a>
 </td>
 </tr>
 </table>
@@ -67,12 +67,12 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="http://www.apache.org/licenses/">License</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterCommitters">Contributors</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterCommitters">Contributors</a>
 </li>
 </ul>
 <p><strong>Download</strong></p>
 <ul>
-<li><a href="http://jakarta.apache.org/site/downloads/downloads_jmeter.cgi">Download Releases</a>
+<li><a href="../download_jmeter.cgi">Download Releases</a>
 </li>
 <li><a href="../nightly.html">Developer (Nightly) Builds</a>
 </li>
@@ -87,9 +87,9 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="../building.html">Building JMeter and Add-Ons</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter">JMeter Wiki</a>
+<li><a href="http://wiki.apache.org/jmeter">JMeter Wiki</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterFAQ">FAQ (Wiki)</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterFAQ">FAQ (Wiki)</a>
 </li>
 </ul>
 <p><strong>Tutorials (PDF format)</strong></p>
@@ -107,11 +107,11 @@ style="border-width:0; float: left" fram
 </ul>
 <p><strong>Community</strong></p>
 <ul>
-<li><a href="http://jakarta.apache.org/site/getinvolved.html">Get Involved</a>
+<li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved</a>
 </li>
-<li><a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
+<li><a href="../mail.html">Mailing Lists</a>
 </li>
-<li><a href="http://jakarta.apache.org/site/cvsindex.html">SVN Repositories</a>
+<li><a href="../svnindex.html">SVN Repositories</a>
 </li>
 </ul>
 <p><strong>Foundation</strong></p>

Modified: jmeter/branches/docs-2.5.1/docs/usermanual/glossary.html
URL: http://svn.apache.org/viewvc/jmeter/branches/docs-2.5.1/docs/usermanual/glossary.html?rev=1196914&r1=1196913&r2=1196914&view=diff
==============================================================================
--- jmeter/branches/docs-2.5.1/docs/usermanual/glossary.html (original)
+++ jmeter/branches/docs-2.5.1/docs/usermanual/glossary.html Thu Nov  3 01:36:26 2011
@@ -30,7 +30,7 @@
 
 
 
-<title>JMeter - User's Manual: Glossary</title>
+<title>Apache JMeter - User's Manual: Glossary</title>
 </head>
 
 <body bgcolor="#ffffff" text="#000000" link="#525D76">
@@ -43,10 +43,10 @@
 style="border-width:0; float: left" frameborder="0" scrolling="no"></iframe>
 </td>
 <td align="left">
-<a href="http://jakarta.apache.org"><img width="505" height="48" src="../images/jakarta-logo.gif" alt="Jakarta" title="Jakarta" border="0"/></a>
+<a href="http://www.apache.org"><img title="Apache Software Foundation" width="387" height="100" src="../images/asf-logo.gif" border="0"/></a>
 </td>
 <td align="right">
-<a href="http://jakarta.apache.org/jmeter/"><img width="221" height="102" src="../images/logo.jpg" alt="JMeter" title="JMeter" border="0"/></a>
+<a href="http://jakarta.apache.org/jmeter/"><img width="221" height="102" src="../images/logo.jpg" alt="Apache JMeter" title="Apache JMeter" border="0"/></a>
 </td>
 </tr>
 </table>
@@ -67,12 +67,12 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="http://www.apache.org/licenses/">License</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterCommitters">Contributors</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterCommitters">Contributors</a>
 </li>
 </ul>
 <p><strong>Download</strong></p>
 <ul>
-<li><a href="http://jakarta.apache.org/site/downloads/downloads_jmeter.cgi">Download Releases</a>
+<li><a href="../download_jmeter.cgi">Download Releases</a>
 </li>
 <li><a href="../nightly.html">Developer (Nightly) Builds</a>
 </li>
@@ -87,9 +87,9 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="../building.html">Building JMeter and Add-Ons</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter">JMeter Wiki</a>
+<li><a href="http://wiki.apache.org/jmeter">JMeter Wiki</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterFAQ">FAQ (Wiki)</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterFAQ">FAQ (Wiki)</a>
 </li>
 </ul>
 <p><strong>Tutorials (PDF format)</strong></p>
@@ -107,11 +107,11 @@ style="border-width:0; float: left" fram
 </ul>
 <p><strong>Community</strong></p>
 <ul>
-<li><a href="http://jakarta.apache.org/site/getinvolved.html">Get Involved</a>
+<li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved</a>
 </li>
-<li><a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
+<li><a href="../mail.html">Mailing Lists</a>
 </li>
-<li><a href="http://jakarta.apache.org/site/cvsindex.html">SVN Repositories</a>
+<li><a href="../svnindex.html">SVN Repositories</a>
 </li>
 </ul>
 <p><strong>Foundation</strong></p>

Modified: jmeter/branches/docs-2.5.1/docs/usermanual/hints_and_tips.html
URL: http://svn.apache.org/viewvc/jmeter/branches/docs-2.5.1/docs/usermanual/hints_and_tips.html?rev=1196914&r1=1196913&r2=1196914&view=diff
==============================================================================
--- jmeter/branches/docs-2.5.1/docs/usermanual/hints_and_tips.html (original)
+++ jmeter/branches/docs-2.5.1/docs/usermanual/hints_and_tips.html Thu Nov  3 01:36:26 2011
@@ -30,7 +30,7 @@
 
 
 
-<title>JMeter - User's Manual: Hints and Tips</title>
+<title>Apache JMeter - User's Manual: Hints and Tips</title>
 </head>
 
 <body bgcolor="#ffffff" text="#000000" link="#525D76">
@@ -43,10 +43,10 @@
 style="border-width:0; float: left" frameborder="0" scrolling="no"></iframe>
 </td>
 <td align="left">
-<a href="http://jakarta.apache.org"><img width="505" height="48" src="../images/jakarta-logo.gif" alt="Jakarta" title="Jakarta" border="0"/></a>
+<a href="http://www.apache.org"><img title="Apache Software Foundation" width="387" height="100" src="../images/asf-logo.gif" border="0"/></a>
 </td>
 <td align="right">
-<a href="http://jakarta.apache.org/jmeter/"><img width="221" height="102" src="../images/logo.jpg" alt="JMeter" title="JMeter" border="0"/></a>
+<a href="http://jakarta.apache.org/jmeter/"><img width="221" height="102" src="../images/logo.jpg" alt="Apache JMeter" title="Apache JMeter" border="0"/></a>
 </td>
 </tr>
 </table>
@@ -67,12 +67,12 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="http://www.apache.org/licenses/">License</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterCommitters">Contributors</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterCommitters">Contributors</a>
 </li>
 </ul>
 <p><strong>Download</strong></p>
 <ul>
-<li><a href="http://jakarta.apache.org/site/downloads/downloads_jmeter.cgi">Download Releases</a>
+<li><a href="../download_jmeter.cgi">Download Releases</a>
 </li>
 <li><a href="../nightly.html">Developer (Nightly) Builds</a>
 </li>
@@ -87,9 +87,9 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="../building.html">Building JMeter and Add-Ons</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter">JMeter Wiki</a>
+<li><a href="http://wiki.apache.org/jmeter">JMeter Wiki</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterFAQ">FAQ (Wiki)</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterFAQ">FAQ (Wiki)</a>
 </li>
 </ul>
 <p><strong>Tutorials (PDF format)</strong></p>
@@ -107,11 +107,11 @@ style="border-width:0; float: left" fram
 </ul>
 <p><strong>Community</strong></p>
 <ul>
-<li><a href="http://jakarta.apache.org/site/getinvolved.html">Get Involved</a>
+<li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved</a>
 </li>
-<li><a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
+<li><a href="../mail.html">Mailing Lists</a>
 </li>
-<li><a href="http://jakarta.apache.org/site/cvsindex.html">SVN Repositories</a>
+<li><a href="../svnindex.html">SVN Repositories</a>
 </li>
 </ul>
 <p><strong>Foundation</strong></p>

Modified: jmeter/branches/docs-2.5.1/docs/usermanual/index.html
URL: http://svn.apache.org/viewvc/jmeter/branches/docs-2.5.1/docs/usermanual/index.html?rev=1196914&r1=1196913&r2=1196914&view=diff
==============================================================================
--- jmeter/branches/docs-2.5.1/docs/usermanual/index.html (original)
+++ jmeter/branches/docs-2.5.1/docs/usermanual/index.html Thu Nov  3 01:36:26 2011
@@ -30,7 +30,7 @@
 
 
 
-<title>JMeter - User's Manual</title>
+<title>Apache JMeter - User's Manual</title>
 </head>
 
 <body bgcolor="#ffffff" text="#000000" link="#525D76">
@@ -43,10 +43,10 @@
 style="border-width:0; float: left" frameborder="0" scrolling="no"></iframe>
 </td>
 <td align="left">
-<a href="http://jakarta.apache.org"><img width="505" height="48" src="../images/jakarta-logo.gif" alt="Jakarta" title="Jakarta" border="0"/></a>
+<a href="http://www.apache.org"><img title="Apache Software Foundation" width="387" height="100" src="../images/asf-logo.gif" border="0"/></a>
 </td>
 <td align="right">
-<a href="http://jakarta.apache.org/jmeter/"><img width="221" height="102" src="../images/logo.jpg" alt="JMeter" title="JMeter" border="0"/></a>
+<a href="http://jakarta.apache.org/jmeter/"><img width="221" height="102" src="../images/logo.jpg" alt="Apache JMeter" title="Apache JMeter" border="0"/></a>
 </td>
 </tr>
 </table>
@@ -67,12 +67,12 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="http://www.apache.org/licenses/">License</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterCommitters">Contributors</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterCommitters">Contributors</a>
 </li>
 </ul>
 <p><strong>Download</strong></p>
 <ul>
-<li><a href="http://jakarta.apache.org/site/downloads/downloads_jmeter.cgi">Download Releases</a>
+<li><a href="../download_jmeter.cgi">Download Releases</a>
 </li>
 <li><a href="../nightly.html">Developer (Nightly) Builds</a>
 </li>
@@ -87,9 +87,9 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="../building.html">Building JMeter and Add-Ons</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter">JMeter Wiki</a>
+<li><a href="http://wiki.apache.org/jmeter">JMeter Wiki</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterFAQ">FAQ (Wiki)</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterFAQ">FAQ (Wiki)</a>
 </li>
 </ul>
 <p><strong>Tutorials (PDF format)</strong></p>
@@ -107,11 +107,11 @@ style="border-width:0; float: left" fram
 </ul>
 <p><strong>Community</strong></p>
 <ul>
-<li><a href="http://jakarta.apache.org/site/getinvolved.html">Get Involved</a>
+<li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved</a>
 </li>
-<li><a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
+<li><a href="../mail.html">Mailing Lists</a>
 </li>
-<li><a href="http://jakarta.apache.org/site/cvsindex.html">SVN Repositories</a>
+<li><a href="../svnindex.html">SVN Repositories</a>
 </li>
 </ul>
 <p><strong>Foundation</strong></p>

Modified: jmeter/branches/docs-2.5.1/docs/usermanual/intro.html
URL: http://svn.apache.org/viewvc/jmeter/branches/docs-2.5.1/docs/usermanual/intro.html?rev=1196914&r1=1196913&r2=1196914&view=diff
==============================================================================
--- jmeter/branches/docs-2.5.1/docs/usermanual/intro.html (original)
+++ jmeter/branches/docs-2.5.1/docs/usermanual/intro.html Thu Nov  3 01:36:26 2011
@@ -30,7 +30,7 @@
 
 
 
-<title>JMeter - User's Manual: Introduction</title>
+<title>Apache JMeter - User's Manual: Introduction</title>
 </head>
 
 <body bgcolor="#ffffff" text="#000000" link="#525D76">
@@ -43,10 +43,10 @@
 style="border-width:0; float: left" frameborder="0" scrolling="no"></iframe>
 </td>
 <td align="left">
-<a href="http://jakarta.apache.org"><img width="505" height="48" src="../images/jakarta-logo.gif" alt="Jakarta" title="Jakarta" border="0"/></a>
+<a href="http://www.apache.org"><img title="Apache Software Foundation" width="387" height="100" src="../images/asf-logo.gif" border="0"/></a>
 </td>
 <td align="right">
-<a href="http://jakarta.apache.org/jmeter/"><img width="221" height="102" src="../images/logo.jpg" alt="JMeter" title="JMeter" border="0"/></a>
+<a href="http://jakarta.apache.org/jmeter/"><img width="221" height="102" src="../images/logo.jpg" alt="Apache JMeter" title="Apache JMeter" border="0"/></a>
 </td>
 </tr>
 </table>
@@ -67,12 +67,12 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="http://www.apache.org/licenses/">License</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterCommitters">Contributors</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterCommitters">Contributors</a>
 </li>
 </ul>
 <p><strong>Download</strong></p>
 <ul>
-<li><a href="http://jakarta.apache.org/site/downloads/downloads_jmeter.cgi">Download Releases</a>
+<li><a href="../download_jmeter.cgi">Download Releases</a>
 </li>
 <li><a href="../nightly.html">Developer (Nightly) Builds</a>
 </li>
@@ -87,9 +87,9 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="../building.html">Building JMeter and Add-Ons</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter">JMeter Wiki</a>
+<li><a href="http://wiki.apache.org/jmeter">JMeter Wiki</a>
 </li>
-<li><a href="http://wiki.apache.org/jakarta-jmeter/JMeterFAQ">FAQ (Wiki)</a>
+<li><a href="http://wiki.apache.org/jmeter/JMeterFAQ">FAQ (Wiki)</a>
 </li>
 </ul>
 <p><strong>Tutorials (PDF format)</strong></p>
@@ -107,11 +107,11 @@ style="border-width:0; float: left" fram
 </ul>
 <p><strong>Community</strong></p>
 <ul>
-<li><a href="http://jakarta.apache.org/site/getinvolved.html">Get Involved</a>
+<li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved</a>
 </li>
-<li><a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
+<li><a href="../mail.html">Mailing Lists</a>
 </li>
-<li><a href="http://jakarta.apache.org/site/cvsindex.html">SVN Repositories</a>
+<li><a href="../svnindex.html">SVN Repositories</a>
 </li>
 </ul>
 <p><strong>Foundation</strong></p>