You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by bu...@apache.org on 2012/11/22 12:03:08 UTC

svn commit: r839108 [1/2] - in /websites/staging/mina/trunk/content: ./ ftpserver-project/ mina-project/ mina-project/userguide/ mina-project/userguide/ch1-getting-started/ mina-project/userguide/ch10-executor-filter/ mina-project/userguide/ch11-ssl-fi...

Author: buildbot
Date: Thu Nov 22 11:03:00 2012
New Revision: 839108

Log:
Staging update by buildbot for mina

Added:
    websites/staging/mina/trunk/content/ftpserver-project/sources.html
    websites/staging/mina/trunk/content/staticresources/images/mina/selector-processor.graphml   (with props)
    websites/staging/mina/trunk/content/staticresources/images/mina/selector-processor.png   (with props)
Removed:
    websites/staging/mina/trunk/content/ftpserver-project/source.html
Modified:
    websites/staging/mina/trunk/content/   (props changed)
    websites/staging/mina/trunk/content/extpaths.txt
    websites/staging/mina/trunk/content/ftpserver-project/configuration_listeners.html
    websites/staging/mina/trunk/content/mina-project/codec-repo.html
    websites/staging/mina/trunk/content/mina-project/conferences.html
    websites/staging/mina/trunk/content/mina-project/developper-guide.html
    websites/staging/mina/trunk/content/mina-project/documentation.html
    websites/staging/mina/trunk/content/mina-project/downloads.html
    websites/staging/mina/trunk/content/mina-project/faq.html
    websites/staging/mina/trunk/content/mina-project/features.html
    websites/staging/mina/trunk/content/mina-project/index.html
    websites/staging/mina/trunk/content/mina-project/issue-tracking.html
    websites/staging/mina/trunk/content/mina-project/mailing-lists.html
    websites/staging/mina/trunk/content/mina-project/news.html
    websites/staging/mina/trunk/content/mina-project/performances.html
    websites/staging/mina/trunk/content/mina-project/quick-start-guide.html
    websites/staging/mina/trunk/content/mina-project/related-projects.html
    websites/staging/mina/trunk/content/mina-project/road-map.html
    websites/staging/mina/trunk/content/mina-project/set-svnprops-tortoisesvn.html
    websites/staging/mina/trunk/content/mina-project/sources.html
    websites/staging/mina/trunk/content/mina-project/testimonials.html
    websites/staging/mina/trunk/content/mina-project/userguide/ch1-getting-started/ch1-getting-started.html
    websites/staging/mina/trunk/content/mina-project/userguide/ch1-getting-started/features.html
    websites/staging/mina/trunk/content/mina-project/userguide/ch1-getting-started/first-steps.html
    websites/staging/mina/trunk/content/mina-project/userguide/ch1-getting-started/nio-overview.html
    websites/staging/mina/trunk/content/mina-project/userguide/ch1-getting-started/summary.html
    websites/staging/mina/trunk/content/mina-project/userguide/ch1-getting-started/why-mina.html
    websites/staging/mina/trunk/content/mina-project/userguide/ch10-executor-filter/ch10-executor-filter.html
    websites/staging/mina/trunk/content/mina-project/userguide/ch11-ssl-filter/ch11-ssl-filter.html
    websites/staging/mina/trunk/content/mina-project/userguide/ch12-logging-filter/ch12-logging-filter.html
    websites/staging/mina/trunk/content/mina-project/userguide/ch13-debugging/ch13-debugging.html
    websites/staging/mina/trunk/content/mina-project/userguide/ch14-state-machine/ch14-state-machine.html
    websites/staging/mina/trunk/content/mina-project/userguide/ch15-proxy/ch15-proxy.html
    websites/staging/mina/trunk/content/mina-project/userguide/ch16-jmx-support/ch16-jmx-support.html
    websites/staging/mina/trunk/content/mina-project/userguide/ch17-spring-integration/ch17-spring-integration.html
    websites/staging/mina/trunk/content/mina-project/userguide/ch2-basics/application-architecture.html
    websites/staging/mina/trunk/content/mina-project/userguide/ch2-basics/ch2-basics.html
    websites/staging/mina/trunk/content/mina-project/userguide/ch2-basics/client-architecture.html
    websites/staging/mina/trunk/content/mina-project/userguide/ch2-basics/sample-tcp-client.html
    websites/staging/mina/trunk/content/mina-project/userguide/ch2-basics/sample-tcp-server.html
    websites/staging/mina/trunk/content/mina-project/userguide/ch2-basics/sample-udp-client.html
    websites/staging/mina/trunk/content/mina-project/userguide/ch2-basics/sample-udp-server.html
    websites/staging/mina/trunk/content/mina-project/userguide/ch2-basics/server-architecture.html
    websites/staging/mina/trunk/content/mina-project/userguide/ch2-basics/summary.html
    websites/staging/mina/trunk/content/mina-project/userguide/ch3-service/acceptor.html
    websites/staging/mina/trunk/content/mina-project/userguide/ch3-service/ch3-service.html
    websites/staging/mina/trunk/content/mina-project/userguide/ch3-service/connector.html
    websites/staging/mina/trunk/content/mina-project/userguide/ch3-service/io-service-details.html
    websites/staging/mina/trunk/content/mina-project/userguide/ch3-service/io-service.html
    websites/staging/mina/trunk/content/mina-project/userguide/ch4-session/ch4-session.html
    websites/staging/mina/trunk/content/mina-project/userguide/ch5-filters/ch5-filters.html
    websites/staging/mina/trunk/content/mina-project/userguide/ch6-transports/apr-transport.html
    websites/staging/mina/trunk/content/mina-project/userguide/ch6-transports/ch6-transports.html
    websites/staging/mina/trunk/content/mina-project/userguide/ch6-transports/serial-transport.html
    websites/staging/mina/trunk/content/mina-project/userguide/ch7-handler/ch7-handler.html
    websites/staging/mina/trunk/content/mina-project/userguide/ch8-iobuffer/ch8-iobuffer.html
    websites/staging/mina/trunk/content/mina-project/userguide/ch9-codec-filter/ch9-codec-filter.html
    websites/staging/mina/trunk/content/mina-project/userguide/user-guide-toc.html
    websites/staging/mina/trunk/content/sshd-project/download_0.1.0.html
    websites/staging/mina/trunk/content/vysper-project/extending_server.html
    websites/staging/mina/trunk/content/vysper-project/getting_involved.html

Propchange: websites/staging/mina/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Thu Nov 22 11:03:00 2012
@@ -1 +1 @@
-1412212
+1412498

Modified: websites/staging/mina/trunk/content/extpaths.txt
==============================================================================
--- websites/staging/mina/trunk/content/extpaths.txt (original)
+++ websites/staging/mina/trunk/content/extpaths.txt Thu Nov 22 11:03:00 2012
@@ -1,4 +1,5 @@
 mina-project/javadocs
+mina-project/apidocs
 mina-project/xref
 mina-project/xref-test
 

Modified: websites/staging/mina/trunk/content/ftpserver-project/configuration_listeners.html
==============================================================================
--- websites/staging/mina/trunk/content/ftpserver-project/configuration_listeners.html (original)
+++ websites/staging/mina/trunk/content/ftpserver-project/configuration_listeners.html Thu Nov 22 11:03:00 2012
@@ -374,7 +374,7 @@
 <tbody>
 <tr>
 <td>class="confluenceTd"&gt; ports</td>
-<td>The ports on which the server is allowed to accept passive data connections, see <a href="configure-passive-ports.html">Configure passive ports</a> for details</td>
+<td>The ports on which the server is allowed to accept passive data connections, see <a href="configure_passive_ports.html">Configure passive ports</a> for details</td>
 <td>No</td>
 <td>Any available port</td>
 </tr>

Added: websites/staging/mina/trunk/content/ftpserver-project/sources.html
==============================================================================
--- websites/staging/mina/trunk/content/ftpserver-project/sources.html (added)
+++ websites/staging/mina/trunk/content/ftpserver-project/sources.html Thu Nov 22 11:03:00 2012
@@ -0,0 +1,170 @@
+<!DOCTYPE html>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<html>
+<head>
+	<title>FtpServer Source &mdash; Apache MINA</title>
+	
+		<link href="./../css/common.css" rel="stylesheet" type="text/css">
+		<link href="./../css/ftpserver.css" rel="stylesheet" type="text/css">
+	
+</head>
+  <body>
+    <div id="container">
+      <div id="header">
+        <div id="subProjectsNavBar">
+          <a href="./../">
+            
+              Apache MINA Project
+            
+          </a>
+          &nbsp;|&nbsp;
+          <a href="./../mina-project/index.html">
+            
+              MINA
+            
+          </a>
+          &nbsp;|&nbsp;
+          <a href="./../asyncweb-project/index.html">
+            
+              AsyncWeb
+            
+          </a>
+          &nbsp;|&nbsp;
+          <a href="./../ftpserver-project/index.html">
+            
+              <strong>FtpServer</strong>
+            
+          </a>
+          &nbsp;|&nbsp;
+          <a href="./../sshd-project/index.html">
+            
+              SSHD
+            
+          </a>
+          &nbsp;|&nbsp;
+          <a href="./../vysper-project/index.html">
+            
+              Vysper
+            
+          </a>
+        </div><!-- subProjectsNavBar -->
+      </div><!-- header -->
+      <div id="content">
+        <div id="leftColumn">
+                              
+          
+          
+            <div id="navigation">
+<h5>Overview</h5>
+  <ul>
+    <li><a href="./../ftpserver-project/index.html">Home</a> </li>
+    <li><a href="./../ftpserver-project/features.html">Features</a> </li>
+    <li><a href="./../ftpserver-project/documentation.html">Documentation</a></li>
+    <li><a href="./../ftpserver-project/downloads.html">Downloads</a></li>
+    <li><a href="./../ftpserver-project/getting_source.html">Sources</a></li>
+    <li><a href="./../ftpserver-project/faq.html">FAQ</a></li>
+    <li><a href="./../ftpserver-project/related_project.html">Related Project</a></li>
+  </ul>
+<h5>Community</h5>
+<ul>
+    <li><a href="./../ftpserver-project/mailing_list.html">Mailing Lists</a></li>
+    <li><a href="./../ftpserver-project/getting_involved.html">Getting Involved</a></li>
+    <li><a href="./../ftpserver-project/reporting_bug.html">Reporting a Bug</a></li>
+    <li><a href="./../ftpserver-project/contributors.html">Contributors</a></li>
+    <li><a href="http://www.apache.org/foundation/contributing.html">Contributing</a></li>
+    <li><a href="http://www.apache.org/licenses/">License</a></li>
+    <li><a href="http://www.apache.org/security/">Security</a></li>
+</ul>
+
+<h5>Sponsorship</h5>
+<ul>
+    <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+    <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+    <li><a href="http://www.apache.org/">apache.org</a></li>
+</div>
+
+<!-- navigation -->
+          
+          
+          
+          
+        </div><!-- leftColumn -->
+      <div id="rightColumn">
+
+
+<h1 id="source">Source</h1>
+<h2 id="overview">Overview</h2>
+<p>This project uses Subversion to manage its source code. Instructions on Subversion use can be found at http://svnbook.red-bean.com/. If you are on Windows, the excellent TortoiseSVN client is highly recommended.</p>
+<h2 id="web-access">Web Access</h2>
+<p>The following is a link to the <a href="http://svn.apache.org/viewvc/mina/ftpserver">online source repository</a>.</p>
+<h2 id="anonymous-access">Anonymous access</h2>
+<p>The source can be checked out anonymously from SVN with this command:</p>
+<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">svn</span> <span class="n">checkout</span> <span class="n">http:</span><span class="sr">//s</span><span class="n">vn</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">org</span><span class="sr">/repos/</span><span class="n">asf</span><span class="sr">/mina/</span><span class="n">ftpserver</span><span class="o">/</span><span class="n">trunk</span> <span class="n">ftpserver</span>
+</pre></div>
+
+
+<h2 id="developer-access">Developer access</h2>
+<p>Everyone can access the Subversion repository via HTTPS, but Committers must checkout the Subversion repository via HTTPS.</p>
+<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">svn</span> <span class="n">checkout</span> <span class="n">https:</span><span class="sr">//s</span><span class="n">vn</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">org</span><span class="sr">/repos/</span><span class="n">asf</span><span class="sr">/mina/</span><span class="n">ftpserver</span><span class="o">/</span><span class="n">trunk</span> <span class="n">ftpserver</span>
+</pre></div>
+
+
+<p>To commit changes to the repository, execute the following command to commit your changes (svn will prompt you for your password)</p>
+<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">svn</span> <span class="n">commit</span> <span class="o">--</span><span class="n">username</span> <span class="n">your</span><span class="o">-</span><span class="n">username</span> <span class="o">-</span><span class="n">m</span> <span class="s">&quot;A message&quot;</span>
+</pre></div>
+
+
+<h2 id="access-from-behind-a-firewall">Access from behind a firewall</h2>
+<p>For those users who are stuck behind a corporate firewall which is blocking http access to the Subversion repository, you can try to access it via the developer connection:</p>
+<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">svn</span> <span class="n">checkout</span> <span class="n">https:</span><span class="sr">//s</span><span class="n">vn</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">org</span><span class="sr">/repos/</span><span class="n">asf</span><span class="sr">/mina/</span><span class="n">ftpserver</span><span class="o">/</span><span class="n">trunk</span> <span class="n">ftpserver</span>
+</pre></div>
+
+
+<h2 id="access-through-a-proxy">Access through a proxy</h2>
+<p>The Subversion client can go through a proxy, if you configure it to do so. First, edit your "servers" configuration file to indicate which proxy to use. The files location depends on your operating system. On Linux or Unix it is located in the directory "~/.subversion". On Windows it is in "%APPDATA%\Subversion". (Try "echo %APPDATA%", note this is a hidden directory.)</p>
+<p>There are comments in the file explaining what to do. If you don't have that file, get the latest Subversion client and run any command; this will cause the configuration directory and template files to be created.</p>
+<p>Example : Edit the 'servers' file and add something like :</p>
+<div class="codehilite"><pre><span class="k">[global]</span>
+<span class="na">http-proxy-host</span> <span class="o">=</span> <span class="s">your.proxy.name</span>
+<span class="na">http-proxy-port</span> <span class="o">=</span> <span class="s">3128</span>
+</pre></div>
+
+                </div><!-- rightColumn -->
+                <div id="endContent"></div>
+            </div><!-- content -->
+            <div id="footer">&copy; 2003-2012, <a href="http://www.apache.org">The Apache Software Foundation</a> - <a href="./../privacy-policy.html">Privacy Policy</a><br />
+                Apache MINA, MINA, Apache Vysper, Vysper, Apache SSHd, SSHd, Apache FtpServer, FtpServer, Apache AsyncWeb, AsyncWeb,
+                Apache, the Apache feather logo, and the Apache Mina project logos are trademarks of The Apache Software Foundation.
+            </div>
+        </div><!-- container -->
+		<script type="text/javascript">
+
+		  var _gaq = _gaq || [];
+		  _gaq.push(['_setAccount', 'UA-11074178-1']);
+		  _gaq.push(['_trackPageview']);
+
+		  (function() {
+		    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+		    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+		    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+		  })();
+
+		</script>
+    </body>
+</html>
+

Modified: websites/staging/mina/trunk/content/mina-project/codec-repo.html
==============================================================================
--- websites/staging/mina/trunk/content/mina-project/codec-repo.html (original)
+++ websites/staging/mina/trunk/content/mina-project/codec-repo.html Thu Nov 22 11:03:00 2012
@@ -92,7 +92,7 @@
       <li><a href="./../mina-project/mailing-lists.html" class="external-link" rel="nofollow">Mailing lists &amp; IRC</a></li>
       <li><a href="./../mina-project/issue-tracking.html" class="external-link" rel="nofollow">Issue tracking</a></li>
       <li><a href="./../mina-project/sources.html" class="external-link" rel="nofollow">Sources</a></li>
-      <li><a href="./../mina-project/javadocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
+      <li><a href="./../mina-project/apidocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
       <li><a href="./../mina-project/performances.html" class="external-link" rel="nofollow">Performances</a></li>
       <li><a href="./../mina-project/testimonials.html" class="external-link" rel="nofollow">Testimonials</a></li>
       <li><a href="./../mina-project/conferences.html" class="external-link" rel="nofollow">Conferences</a></li>
@@ -226,7 +226,7 @@
 </tr>
 <tr>
 <td>XMPP</td>
-<td><a href="http://mina.apache.org/vysper">Vysper</a></td>
+<td><a href="http://mina.apache.org/vysper-project">Vysper</a></td>
 <td>XMPP/XML Codecs. Subproject of MINA.</td>
 </tr>
 <tr>

Modified: websites/staging/mina/trunk/content/mina-project/conferences.html
==============================================================================
--- websites/staging/mina/trunk/content/mina-project/conferences.html (original)
+++ websites/staging/mina/trunk/content/mina-project/conferences.html Thu Nov 22 11:03:00 2012
@@ -92,7 +92,7 @@
       <li><a href="./../mina-project/mailing-lists.html" class="external-link" rel="nofollow">Mailing lists &amp; IRC</a></li>
       <li><a href="./../mina-project/issue-tracking.html" class="external-link" rel="nofollow">Issue tracking</a></li>
       <li><a href="./../mina-project/sources.html" class="external-link" rel="nofollow">Sources</a></li>
-      <li><a href="./../mina-project/javadocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
+      <li><a href="./../mina-project/apidocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
       <li><a href="./../mina-project/performances.html" class="external-link" rel="nofollow">Performances</a></li>
       <li><a href="./../mina-project/testimonials.html" class="external-link" rel="nofollow">Testimonials</a></li>
       <li><a href="./../mina-project/conferences.html" class="external-link" rel="nofollow">Conferences</a></li>

Modified: websites/staging/mina/trunk/content/mina-project/developper-guide.html
==============================================================================
--- websites/staging/mina/trunk/content/mina-project/developper-guide.html (original)
+++ websites/staging/mina/trunk/content/mina-project/developper-guide.html Thu Nov 22 11:03:00 2012
@@ -92,7 +92,7 @@
       <li><a href="./../mina-project/mailing-lists.html" class="external-link" rel="nofollow">Mailing lists &amp; IRC</a></li>
       <li><a href="./../mina-project/issue-tracking.html" class="external-link" rel="nofollow">Issue tracking</a></li>
       <li><a href="./../mina-project/sources.html" class="external-link" rel="nofollow">Sources</a></li>
-      <li><a href="./../mina-project/javadocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
+      <li><a href="./../mina-project/apidocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
       <li><a href="./../mina-project/performances.html" class="external-link" rel="nofollow">Performances</a></li>
       <li><a href="./../mina-project/testimonials.html" class="external-link" rel="nofollow">Testimonials</a></li>
       <li><a href="./../mina-project/conferences.html" class="external-link" rel="nofollow">Conferences</a></li>
@@ -491,7 +491,7 @@ Just after the last module, maven will a
 <h3 id="step-5-update-the-links-in-web-site">Step 5: Update the Links in Web Site</h3>
 <p>Update the links to new distributions in [Downloads] page.</p>
 <h3 id="step-8-update-related-metadata-files">Step 8: Update related metadata file(s)</h3>
-<p>Update <a href="http://svn.apache.org/viewvc/mina/mina/metadata/">any related metadata file(s)</a>.</p>
+<p>Update <a href="http://svn.apache.org/viewvc/mina/metadata/">any related metadata file(s)</a>.</p>
 <h3 id="step-9-wait-another-24-hours">Step 9: Wait another 24 hours</h3>
 <p>We need to wait until any changes made in the web site and metadata file(s) go live.</p>
 <h3 id="step-10-announce-the-new-release">Step 10: Announce the New Release</h3>

Modified: websites/staging/mina/trunk/content/mina-project/documentation.html
==============================================================================
--- websites/staging/mina/trunk/content/mina-project/documentation.html (original)
+++ websites/staging/mina/trunk/content/mina-project/documentation.html Thu Nov 22 11:03:00 2012
@@ -92,7 +92,7 @@
       <li><a href="./../mina-project/mailing-lists.html" class="external-link" rel="nofollow">Mailing lists &amp; IRC</a></li>
       <li><a href="./../mina-project/issue-tracking.html" class="external-link" rel="nofollow">Issue tracking</a></li>
       <li><a href="./../mina-project/sources.html" class="external-link" rel="nofollow">Sources</a></li>
-      <li><a href="./../mina-project/javadocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
+      <li><a href="./../mina-project/apidocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
       <li><a href="./../mina-project/performances.html" class="external-link" rel="nofollow">Performances</a></li>
       <li><a href="./../mina-project/testimonials.html" class="external-link" rel="nofollow">Testimonials</a></li>
       <li><a href="./../mina-project/conferences.html" class="external-link" rel="nofollow">Conferences</a></li>
@@ -169,7 +169,7 @@ The MINA 2.0 User Guide can be found her
 </thead>
 <tbody>
 <tr>
-<td><a href="http://mina.apache.org/mina-project/javadocs/index.html">2.0</a></td>
+<td><a href="http://mina.apache.org/mina-project/apidocs/index.html">2.0</a></td>
 <td><a href="http://mina.apache.org/mina-project/xref/">main</a>, <a href="http://mina.apache.org/mina-project/xref-test/">test</a></td>
 <td>The officially recommended production-ready branch</td>
 </tr>
@@ -208,7 +208,7 @@ The MINA 2.0 User Guide can be found her
 <li><a href="developper-guide.html">Developer Guide</a> - Building &amp; deploying MINA, Coding Standard, and more</li>
 </ul>
 <h2 id="examples">Examples</h2>
-<p>You can browse all examples <a href="http://mina.apache.org/report/trunk/xref/org/apache/mina/example/">here</a>.</p>
+<p>You can browse all examples <a href="http://mina.apache.org/mina-project/xref/org/apache/mina/example/">here</a>.</p>
 <table>
 <thead>
 <tr>

Modified: websites/staging/mina/trunk/content/mina-project/downloads.html
==============================================================================
--- websites/staging/mina/trunk/content/mina-project/downloads.html (original)
+++ websites/staging/mina/trunk/content/mina-project/downloads.html Thu Nov 22 11:03:00 2012
@@ -92,7 +92,7 @@
       <li><a href="./../mina-project/mailing-lists.html" class="external-link" rel="nofollow">Mailing lists &amp; IRC</a></li>
       <li><a href="./../mina-project/issue-tracking.html" class="external-link" rel="nofollow">Issue tracking</a></li>
       <li><a href="./../mina-project/sources.html" class="external-link" rel="nofollow">Sources</a></li>
-      <li><a href="./../mina-project/javadocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
+      <li><a href="./../mina-project/apidocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
       <li><a href="./../mina-project/performances.html" class="external-link" rel="nofollow">Performances</a></li>
       <li><a href="./../mina-project/testimonials.html" class="external-link" rel="nofollow">Testimonials</a></li>
       <li><a href="./../mina-project/conferences.html" class="external-link" rel="nofollow">Conferences</a></li>

Modified: websites/staging/mina/trunk/content/mina-project/faq.html
==============================================================================
--- websites/staging/mina/trunk/content/mina-project/faq.html (original)
+++ websites/staging/mina/trunk/content/mina-project/faq.html Thu Nov 22 11:03:00 2012
@@ -92,7 +92,7 @@
       <li><a href="./../mina-project/mailing-lists.html" class="external-link" rel="nofollow">Mailing lists &amp; IRC</a></li>
       <li><a href="./../mina-project/issue-tracking.html" class="external-link" rel="nofollow">Issue tracking</a></li>
       <li><a href="./../mina-project/sources.html" class="external-link" rel="nofollow">Sources</a></li>
-      <li><a href="./../mina-project/javadocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
+      <li><a href="./../mina-project/apidocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
       <li><a href="./../mina-project/performances.html" class="external-link" rel="nofollow">Performances</a></li>
       <li><a href="./../mina-project/testimonials.html" class="external-link" rel="nofollow">Testimonials</a></li>
       <li><a href="./../mina-project/conferences.html" class="external-link" rel="nofollow">Conferences</a></li>

Modified: websites/staging/mina/trunk/content/mina-project/features.html
==============================================================================
--- websites/staging/mina/trunk/content/mina-project/features.html (original)
+++ websites/staging/mina/trunk/content/mina-project/features.html Thu Nov 22 11:03:00 2012
@@ -92,7 +92,7 @@
       <li><a href="./../mina-project/mailing-lists.html" class="external-link" rel="nofollow">Mailing lists &amp; IRC</a></li>
       <li><a href="./../mina-project/issue-tracking.html" class="external-link" rel="nofollow">Issue tracking</a></li>
       <li><a href="./../mina-project/sources.html" class="external-link" rel="nofollow">Sources</a></li>
-      <li><a href="./../mina-project/javadocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
+      <li><a href="./../mina-project/apidocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
       <li><a href="./../mina-project/performances.html" class="external-link" rel="nofollow">Performances</a></li>
       <li><a href="./../mina-project/testimonials.html" class="external-link" rel="nofollow">Testimonials</a></li>
       <li><a href="./../mina-project/conferences.html" class="external-link" rel="nofollow">Conferences</a></li>

Modified: websites/staging/mina/trunk/content/mina-project/index.html
==============================================================================
--- websites/staging/mina/trunk/content/mina-project/index.html (original)
+++ websites/staging/mina/trunk/content/mina-project/index.html Thu Nov 22 11:03:00 2012
@@ -92,7 +92,7 @@
       <li><a href="./../mina-project/mailing-lists.html" class="external-link" rel="nofollow">Mailing lists &amp; IRC</a></li>
       <li><a href="./../mina-project/issue-tracking.html" class="external-link" rel="nofollow">Issue tracking</a></li>
       <li><a href="./../mina-project/sources.html" class="external-link" rel="nofollow">Sources</a></li>
-      <li><a href="./../mina-project/javadocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
+      <li><a href="./../mina-project/apidocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
       <li><a href="./../mina-project/performances.html" class="external-link" rel="nofollow">Performances</a></li>
       <li><a href="./../mina-project/testimonials.html" class="external-link" rel="nofollow">Testimonials</a></li>
       <li><a href="./../mina-project/conferences.html" class="external-link" rel="nofollow">Conferences</a></li>

Modified: websites/staging/mina/trunk/content/mina-project/issue-tracking.html
==============================================================================
--- websites/staging/mina/trunk/content/mina-project/issue-tracking.html (original)
+++ websites/staging/mina/trunk/content/mina-project/issue-tracking.html Thu Nov 22 11:03:00 2012
@@ -92,7 +92,7 @@
       <li><a href="./../mina-project/mailing-lists.html" class="external-link" rel="nofollow">Mailing lists &amp; IRC</a></li>
       <li><a href="./../mina-project/issue-tracking.html" class="external-link" rel="nofollow">Issue tracking</a></li>
       <li><a href="./../mina-project/sources.html" class="external-link" rel="nofollow">Sources</a></li>
-      <li><a href="./../mina-project/javadocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
+      <li><a href="./../mina-project/apidocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
       <li><a href="./../mina-project/performances.html" class="external-link" rel="nofollow">Performances</a></li>
       <li><a href="./../mina-project/testimonials.html" class="external-link" rel="nofollow">Testimonials</a></li>
       <li><a href="./../mina-project/conferences.html" class="external-link" rel="nofollow">Conferences</a></li>

Modified: websites/staging/mina/trunk/content/mina-project/mailing-lists.html
==============================================================================
--- websites/staging/mina/trunk/content/mina-project/mailing-lists.html (original)
+++ websites/staging/mina/trunk/content/mina-project/mailing-lists.html Thu Nov 22 11:03:00 2012
@@ -92,7 +92,7 @@
       <li><a href="./../mina-project/mailing-lists.html" class="external-link" rel="nofollow">Mailing lists &amp; IRC</a></li>
       <li><a href="./../mina-project/issue-tracking.html" class="external-link" rel="nofollow">Issue tracking</a></li>
       <li><a href="./../mina-project/sources.html" class="external-link" rel="nofollow">Sources</a></li>
-      <li><a href="./../mina-project/javadocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
+      <li><a href="./../mina-project/apidocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
       <li><a href="./../mina-project/performances.html" class="external-link" rel="nofollow">Performances</a></li>
       <li><a href="./../mina-project/testimonials.html" class="external-link" rel="nofollow">Testimonials</a></li>
       <li><a href="./../mina-project/conferences.html" class="external-link" rel="nofollow">Conferences</a></li>

Modified: websites/staging/mina/trunk/content/mina-project/news.html
==============================================================================
--- websites/staging/mina/trunk/content/mina-project/news.html (original)
+++ websites/staging/mina/trunk/content/mina-project/news.html Thu Nov 22 11:03:00 2012
@@ -92,7 +92,7 @@
       <li><a href="./../mina-project/mailing-lists.html" class="external-link" rel="nofollow">Mailing lists &amp; IRC</a></li>
       <li><a href="./../mina-project/issue-tracking.html" class="external-link" rel="nofollow">Issue tracking</a></li>
       <li><a href="./../mina-project/sources.html" class="external-link" rel="nofollow">Sources</a></li>
-      <li><a href="./../mina-project/javadocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
+      <li><a href="./../mina-project/apidocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
       <li><a href="./../mina-project/performances.html" class="external-link" rel="nofollow">Performances</a></li>
       <li><a href="./../mina-project/testimonials.html" class="external-link" rel="nofollow">Testimonials</a></li>
       <li><a href="./../mina-project/conferences.html" class="external-link" rel="nofollow">Conferences</a></li>

Modified: websites/staging/mina/trunk/content/mina-project/performances.html
==============================================================================
--- websites/staging/mina/trunk/content/mina-project/performances.html (original)
+++ websites/staging/mina/trunk/content/mina-project/performances.html Thu Nov 22 11:03:00 2012
@@ -92,7 +92,7 @@
       <li><a href="./../mina-project/mailing-lists.html" class="external-link" rel="nofollow">Mailing lists &amp; IRC</a></li>
       <li><a href="./../mina-project/issue-tracking.html" class="external-link" rel="nofollow">Issue tracking</a></li>
       <li><a href="./../mina-project/sources.html" class="external-link" rel="nofollow">Sources</a></li>
-      <li><a href="./../mina-project/javadocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
+      <li><a href="./../mina-project/apidocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
       <li><a href="./../mina-project/performances.html" class="external-link" rel="nofollow">Performances</a></li>
       <li><a href="./../mina-project/testimonials.html" class="external-link" rel="nofollow">Testimonials</a></li>
       <li><a href="./../mina-project/conferences.html" class="external-link" rel="nofollow">Conferences</a></li>

Modified: websites/staging/mina/trunk/content/mina-project/quick-start-guide.html
==============================================================================
--- websites/staging/mina/trunk/content/mina-project/quick-start-guide.html (original)
+++ websites/staging/mina/trunk/content/mina-project/quick-start-guide.html Thu Nov 22 11:03:00 2012
@@ -92,7 +92,7 @@
       <li><a href="./../mina-project/mailing-lists.html" class="external-link" rel="nofollow">Mailing lists &amp; IRC</a></li>
       <li><a href="./../mina-project/issue-tracking.html" class="external-link" rel="nofollow">Issue tracking</a></li>
       <li><a href="./../mina-project/sources.html" class="external-link" rel="nofollow">Sources</a></li>
-      <li><a href="./../mina-project/javadocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
+      <li><a href="./../mina-project/apidocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
       <li><a href="./../mina-project/performances.html" class="external-link" rel="nofollow">Performances</a></li>
       <li><a href="./../mina-project/testimonials.html" class="external-link" rel="nofollow">Testimonials</a></li>
       <li><a href="./../mina-project/conferences.html" class="external-link" rel="nofollow">Conferences</a></li>

Modified: websites/staging/mina/trunk/content/mina-project/related-projects.html
==============================================================================
--- websites/staging/mina/trunk/content/mina-project/related-projects.html (original)
+++ websites/staging/mina/trunk/content/mina-project/related-projects.html Thu Nov 22 11:03:00 2012
@@ -92,7 +92,7 @@
       <li><a href="./../mina-project/mailing-lists.html" class="external-link" rel="nofollow">Mailing lists &amp; IRC</a></li>
       <li><a href="./../mina-project/issue-tracking.html" class="external-link" rel="nofollow">Issue tracking</a></li>
       <li><a href="./../mina-project/sources.html" class="external-link" rel="nofollow">Sources</a></li>
-      <li><a href="./../mina-project/javadocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
+      <li><a href="./../mina-project/apidocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
       <li><a href="./../mina-project/performances.html" class="external-link" rel="nofollow">Performances</a></li>
       <li><a href="./../mina-project/testimonials.html" class="external-link" rel="nofollow">Testimonials</a></li>
       <li><a href="./../mina-project/conferences.html" class="external-link" rel="nofollow">Conferences</a></li>
@@ -178,7 +178,7 @@
 <p><DIV class="note" markdown="1">
     The projects referred in this section 'Other network application frameworks' are <B>not</B> based on MINA but are their own network application frameworks.  These links are provided for users who want to compare MINA to other network application frameworks.
 </DIV></p>
-<h3 id="grizzly"><a href="https://grizzly.dev.java.net/">Grizzly</a></h3>
+<h3 id="grizzly"><a href="https://grizzly.java.net/">Grizzly</a></h3>
 <p>Grizzly framework has been designed to help developers to take advantage of the Java™ NIO API. Originally developed under the GlassFish umbrella, the framework is now available as a standalone project. Grizzly goals is to help developers to build scalable and robust servers using NIO.</p>
 <h3 id="netty-3"><a href="http://www.jboss.org/netty/">Netty 3</a></h3>
 <p>The new version of Netty Trustin Lee is working on now. The Netty project is an effort to provide an asynchronous event-driven network application framework and tools for rapid development of maintainable high performance and high scalability protocol servers and clients.</p>
@@ -199,7 +199,7 @@
 <p>MailsterSMTP is designed to be a easy to understand Java library which provides a receptive SMTP server component. Using this library, you can easily receive mails using a simple Java interface, extend the set of implemented commands or control how mails are delivered by plugging your custom implementations.</p>
 <h2 id="instant-messaging">Instant Messaging</h2>
 <h3 id="jive-software-openfire"><a href="http://www.jivesoftware.com/products/openfire/">Jive Software Openfire</a></h3>
-<p>Jive Software Openfire implemented <a href="http://www.xmpp.org/">XMPP (Extensible Messaging and Presence Protocol)</a> server on top of Apache MINA. After switching to Apache MINA, <a href="http://www.igniterealtime.org/blog/2006/12/19/scalability-turn-it-to-eleven/">they gained 11 times scalability boost</a>.</p>
+<p>Jive Software Openfire implemented <a href="http://www.xmpp.org/">XMPP (Extensible Messaging and Presence Protocol)</a> server on top of Apache MINA. After switching to Apache MINA, <a href="http://community.igniterealtime.org/blogs/ignite/2006/12/19/scalability-turn-it-to-eleven/">they gained 11 times scalability boost</a>.</p>
 <h2 id="media-storage-streaming">Media Storage &amp; Streaming</h2>
 <h3 id="openlsd"><a href="http://openlsd.free.fr/en/OpenLSD.html">OpenLSD</a></h3>
 <p>OpenLSD is an open source framework for massive document archiving. The web site also contains an interesting performance test report.</p>

Modified: websites/staging/mina/trunk/content/mina-project/road-map.html
==============================================================================
--- websites/staging/mina/trunk/content/mina-project/road-map.html (original)
+++ websites/staging/mina/trunk/content/mina-project/road-map.html Thu Nov 22 11:03:00 2012
@@ -92,7 +92,7 @@
       <li><a href="./../mina-project/mailing-lists.html" class="external-link" rel="nofollow">Mailing lists &amp; IRC</a></li>
       <li><a href="./../mina-project/issue-tracking.html" class="external-link" rel="nofollow">Issue tracking</a></li>
       <li><a href="./../mina-project/sources.html" class="external-link" rel="nofollow">Sources</a></li>
-      <li><a href="./../mina-project/javadocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
+      <li><a href="./../mina-project/apidocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
       <li><a href="./../mina-project/performances.html" class="external-link" rel="nofollow">Performances</a></li>
       <li><a href="./../mina-project/testimonials.html" class="external-link" rel="nofollow">Testimonials</a></li>
       <li><a href="./../mina-project/conferences.html" class="external-link" rel="nofollow">Conferences</a></li>

Modified: websites/staging/mina/trunk/content/mina-project/set-svnprops-tortoisesvn.html
==============================================================================
--- websites/staging/mina/trunk/content/mina-project/set-svnprops-tortoisesvn.html (original)
+++ websites/staging/mina/trunk/content/mina-project/set-svnprops-tortoisesvn.html Thu Nov 22 11:03:00 2012
@@ -92,7 +92,7 @@
       <li><a href="./../mina-project/mailing-lists.html" class="external-link" rel="nofollow">Mailing lists &amp; IRC</a></li>
       <li><a href="./../mina-project/issue-tracking.html" class="external-link" rel="nofollow">Issue tracking</a></li>
       <li><a href="./../mina-project/sources.html" class="external-link" rel="nofollow">Sources</a></li>
-      <li><a href="./../mina-project/javadocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
+      <li><a href="./../mina-project/apidocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
       <li><a href="./../mina-project/performances.html" class="external-link" rel="nofollow">Performances</a></li>
       <li><a href="./../mina-project/testimonials.html" class="external-link" rel="nofollow">Testimonials</a></li>
       <li><a href="./../mina-project/conferences.html" class="external-link" rel="nofollow">Conferences</a></li>

Modified: websites/staging/mina/trunk/content/mina-project/sources.html
==============================================================================
--- websites/staging/mina/trunk/content/mina-project/sources.html (original)
+++ websites/staging/mina/trunk/content/mina-project/sources.html Thu Nov 22 11:03:00 2012
@@ -92,7 +92,7 @@
       <li><a href="./../mina-project/mailing-lists.html" class="external-link" rel="nofollow">Mailing lists &amp; IRC</a></li>
       <li><a href="./../mina-project/issue-tracking.html" class="external-link" rel="nofollow">Issue tracking</a></li>
       <li><a href="./../mina-project/sources.html" class="external-link" rel="nofollow">Sources</a></li>
-      <li><a href="./../mina-project/javadocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
+      <li><a href="./../mina-project/apidocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
       <li><a href="./../mina-project/performances.html" class="external-link" rel="nofollow">Performances</a></li>
       <li><a href="./../mina-project/testimonials.html" class="external-link" rel="nofollow">Testimonials</a></li>
       <li><a href="./../mina-project/conferences.html" class="external-link" rel="nofollow">Conferences</a></li>

Modified: websites/staging/mina/trunk/content/mina-project/testimonials.html
==============================================================================
--- websites/staging/mina/trunk/content/mina-project/testimonials.html (original)
+++ websites/staging/mina/trunk/content/mina-project/testimonials.html Thu Nov 22 11:03:00 2012
@@ -92,7 +92,7 @@
       <li><a href="./../mina-project/mailing-lists.html" class="external-link" rel="nofollow">Mailing lists &amp; IRC</a></li>
       <li><a href="./../mina-project/issue-tracking.html" class="external-link" rel="nofollow">Issue tracking</a></li>
       <li><a href="./../mina-project/sources.html" class="external-link" rel="nofollow">Sources</a></li>
-      <li><a href="./../mina-project/javadocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
+      <li><a href="./../mina-project/apidocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
       <li><a href="./../mina-project/performances.html" class="external-link" rel="nofollow">Performances</a></li>
       <li><a href="./../mina-project/testimonials.html" class="external-link" rel="nofollow">Testimonials</a></li>
       <li><a href="./../mina-project/conferences.html" class="external-link" rel="nofollow">Conferences</a></li>

Modified: websites/staging/mina/trunk/content/mina-project/userguide/ch1-getting-started/ch1-getting-started.html
==============================================================================
--- websites/staging/mina/trunk/content/mina-project/userguide/ch1-getting-started/ch1-getting-started.html (original)
+++ websites/staging/mina/trunk/content/mina-project/userguide/ch1-getting-started/ch1-getting-started.html Thu Nov 22 11:03:00 2012
@@ -92,7 +92,7 @@
       <li><a href="./../../../mina-project/mailing-lists.html" class="external-link" rel="nofollow">Mailing lists &amp; IRC</a></li>
       <li><a href="./../../../mina-project/issue-tracking.html" class="external-link" rel="nofollow">Issue tracking</a></li>
       <li><a href="./../../../mina-project/sources.html" class="external-link" rel="nofollow">Sources</a></li>
-      <li><a href="./../../../mina-project/javadocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
+      <li><a href="./../../../mina-project/apidocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
       <li><a href="./../../../mina-project/performances.html" class="external-link" rel="nofollow">Performances</a></li>
       <li><a href="./../../../mina-project/testimonials.html" class="external-link" rel="nofollow">Testimonials</a></li>
       <li><a href="./../../../mina-project/conferences.html" class="external-link" rel="nofollow">Conferences</a></li>

Modified: websites/staging/mina/trunk/content/mina-project/userguide/ch1-getting-started/features.html
==============================================================================
--- websites/staging/mina/trunk/content/mina-project/userguide/ch1-getting-started/features.html (original)
+++ websites/staging/mina/trunk/content/mina-project/userguide/ch1-getting-started/features.html Thu Nov 22 11:03:00 2012
@@ -92,7 +92,7 @@
       <li><a href="./../../../mina-project/mailing-lists.html" class="external-link" rel="nofollow">Mailing lists &amp; IRC</a></li>
       <li><a href="./../../../mina-project/issue-tracking.html" class="external-link" rel="nofollow">Issue tracking</a></li>
       <li><a href="./../../../mina-project/sources.html" class="external-link" rel="nofollow">Sources</a></li>
-      <li><a href="./../../../mina-project/javadocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
+      <li><a href="./../../../mina-project/apidocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
       <li><a href="./../../../mina-project/performances.html" class="external-link" rel="nofollow">Performances</a></li>
       <li><a href="./../../../mina-project/testimonials.html" class="external-link" rel="nofollow">Testimonials</a></li>
       <li><a href="./../../../mina-project/conferences.html" class="external-link" rel="nofollow">Conferences</a></li>

Modified: websites/staging/mina/trunk/content/mina-project/userguide/ch1-getting-started/first-steps.html
==============================================================================
--- websites/staging/mina/trunk/content/mina-project/userguide/ch1-getting-started/first-steps.html (original)
+++ websites/staging/mina/trunk/content/mina-project/userguide/ch1-getting-started/first-steps.html Thu Nov 22 11:03:00 2012
@@ -92,7 +92,7 @@
       <li><a href="./../../../mina-project/mailing-lists.html" class="external-link" rel="nofollow">Mailing lists &amp; IRC</a></li>
       <li><a href="./../../../mina-project/issue-tracking.html" class="external-link" rel="nofollow">Issue tracking</a></li>
       <li><a href="./../../../mina-project/sources.html" class="external-link" rel="nofollow">Sources</a></li>
-      <li><a href="./../../../mina-project/javadocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
+      <li><a href="./../../../mina-project/apidocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
       <li><a href="./../../../mina-project/performances.html" class="external-link" rel="nofollow">Performances</a></li>
       <li><a href="./../../../mina-project/testimonials.html" class="external-link" rel="nofollow">Testimonials</a></li>
       <li><a href="./../../../mina-project/conferences.html" class="external-link" rel="nofollow">Conferences</a></li>

Modified: websites/staging/mina/trunk/content/mina-project/userguide/ch1-getting-started/nio-overview.html
==============================================================================
--- websites/staging/mina/trunk/content/mina-project/userguide/ch1-getting-started/nio-overview.html (original)
+++ websites/staging/mina/trunk/content/mina-project/userguide/ch1-getting-started/nio-overview.html Thu Nov 22 11:03:00 2012
@@ -92,7 +92,7 @@
       <li><a href="./../../../mina-project/mailing-lists.html" class="external-link" rel="nofollow">Mailing lists &amp; IRC</a></li>
       <li><a href="./../../../mina-project/issue-tracking.html" class="external-link" rel="nofollow">Issue tracking</a></li>
       <li><a href="./../../../mina-project/sources.html" class="external-link" rel="nofollow">Sources</a></li>
-      <li><a href="./../../../mina-project/javadocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
+      <li><a href="./../../../mina-project/apidocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
       <li><a href="./../../../mina-project/performances.html" class="external-link" rel="nofollow">Performances</a></li>
       <li><a href="./../../../mina-project/testimonials.html" class="external-link" rel="nofollow">Testimonials</a></li>
       <li><a href="./../../../mina-project/conferences.html" class="external-link" rel="nofollow">Conferences</a></li>

Modified: websites/staging/mina/trunk/content/mina-project/userguide/ch1-getting-started/summary.html
==============================================================================
--- websites/staging/mina/trunk/content/mina-project/userguide/ch1-getting-started/summary.html (original)
+++ websites/staging/mina/trunk/content/mina-project/userguide/ch1-getting-started/summary.html Thu Nov 22 11:03:00 2012
@@ -92,7 +92,7 @@
       <li><a href="./../../../mina-project/mailing-lists.html" class="external-link" rel="nofollow">Mailing lists &amp; IRC</a></li>
       <li><a href="./../../../mina-project/issue-tracking.html" class="external-link" rel="nofollow">Issue tracking</a></li>
       <li><a href="./../../../mina-project/sources.html" class="external-link" rel="nofollow">Sources</a></li>
-      <li><a href="./../../../mina-project/javadocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
+      <li><a href="./../../../mina-project/apidocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
       <li><a href="./../../../mina-project/performances.html" class="external-link" rel="nofollow">Performances</a></li>
       <li><a href="./../../../mina-project/testimonials.html" class="external-link" rel="nofollow">Testimonials</a></li>
       <li><a href="./../../../mina-project/conferences.html" class="external-link" rel="nofollow">Conferences</a></li>

Modified: websites/staging/mina/trunk/content/mina-project/userguide/ch1-getting-started/why-mina.html
==============================================================================
--- websites/staging/mina/trunk/content/mina-project/userguide/ch1-getting-started/why-mina.html (original)
+++ websites/staging/mina/trunk/content/mina-project/userguide/ch1-getting-started/why-mina.html Thu Nov 22 11:03:00 2012
@@ -92,7 +92,7 @@
       <li><a href="./../../../mina-project/mailing-lists.html" class="external-link" rel="nofollow">Mailing lists &amp; IRC</a></li>
       <li><a href="./../../../mina-project/issue-tracking.html" class="external-link" rel="nofollow">Issue tracking</a></li>
       <li><a href="./../../../mina-project/sources.html" class="external-link" rel="nofollow">Sources</a></li>
-      <li><a href="./../../../mina-project/javadocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
+      <li><a href="./../../../mina-project/apidocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
       <li><a href="./../../../mina-project/performances.html" class="external-link" rel="nofollow">Performances</a></li>
       <li><a href="./../../../mina-project/testimonials.html" class="external-link" rel="nofollow">Testimonials</a></li>
       <li><a href="./../../../mina-project/conferences.html" class="external-link" rel="nofollow">Conferences</a></li>

Modified: websites/staging/mina/trunk/content/mina-project/userguide/ch10-executor-filter/ch10-executor-filter.html
==============================================================================
--- websites/staging/mina/trunk/content/mina-project/userguide/ch10-executor-filter/ch10-executor-filter.html (original)
+++ websites/staging/mina/trunk/content/mina-project/userguide/ch10-executor-filter/ch10-executor-filter.html Thu Nov 22 11:03:00 2012
@@ -92,7 +92,7 @@
       <li><a href="./../../../mina-project/mailing-lists.html" class="external-link" rel="nofollow">Mailing lists &amp; IRC</a></li>
       <li><a href="./../../../mina-project/issue-tracking.html" class="external-link" rel="nofollow">Issue tracking</a></li>
       <li><a href="./../../../mina-project/sources.html" class="external-link" rel="nofollow">Sources</a></li>
-      <li><a href="./../../../mina-project/javadocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
+      <li><a href="./../../../mina-project/apidocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
       <li><a href="./../../../mina-project/performances.html" class="external-link" rel="nofollow">Performances</a></li>
       <li><a href="./../../../mina-project/testimonials.html" class="external-link" rel="nofollow">Testimonials</a></li>
       <li><a href="./../../../mina-project/conferences.html" class="external-link" rel="nofollow">Conferences</a></li>

Modified: websites/staging/mina/trunk/content/mina-project/userguide/ch11-ssl-filter/ch11-ssl-filter.html
==============================================================================
--- websites/staging/mina/trunk/content/mina-project/userguide/ch11-ssl-filter/ch11-ssl-filter.html (original)
+++ websites/staging/mina/trunk/content/mina-project/userguide/ch11-ssl-filter/ch11-ssl-filter.html Thu Nov 22 11:03:00 2012
@@ -92,7 +92,7 @@
       <li><a href="./../../../mina-project/mailing-lists.html" class="external-link" rel="nofollow">Mailing lists &amp; IRC</a></li>
       <li><a href="./../../../mina-project/issue-tracking.html" class="external-link" rel="nofollow">Issue tracking</a></li>
       <li><a href="./../../../mina-project/sources.html" class="external-link" rel="nofollow">Sources</a></li>
-      <li><a href="./../../../mina-project/javadocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
+      <li><a href="./../../../mina-project/apidocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
       <li><a href="./../../../mina-project/performances.html" class="external-link" rel="nofollow">Performances</a></li>
       <li><a href="./../../../mina-project/testimonials.html" class="external-link" rel="nofollow">Testimonials</a></li>
       <li><a href="./../../../mina-project/conferences.html" class="external-link" rel="nofollow">Conferences</a></li>

Modified: websites/staging/mina/trunk/content/mina-project/userguide/ch12-logging-filter/ch12-logging-filter.html
==============================================================================
--- websites/staging/mina/trunk/content/mina-project/userguide/ch12-logging-filter/ch12-logging-filter.html (original)
+++ websites/staging/mina/trunk/content/mina-project/userguide/ch12-logging-filter/ch12-logging-filter.html Thu Nov 22 11:03:00 2012
@@ -92,7 +92,7 @@
       <li><a href="./../../../mina-project/mailing-lists.html" class="external-link" rel="nofollow">Mailing lists &amp; IRC</a></li>
       <li><a href="./../../../mina-project/issue-tracking.html" class="external-link" rel="nofollow">Issue tracking</a></li>
       <li><a href="./../../../mina-project/sources.html" class="external-link" rel="nofollow">Sources</a></li>
-      <li><a href="./../../../mina-project/javadocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
+      <li><a href="./../../../mina-project/apidocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
       <li><a href="./../../../mina-project/performances.html" class="external-link" rel="nofollow">Performances</a></li>
       <li><a href="./../../../mina-project/testimonials.html" class="external-link" rel="nofollow">Testimonials</a></li>
       <li><a href="./../../../mina-project/conferences.html" class="external-link" rel="nofollow">Conferences</a></li>

Modified: websites/staging/mina/trunk/content/mina-project/userguide/ch13-debugging/ch13-debugging.html
==============================================================================
--- websites/staging/mina/trunk/content/mina-project/userguide/ch13-debugging/ch13-debugging.html (original)
+++ websites/staging/mina/trunk/content/mina-project/userguide/ch13-debugging/ch13-debugging.html Thu Nov 22 11:03:00 2012
@@ -92,7 +92,7 @@
       <li><a href="./../../../mina-project/mailing-lists.html" class="external-link" rel="nofollow">Mailing lists &amp; IRC</a></li>
       <li><a href="./../../../mina-project/issue-tracking.html" class="external-link" rel="nofollow">Issue tracking</a></li>
       <li><a href="./../../../mina-project/sources.html" class="external-link" rel="nofollow">Sources</a></li>
-      <li><a href="./../../../mina-project/javadocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
+      <li><a href="./../../../mina-project/apidocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
       <li><a href="./../../../mina-project/performances.html" class="external-link" rel="nofollow">Performances</a></li>
       <li><a href="./../../../mina-project/testimonials.html" class="external-link" rel="nofollow">Testimonials</a></li>
       <li><a href="./../../../mina-project/conferences.html" class="external-link" rel="nofollow">Conferences</a></li>

Modified: websites/staging/mina/trunk/content/mina-project/userguide/ch14-state-machine/ch14-state-machine.html
==============================================================================
--- websites/staging/mina/trunk/content/mina-project/userguide/ch14-state-machine/ch14-state-machine.html (original)
+++ websites/staging/mina/trunk/content/mina-project/userguide/ch14-state-machine/ch14-state-machine.html Thu Nov 22 11:03:00 2012
@@ -92,7 +92,7 @@
       <li><a href="./../../../mina-project/mailing-lists.html" class="external-link" rel="nofollow">Mailing lists &amp; IRC</a></li>
       <li><a href="./../../../mina-project/issue-tracking.html" class="external-link" rel="nofollow">Issue tracking</a></li>
       <li><a href="./../../../mina-project/sources.html" class="external-link" rel="nofollow">Sources</a></li>
-      <li><a href="./../../../mina-project/javadocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
+      <li><a href="./../../../mina-project/apidocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
       <li><a href="./../../../mina-project/performances.html" class="external-link" rel="nofollow">Performances</a></li>
       <li><a href="./../../../mina-project/testimonials.html" class="external-link" rel="nofollow">Testimonials</a></li>
       <li><a href="./../../../mina-project/conferences.html" class="external-link" rel="nofollow">Conferences</a></li>

Modified: websites/staging/mina/trunk/content/mina-project/userguide/ch15-proxy/ch15-proxy.html
==============================================================================
--- websites/staging/mina/trunk/content/mina-project/userguide/ch15-proxy/ch15-proxy.html (original)
+++ websites/staging/mina/trunk/content/mina-project/userguide/ch15-proxy/ch15-proxy.html Thu Nov 22 11:03:00 2012
@@ -92,7 +92,7 @@
       <li><a href="./../../../mina-project/mailing-lists.html" class="external-link" rel="nofollow">Mailing lists &amp; IRC</a></li>
       <li><a href="./../../../mina-project/issue-tracking.html" class="external-link" rel="nofollow">Issue tracking</a></li>
       <li><a href="./../../../mina-project/sources.html" class="external-link" rel="nofollow">Sources</a></li>
-      <li><a href="./../../../mina-project/javadocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
+      <li><a href="./../../../mina-project/apidocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
       <li><a href="./../../../mina-project/performances.html" class="external-link" rel="nofollow">Performances</a></li>
       <li><a href="./../../../mina-project/testimonials.html" class="external-link" rel="nofollow">Testimonials</a></li>
       <li><a href="./../../../mina-project/conferences.html" class="external-link" rel="nofollow">Conferences</a></li>

Modified: websites/staging/mina/trunk/content/mina-project/userguide/ch16-jmx-support/ch16-jmx-support.html
==============================================================================
--- websites/staging/mina/trunk/content/mina-project/userguide/ch16-jmx-support/ch16-jmx-support.html (original)
+++ websites/staging/mina/trunk/content/mina-project/userguide/ch16-jmx-support/ch16-jmx-support.html Thu Nov 22 11:03:00 2012
@@ -92,7 +92,7 @@
       <li><a href="./../../../mina-project/mailing-lists.html" class="external-link" rel="nofollow">Mailing lists &amp; IRC</a></li>
       <li><a href="./../../../mina-project/issue-tracking.html" class="external-link" rel="nofollow">Issue tracking</a></li>
       <li><a href="./../../../mina-project/sources.html" class="external-link" rel="nofollow">Sources</a></li>
-      <li><a href="./../../../mina-project/javadocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
+      <li><a href="./../../../mina-project/apidocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
       <li><a href="./../../../mina-project/performances.html" class="external-link" rel="nofollow">Performances</a></li>
       <li><a href="./../../../mina-project/testimonials.html" class="external-link" rel="nofollow">Testimonials</a></li>
       <li><a href="./../../../mina-project/conferences.html" class="external-link" rel="nofollow">Conferences</a></li>

Modified: websites/staging/mina/trunk/content/mina-project/userguide/ch17-spring-integration/ch17-spring-integration.html
==============================================================================
--- websites/staging/mina/trunk/content/mina-project/userguide/ch17-spring-integration/ch17-spring-integration.html (original)
+++ websites/staging/mina/trunk/content/mina-project/userguide/ch17-spring-integration/ch17-spring-integration.html Thu Nov 22 11:03:00 2012
@@ -92,7 +92,7 @@
       <li><a href="./../../../mina-project/mailing-lists.html" class="external-link" rel="nofollow">Mailing lists &amp; IRC</a></li>
       <li><a href="./../../../mina-project/issue-tracking.html" class="external-link" rel="nofollow">Issue tracking</a></li>
       <li><a href="./../../../mina-project/sources.html" class="external-link" rel="nofollow">Sources</a></li>
-      <li><a href="./../../../mina-project/javadocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
+      <li><a href="./../../../mina-project/apidocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
       <li><a href="./../../../mina-project/performances.html" class="external-link" rel="nofollow">Performances</a></li>
       <li><a href="./../../../mina-project/testimonials.html" class="external-link" rel="nofollow">Testimonials</a></li>
       <li><a href="./../../../mina-project/conferences.html" class="external-link" rel="nofollow">Conferences</a></li>
@@ -196,7 +196,7 @@
 </ul>
 <p>NOTE: The latest MINA releases doesn't have the package specific to Spring, like its earlier versions. The package is now named Integration Beans, to make the implementation work for all DI frameworks.</p>
 <p>Lets see the Spring xml file. Please see that I have removed generic part from xml and have put only the specific things needed to pull up the implementation.
-This example has been derived from <a href="http://svn.apache.org/viewvc/mina/branches/1.0/example/src/main/java/org/apache/mina/example/chat/">Chat example</a> shipped with MINA release. Please refer the xml shipped with chat example.</p>
+This example has been derived from <a href="http://svn.apache.org/viewvc/mina/mina/branches/2.0/example/src/main/java/org/apache/mina/example/chat/">Chat example</a> shipped with MINA release. Please refer the xml shipped with chat example.</p>
 <p>Now lets pull things together</p>
 <p>Lets set the IO Handler in the spring context file</p>
 <div class="codehilite"><pre><span class="c">&lt;!-- The IoHandler implementation --&gt;</span>

Modified: websites/staging/mina/trunk/content/mina-project/userguide/ch2-basics/application-architecture.html
==============================================================================
--- websites/staging/mina/trunk/content/mina-project/userguide/ch2-basics/application-architecture.html (original)
+++ websites/staging/mina/trunk/content/mina-project/userguide/ch2-basics/application-architecture.html Thu Nov 22 11:03:00 2012
@@ -92,7 +92,7 @@
       <li><a href="./../../../mina-project/mailing-lists.html" class="external-link" rel="nofollow">Mailing lists &amp; IRC</a></li>
       <li><a href="./../../../mina-project/issue-tracking.html" class="external-link" rel="nofollow">Issue tracking</a></li>
       <li><a href="./../../../mina-project/sources.html" class="external-link" rel="nofollow">Sources</a></li>
-      <li><a href="./../../../mina-project/javadocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
+      <li><a href="./../../../mina-project/apidocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
       <li><a href="./../../../mina-project/performances.html" class="external-link" rel="nofollow">Performances</a></li>
       <li><a href="./../../../mina-project/testimonials.html" class="external-link" rel="nofollow">Testimonials</a></li>
       <li><a href="./../../../mina-project/conferences.html" class="external-link" rel="nofollow">Conferences</a></li>

Modified: websites/staging/mina/trunk/content/mina-project/userguide/ch2-basics/ch2-basics.html
==============================================================================
--- websites/staging/mina/trunk/content/mina-project/userguide/ch2-basics/ch2-basics.html (original)
+++ websites/staging/mina/trunk/content/mina-project/userguide/ch2-basics/ch2-basics.html Thu Nov 22 11:03:00 2012
@@ -92,7 +92,7 @@
       <li><a href="./../../../mina-project/mailing-lists.html" class="external-link" rel="nofollow">Mailing lists &amp; IRC</a></li>
       <li><a href="./../../../mina-project/issue-tracking.html" class="external-link" rel="nofollow">Issue tracking</a></li>
       <li><a href="./../../../mina-project/sources.html" class="external-link" rel="nofollow">Sources</a></li>
-      <li><a href="./../../../mina-project/javadocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
+      <li><a href="./../../../mina-project/apidocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
       <li><a href="./../../../mina-project/performances.html" class="external-link" rel="nofollow">Performances</a></li>
       <li><a href="./../../../mina-project/testimonials.html" class="external-link" rel="nofollow">Testimonials</a></li>
       <li><a href="./../../../mina-project/conferences.html" class="external-link" rel="nofollow">Conferences</a></li>

Modified: websites/staging/mina/trunk/content/mina-project/userguide/ch2-basics/client-architecture.html
==============================================================================
--- websites/staging/mina/trunk/content/mina-project/userguide/ch2-basics/client-architecture.html (original)
+++ websites/staging/mina/trunk/content/mina-project/userguide/ch2-basics/client-architecture.html Thu Nov 22 11:03:00 2012
@@ -92,7 +92,7 @@
       <li><a href="./../../../mina-project/mailing-lists.html" class="external-link" rel="nofollow">Mailing lists &amp; IRC</a></li>
       <li><a href="./../../../mina-project/issue-tracking.html" class="external-link" rel="nofollow">Issue tracking</a></li>
       <li><a href="./../../../mina-project/sources.html" class="external-link" rel="nofollow">Sources</a></li>
-      <li><a href="./../../../mina-project/javadocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
+      <li><a href="./../../../mina-project/apidocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
       <li><a href="./../../../mina-project/performances.html" class="external-link" rel="nofollow">Performances</a></li>
       <li><a href="./../../../mina-project/testimonials.html" class="external-link" rel="nofollow">Testimonials</a></li>
       <li><a href="./../../../mina-project/conferences.html" class="external-link" rel="nofollow">Conferences</a></li>

Modified: websites/staging/mina/trunk/content/mina-project/userguide/ch2-basics/sample-tcp-client.html
==============================================================================
--- websites/staging/mina/trunk/content/mina-project/userguide/ch2-basics/sample-tcp-client.html (original)
+++ websites/staging/mina/trunk/content/mina-project/userguide/ch2-basics/sample-tcp-client.html Thu Nov 22 11:03:00 2012
@@ -92,7 +92,7 @@
       <li><a href="./../../../mina-project/mailing-lists.html" class="external-link" rel="nofollow">Mailing lists &amp; IRC</a></li>
       <li><a href="./../../../mina-project/issue-tracking.html" class="external-link" rel="nofollow">Issue tracking</a></li>
       <li><a href="./../../../mina-project/sources.html" class="external-link" rel="nofollow">Sources</a></li>
-      <li><a href="./../../../mina-project/javadocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
+      <li><a href="./../../../mina-project/apidocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
       <li><a href="./../../../mina-project/performances.html" class="external-link" rel="nofollow">Performances</a></li>
       <li><a href="./../../../mina-project/testimonials.html" class="external-link" rel="nofollow">Testimonials</a></li>
       <li><a href="./../../../mina-project/conferences.html" class="external-link" rel="nofollow">Conferences</a></li>
@@ -154,7 +154,7 @@
 
 <h1 id="sample-tcp-client">Sample TCP Client</h1>
 <p>We have seen the Client Architecture. Lets explore a sample Client implementation.</p>
-<p>We shall use <a href="http://mina.apache.org/report/trunk/xref/org/apache/mina/example/sumup/Client.html">Sumup Client</a> as a reference implementation.</p>
+<p>We shall use <a href="http://mina.apache.org/mina-project/xref/org/apache/mina/example/sumup/Client.html">Sumup Client</a> as a reference implementation.</p>
 <p>We will remove boiler plate code and concentrate on the important constructs. Below the code for the Client :</p>
 <div class="codehilite"><pre><span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="n">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="kd">throws</span> <span class="n">Throwable</span> <span class="o">{</span>
     <span class="n">NioSocketConnector</span> <span class="n">connector</span> <span class="o">=</span> <span class="k">new</span> <span class="n">NioSocketConnector</span><span class="o">();</span>
@@ -223,7 +223,7 @@
 </pre></div>
 
 
-<p>Here we create an instance of <a href="http://mina.apache.org/report/trunk/xref/org/apache/mina/example/sumup/ClientSessionHandler.html">ClientSessionHandler</a> and set it as a handler for the Connector.</p>
+<p>Here we create an instance of <a href="http://mina.apache.org/mina-project/xref/org/apache/mina/example/sumup/ClientSessionHandler.html">ClientSessionHandler</a> and set it as a handler for the Connector.</p>
 <h2 id="bind-to-server">Bind to Server</h2>
 <div class="codehilite"><pre><span class="n">IoSession</span> <span class="n">session</span><span class="o">;</span>
 
@@ -242,8 +242,8 @@
 </pre></div>
 
 
-<p>Here is the most important stuff. We connect to remote Server. Since, connect is an async task, we use the <a href="http://mina.apache.org/report/trunk/xref/org/apache/mina/core/future/ConnectFuture.html">ConnectFuture</a> class to know the when the connection is complete.
-Once the connection is complete, we get the associated <a href="http://mina.apache.org/report/trunk/xref/org/apache/mina/core/session/IoSession.html">IoSession</a>. To send any message to the Server, we shall have to write to the session. All responses/messages from server shall traverse the Filter chain and finally be handled in IoHandler.</p>
+<p>Here is the most important stuff. We connect to remote Server. Since, connect is an async task, we use the <a href="http://mina.apache.org/mina-project/xref/org/apache/mina/core/future/ConnectFuture.html">ConnectFuture</a> class to know the when the connection is complete.
+Once the connection is complete, we get the associated <a href="http://mina.apache.org/mina-project/xref/org/apache/mina/core/session/IoSession.html">IoSession</a>. To send any message to the Server, we shall have to write to the session. All responses/messages from server shall traverse the Filter chain and finally be handled in IoHandler.</p>
 
 
     <div class="nav">

Modified: websites/staging/mina/trunk/content/mina-project/userguide/ch2-basics/sample-tcp-server.html
==============================================================================
--- websites/staging/mina/trunk/content/mina-project/userguide/ch2-basics/sample-tcp-server.html (original)
+++ websites/staging/mina/trunk/content/mina-project/userguide/ch2-basics/sample-tcp-server.html Thu Nov 22 11:03:00 2012
@@ -92,7 +92,7 @@
       <li><a href="./../../../mina-project/mailing-lists.html" class="external-link" rel="nofollow">Mailing lists &amp; IRC</a></li>
       <li><a href="./../../../mina-project/issue-tracking.html" class="external-link" rel="nofollow">Issue tracking</a></li>
       <li><a href="./../../../mina-project/sources.html" class="external-link" rel="nofollow">Sources</a></li>
-      <li><a href="./../../../mina-project/javadocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
+      <li><a href="./../../../mina-project/apidocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
       <li><a href="./../../../mina-project/performances.html" class="external-link" rel="nofollow">Performances</a></li>
       <li><a href="./../../../mina-project/testimonials.html" class="external-link" rel="nofollow">Testimonials</a></li>
       <li><a href="./../../../mina-project/conferences.html" class="external-link" rel="nofollow">Conferences</a></li>
@@ -166,7 +166,7 @@
 </li>
 </ul>
 <p>For instance, slf4j-log4j12.jar and log4j-1.3.x.jar can not be used together, and will malfunction.</p>
-<p>We have tested this program on both Windows© 2000 professional and linux.  If you have any problems getting this program to work, please do not hesitate to <a href="{{base}}contact.html">contact us</a> in order to talk to the MINA developers.  Also, this tutorial has tried to remain independent of development environments (IDE, editors..etc).  This tutorial will work with any environment that you are comfortable with.  Compilation commands and steps to execute the program have been removed for brevity.  If you need help learning how to either compile or execute java programs, please consult the <a href="http://java.sun.com/docs/books/tutorial/">Java tutorial</a>.</p>
+<p>We have tested this program on both Windows© 2000 professional and linux.  If you have any problems getting this program to work, please do not hesitate to <a href="../../contact.html">contact us</a> in order to talk to the MINA developers.  Also, this tutorial has tried to remain independent of development environments (IDE, editors..etc).  This tutorial will work with any environment that you are comfortable with.  Compilation commands and steps to execute the program have been removed for brevity.  If you need help learning how to either compile or execute java programs, please consult the <a href="http://java.sun.com/docs/books/tutorial/">Java tutorial</a>.</p>
 <h2 id="writing-the-mina-time-server">Writing the MINA time server</h2>
 <p>We will begin by creating a file called MinaTimeServer.java. The initial code can be found below:</p>
 <div class="codehilite"><pre><span class="kd">public</span> <span class="kd">class</span> <span class="nc">MinaTimeServer</span> <span class="o">{</span>

Modified: websites/staging/mina/trunk/content/mina-project/userguide/ch2-basics/sample-udp-client.html
==============================================================================
--- websites/staging/mina/trunk/content/mina-project/userguide/ch2-basics/sample-udp-client.html (original)
+++ websites/staging/mina/trunk/content/mina-project/userguide/ch2-basics/sample-udp-client.html Thu Nov 22 11:03:00 2012
@@ -92,7 +92,7 @@
       <li><a href="./../../../mina-project/mailing-lists.html" class="external-link" rel="nofollow">Mailing lists &amp; IRC</a></li>
       <li><a href="./../../../mina-project/issue-tracking.html" class="external-link" rel="nofollow">Issue tracking</a></li>
       <li><a href="./../../../mina-project/sources.html" class="external-link" rel="nofollow">Sources</a></li>
-      <li><a href="./../../../mina-project/javadocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
+      <li><a href="./../../../mina-project/apidocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
       <li><a href="./../../../mina-project/performances.html" class="external-link" rel="nofollow">Performances</a></li>
       <li><a href="./../../../mina-project/testimonials.html" class="external-link" rel="nofollow">Testimonials</a></li>
       <li><a href="./../../../mina-project/conferences.html" class="external-link" rel="nofollow">Conferences</a></li>
@@ -161,7 +161,7 @@
 <li>Collect free memory</li>
 <li>Send the Data to the Server</li>
 </ul>
-<p>We will begin by looking at the file <a href="http://mina.apache.org/report/trunk/xref/org/apache/mina/example/udp/client/MemMonClient.html">MemMonClient.java</a>, found in the org.apache.mina.example.udp.client java package. The first few lines of the code are simple and straightforward.</p>
+<p>We will begin by looking at the file <a href="http://mina.apache.org/mina-project/xref/org/apache/mina/example/udp/client/MemMonClient.html">MemMonClient.java</a>, found in the org.apache.mina.example.udp.client java package. The first few lines of the code are simple and straightforward.</p>
 <div class="codehilite"><pre><span class="n">connector</span> <span class="o">=</span> <span class="k">new</span> <span class="n">NioDatagramConnector</span><span class="o">();</span>
 <span class="n">connector</span><span class="o">.</span><span class="na">setHandler</span><span class="o">(</span> <span class="k">this</span> <span class="o">);</span>
 <span class="n">ConnectFuture</span> <span class="n">connFuture</span> <span class="o">=</span> <span class="n">connector</span><span class="o">.</span><span class="na">connect</span><span class="o">(</span> <span class="k">new</span> <span class="n">InetSocketAddress</span><span class="o">(</span><span class="s">&quot;localhost&quot;</span><span class="o">,</span> <span class="n">MemoryMonitor</span><span class="o">.</span><span class="na">PORT</span> <span class="o">));</span>

Modified: websites/staging/mina/trunk/content/mina-project/userguide/ch2-basics/sample-udp-server.html
==============================================================================
--- websites/staging/mina/trunk/content/mina-project/userguide/ch2-basics/sample-udp-server.html (original)
+++ websites/staging/mina/trunk/content/mina-project/userguide/ch2-basics/sample-udp-server.html Thu Nov 22 11:03:00 2012
@@ -92,7 +92,7 @@
       <li><a href="./../../../mina-project/mailing-lists.html" class="external-link" rel="nofollow">Mailing lists &amp; IRC</a></li>
       <li><a href="./../../../mina-project/issue-tracking.html" class="external-link" rel="nofollow">Issue tracking</a></li>
       <li><a href="./../../../mina-project/sources.html" class="external-link" rel="nofollow">Sources</a></li>
-      <li><a href="./../../../mina-project/javadocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
+      <li><a href="./../../../mina-project/apidocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
       <li><a href="./../../../mina-project/performances.html" class="external-link" rel="nofollow">Performances</a></li>
       <li><a href="./../../../mina-project/testimonials.html" class="external-link" rel="nofollow">Testimonials</a></li>
       <li><a href="./../../../mina-project/conferences.html" class="external-link" rel="nofollow">Conferences</a></li>
@@ -153,11 +153,11 @@
 
 
 <h1 id="sample-udp-server">Sample UDP Server</h1>
-<p>We will begin by looking at the code found in the <a href="http://mina.apache.org/report/trunk/xref/org/apache/mina/example/udp/package-summary.html">org.apache.mina.example.udp</a> package. To keep life simple, we shall concentrate on MINA related constructs only.</p>
+<p>We will begin by looking at the code found in the <a href="http://mina.apache.org/mina-project/xref/org/apache/mina/example/udp/package-summary.html">org.apache.mina.example.udp</a> package. To keep life simple, we shall concentrate on MINA related constructs only.</p>
 <p>To construct the server, we shall have to do the following:</p>
 <ol>
-<li>Create a Datagram Socket to listen for incoming Client requests (See <a href="http://mina.apache.org/report/trunk/xref/org/apache/mina/example/udp/MemoryMonitor.html">MemoryMonitor.java</a>)</li>
-<li>Create an IoHandler to handle the MINA framework generated events (See <a href="http://mina.apache.org/report/trunk/xref/org/apache/mina/example/udp/MemoryMonitorHandler.html">MemoryMonitorHandler.java</a>)</li>
+<li>Create a Datagram Socket to listen for incoming Client requests (See <a href="http://mina.apache.org/mina-project/xref/org/apache/mina/example/udp/MemoryMonitor.html">MemoryMonitor.java</a>)</li>
+<li>Create an IoHandler to handle the MINA framework generated events (See <a href="http://mina.apache.org/mina-project/xref/org/apache/mina/example/udp/MemoryMonitorHandler.html">MemoryMonitorHandler.java</a>)</li>
 </ol>
 <p>Here is the first snippet that addresses Point# 1:</p>
 <div class="codehilite"><pre><span class="n">NioDatagramAcceptor</span> <span class="n">acceptor</span> <span class="o">=</span> <span class="k">new</span> <span class="n">NioDatagramAcceptor</span><span class="o">();</span>

Modified: websites/staging/mina/trunk/content/mina-project/userguide/ch2-basics/server-architecture.html
==============================================================================
--- websites/staging/mina/trunk/content/mina-project/userguide/ch2-basics/server-architecture.html (original)
+++ websites/staging/mina/trunk/content/mina-project/userguide/ch2-basics/server-architecture.html Thu Nov 22 11:03:00 2012
@@ -92,7 +92,7 @@
       <li><a href="./../../../mina-project/mailing-lists.html" class="external-link" rel="nofollow">Mailing lists &amp; IRC</a></li>
       <li><a href="./../../../mina-project/issue-tracking.html" class="external-link" rel="nofollow">Issue tracking</a></li>
       <li><a href="./../../../mina-project/sources.html" class="external-link" rel="nofollow">Sources</a></li>
-      <li><a href="./../../../mina-project/javadocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
+      <li><a href="./../../../mina-project/apidocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
       <li><a href="./../../../mina-project/performances.html" class="external-link" rel="nofollow">Performances</a></li>
       <li><a href="./../../../mina-project/testimonials.html" class="external-link" rel="nofollow">Testimonials</a></li>
       <li><a href="./../../../mina-project/conferences.html" class="external-link" rel="nofollow">Conferences</a></li>
@@ -153,7 +153,7 @@
 
 
 <h1 id="server-architecture">Server Architecture</h1>
-<p>We have exposed the <strong>MINA</strong> Application Architecture in the previous section. Let's now focus on the Server Architecture. Basically, a Server listens on a port for incoming requests, process them and send replies. It also creates and handles a session for each client (whenever we have a TCP or UDP based protocol), this will be explain more extensively in the <a href="../ch4/ch4.html">chapter 4</a>.</p>
+<p>We have exposed the <strong>MINA</strong> Application Architecture in the previous section. Let's now focus on the Server Architecture. Basically, a Server listens on a port for incoming requests, process them and send replies. It also creates and handles a session for each client (whenever we have a TCP or UDP based protocol), this will be explain more extensively in the <a href="../ch4-session/ch4-session.html">chapter 4</a>.</p>
 <p><img alt="" src="../../../staticresources/images/mina/Server_arch.png" /></p>
 <ul>
 <li>IOAcceptor listens on the network for incoming connections/packets</li>

Modified: websites/staging/mina/trunk/content/mina-project/userguide/ch2-basics/summary.html
==============================================================================
--- websites/staging/mina/trunk/content/mina-project/userguide/ch2-basics/summary.html (original)
+++ websites/staging/mina/trunk/content/mina-project/userguide/ch2-basics/summary.html Thu Nov 22 11:03:00 2012
@@ -92,7 +92,7 @@
       <li><a href="./../../../mina-project/mailing-lists.html" class="external-link" rel="nofollow">Mailing lists &amp; IRC</a></li>
       <li><a href="./../../../mina-project/issue-tracking.html" class="external-link" rel="nofollow">Issue tracking</a></li>
       <li><a href="./../../../mina-project/sources.html" class="external-link" rel="nofollow">Sources</a></li>
-      <li><a href="./../../../mina-project/javadocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
+      <li><a href="./../../../mina-project/apidocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
       <li><a href="./../../../mina-project/performances.html" class="external-link" rel="nofollow">Performances</a></li>
       <li><a href="./../../../mina-project/testimonials.html" class="external-link" rel="nofollow">Testimonials</a></li>
       <li><a href="./../../../mina-project/conferences.html" class="external-link" rel="nofollow">Conferences</a></li>