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/15 15:00:01 UTC

svn commit: r838436 [4/10] - in /websites/staging/mina/trunk/content: ./ asyncweb-project/ ftpserver-project/ mina-project/ mina-project/userguide/ mina-project/userguide/ch1-getting-started/ mina-project/userguide/ch10-executor-filter/ mina-project/us...

Modified: websites/staging/mina/trunk/content/ftpserver-project/messages.html
==============================================================================
--- websites/staging/mina/trunk/content/ftpserver-project/messages.html (original)
+++ websites/staging/mina/trunk/content/ftpserver-project/messages.html Thu Nov 15 13:59:46 2012
@@ -20,7 +20,7 @@
 	<title>FtpServer Messages &mdash; Apache MINA</title>
 	
 		<link href="./../css/common.css" rel="stylesheet" type="text/css">
-		<link href="./../css/mina.css" rel="stylesheet" type="text/css">
+		<link href="./../css/ftpserver.css" rel="stylesheet" type="text/css">
 	
 </head>
   <body>
@@ -29,7 +29,7 @@
         <div id="subProjectsNavBar">
           <a href="./../">
             
-              <strong>Apache MINA Project</strong>
+              Apache MINA Project
             
           </a>
           &nbsp;|&nbsp;
@@ -47,7 +47,7 @@
           &nbsp;|&nbsp;
           <a href="./../ftpserver-project/index.html">
             
-              FtpServer
+              <strong>FtpServer</strong>
             
           </a>
           &nbsp;|&nbsp;
@@ -69,50 +69,44 @@
                               
           
           
-          
-          
-          
             <div id="navigation">
-
-    <h5>Latest Downloads</h5>
-    <ul>
-        <li><a href="./../downloads-mina.html">Mina 2.0.7</a></li>
-        <li><a href="./../downloads-ftpserver.html">FtpServer 1.0.6</a></li>
-        <li><a href="./../downloads-sshd.html">SSHD 0.8.0</a></li>
-        <li><a href="./../downloads-vysper.html">Vysper 0.7</a></li>
-    </ul>
-    <h5>Projects</h5>
-    <ul>
-        <li><a href="./../mina-project/index.html">MINA</a></li>
-        <li><a href="./../asyncweb-project/index.html">AsyncWeb</a></li>
-        <li><a href="./../ftpserver-project/index.html">FtpServer</a></li>
-        <li><a href="./../sshd-project/index.html">SSHD</a></li>
-        <li><a href="./../vysper-project/index.html">Vysper</a></li>
-    </ul>
-
-    <h5>Community</h5>
-    <ul>
-      <li><a href="./../contributors.html" class="external-link" rel="nofollow">Team</a></li>
-      <li><a href="http://www.apache.org/licenses/" class="external-link" rel="nofollow">License</a></li>
-      <li><a href="http://www.apache.org/foundation/contributing.html" class="external-link" rel="nofollow">Contributing</a></li>
-      <li><a href="http://www.apache.org/" title="Apache Software Foundation" class="external-link" rel="nofollow">ASF main site</a></li>
-      <li><a href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks</a></li>
-      <li><a href="http://www.apache.org/foundation/sponsorship.html" title="The ASF sponsorship program" class="external-link" rel="nofollow">Sponsorship program</a></li>
-      <li><a href="http://www.apache.org/security/" class="external-link" rel="nofollow">Security</a></li>
-    </ul>
-
-    <h3><a name="Navigation-Upcoming"></a>Upcoming</h3>
-
+<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="messages">Messages</h1>
 <p>This document explains how to customize all the Apache FtpServer reply messages.</p>
 <p>All the server messages are customizable. The default reply messages are bundled with the server. The user defined custom messages will be stored separately. This custom message file is configurable.</p>
@@ -277,8 +271,6 @@
 </tbody>
 </table>
 
-
-
                 </div><!-- rightColumn -->
                 <div id="endContent"></div>
             </div><!-- content -->

Modified: websites/staging/mina/trunk/content/ftpserver-project/related_project.html
==============================================================================
--- websites/staging/mina/trunk/content/ftpserver-project/related_project.html (original)
+++ websites/staging/mina/trunk/content/ftpserver-project/related_project.html Thu Nov 15 13:59:46 2012
@@ -20,7 +20,7 @@
 	<title>FtpServer Related Projects &mdash; Apache MINA</title>
 	
 		<link href="./../css/common.css" rel="stylesheet" type="text/css">
-		<link href="./../css/mina.css" rel="stylesheet" type="text/css">
+		<link href="./../css/ftpserver.css" rel="stylesheet" type="text/css">
 	
 </head>
   <body>
@@ -29,7 +29,7 @@
         <div id="subProjectsNavBar">
           <a href="./../">
             
-              <strong>Apache MINA Project</strong>
+              Apache MINA Project
             
           </a>
           &nbsp;|&nbsp;
@@ -47,7 +47,7 @@
           &nbsp;|&nbsp;
           <a href="./../ftpserver-project/index.html">
             
-              FtpServer
+              <strong>FtpServer</strong>
             
           </a>
           &nbsp;|&nbsp;
@@ -69,50 +69,44 @@
                               
           
           
-          
-          
-          
             <div id="navigation">
-
-    <h5>Latest Downloads</h5>
-    <ul>
-        <li><a href="./../downloads-mina.html">Mina 2.0.7</a></li>
-        <li><a href="./../downloads-ftpserver.html">FtpServer 1.0.6</a></li>
-        <li><a href="./../downloads-sshd.html">SSHD 0.8.0</a></li>
-        <li><a href="./../downloads-vysper.html">Vysper 0.7</a></li>
-    </ul>
-    <h5>Projects</h5>
-    <ul>
-        <li><a href="./../mina-project/index.html">MINA</a></li>
-        <li><a href="./../asyncweb-project/index.html">AsyncWeb</a></li>
-        <li><a href="./../ftpserver-project/index.html">FtpServer</a></li>
-        <li><a href="./../sshd-project/index.html">SSHD</a></li>
-        <li><a href="./../vysper-project/index.html">Vysper</a></li>
-    </ul>
-
-    <h5>Community</h5>
-    <ul>
-      <li><a href="./../contributors.html" class="external-link" rel="nofollow">Team</a></li>
-      <li><a href="http://www.apache.org/licenses/" class="external-link" rel="nofollow">License</a></li>
-      <li><a href="http://www.apache.org/foundation/contributing.html" class="external-link" rel="nofollow">Contributing</a></li>
-      <li><a href="http://www.apache.org/" title="Apache Software Foundation" class="external-link" rel="nofollow">ASF main site</a></li>
-      <li><a href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks</a></li>
-      <li><a href="http://www.apache.org/foundation/sponsorship.html" title="The ASF sponsorship program" class="external-link" rel="nofollow">Sponsorship program</a></li>
-      <li><a href="http://www.apache.org/security/" class="external-link" rel="nofollow">Security</a></li>
-    </ul>
-
-    <h3><a name="Navigation-Upcoming"></a>Upcoming</h3>
-
+<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="related-projects">Related Projects</h1>
 <h2 id="milton-webdav-over-ftp"><a href="http://milton.ettrema.com/index.html">Milton WebDAV over FTP</a></h2>
 <p>Using FtpServer to provide FTP support in the WebDAV server Milton. This means that for each resource managed by Milton, you can configure so that it is available both over WebDAV/HTTP and FTP.</p>
@@ -121,8 +115,6 @@
 <h2 id="hdfs-over-ftp"><a href="https://sites.google.com/a/iponweb.net/hadoop/Home/hdfs-over-ftp">HDFS over FTP</a></h2>
 <p>FTP server which works on a top of HDFS. It aAllows to connect to HDFS using any FTP client. FTP server is configurable by hdfs-over-ftp.conf and users.conf. Also it allows to use secure connection over SSL and supports all HDFS permissions</p>
 
-
-
                 </div><!-- rightColumn -->
                 <div id="endContent"></div>
             </div><!-- content -->

Modified: websites/staging/mina/trunk/content/ftpserver-project/releasing.html
==============================================================================
--- websites/staging/mina/trunk/content/ftpserver-project/releasing.html (original)
+++ websites/staging/mina/trunk/content/ftpserver-project/releasing.html Thu Nov 15 13:59:46 2012
@@ -20,7 +20,7 @@
 	<title>FtpServer Releasing &mdash; Apache MINA</title>
 	
 		<link href="./../css/common.css" rel="stylesheet" type="text/css">
-		<link href="./../css/mina.css" rel="stylesheet" type="text/css">
+		<link href="./../css/ftpserver.css" rel="stylesheet" type="text/css">
 	
 </head>
   <body>
@@ -29,7 +29,7 @@
         <div id="subProjectsNavBar">
           <a href="./../">
             
-              <strong>Apache MINA Project</strong>
+              Apache MINA Project
             
           </a>
           &nbsp;|&nbsp;
@@ -47,7 +47,7 @@
           &nbsp;|&nbsp;
           <a href="./../ftpserver-project/index.html">
             
-              FtpServer
+              <strong>FtpServer</strong>
             
           </a>
           &nbsp;|&nbsp;
@@ -69,50 +69,44 @@
                               
           
           
-          
-          
-          
             <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>Latest Downloads</h5>
-    <ul>
-        <li><a href="./../downloads-mina.html">Mina 2.0.7</a></li>
-        <li><a href="./../downloads-ftpserver.html">FtpServer 1.0.6</a></li>
-        <li><a href="./../downloads-sshd.html">SSHD 0.8.0</a></li>
-        <li><a href="./../downloads-vysper.html">Vysper 0.7</a></li>
-    </ul>
-    <h5>Projects</h5>
-    <ul>
-        <li><a href="./../mina-project/index.html">MINA</a></li>
-        <li><a href="./../asyncweb-project/index.html">AsyncWeb</a></li>
-        <li><a href="./../ftpserver-project/index.html">FtpServer</a></li>
-        <li><a href="./../sshd-project/index.html">SSHD</a></li>
-        <li><a href="./../vysper-project/index.html">Vysper</a></li>
-    </ul>
-
-    <h5>Community</h5>
-    <ul>
-      <li><a href="./../contributors.html" class="external-link" rel="nofollow">Team</a></li>
-      <li><a href="http://www.apache.org/licenses/" class="external-link" rel="nofollow">License</a></li>
-      <li><a href="http://www.apache.org/foundation/contributing.html" class="external-link" rel="nofollow">Contributing</a></li>
-      <li><a href="http://www.apache.org/" title="Apache Software Foundation" class="external-link" rel="nofollow">ASF main site</a></li>
-      <li><a href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks</a></li>
-      <li><a href="http://www.apache.org/foundation/sponsorship.html" title="The ASF sponsorship program" class="external-link" rel="nofollow">Sponsorship program</a></li>
-      <li><a href="http://www.apache.org/security/" class="external-link" rel="nofollow">Security</a></li>
-    </ul>
-
-    <h3><a name="Navigation-Upcoming"></a>Upcoming</h3>
-
+<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="releasing">Releasing</h1>
 <h2 id="before-calling-a-vote">Before calling a vote</h2>
 <ul>
@@ -189,8 +183,6 @@
 </ul>
 <p>Run script to create documentation ZIP file, on people.apache.org</p>
 
-
-
                 </div><!-- rightColumn -->
                 <div id="endContent"></div>
             </div><!-- content -->

Modified: websites/staging/mina/trunk/content/ftpserver-project/reporting_bug.html
==============================================================================
--- websites/staging/mina/trunk/content/ftpserver-project/reporting_bug.html (original)
+++ websites/staging/mina/trunk/content/ftpserver-project/reporting_bug.html Thu Nov 15 13:59:46 2012
@@ -20,7 +20,7 @@
 	<title>FtpServer Reporting Bugs &mdash; Apache MINA</title>
 	
 		<link href="./../css/common.css" rel="stylesheet" type="text/css">
-		<link href="./../css/mina.css" rel="stylesheet" type="text/css">
+		<link href="./../css/ftpserver.css" rel="stylesheet" type="text/css">
 	
 </head>
   <body>
@@ -29,7 +29,7 @@
         <div id="subProjectsNavBar">
           <a href="./../">
             
-              <strong>Apache MINA Project</strong>
+              Apache MINA Project
             
           </a>
           &nbsp;|&nbsp;
@@ -47,7 +47,7 @@
           &nbsp;|&nbsp;
           <a href="./../ftpserver-project/index.html">
             
-              FtpServer
+              <strong>FtpServer</strong>
             
           </a>
           &nbsp;|&nbsp;
@@ -69,50 +69,44 @@
                               
           
           
-          
-          
-          
             <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>Latest Downloads</h5>
-    <ul>
-        <li><a href="./../downloads-mina.html">Mina 2.0.7</a></li>
-        <li><a href="./../downloads-ftpserver.html">FtpServer 1.0.6</a></li>
-        <li><a href="./../downloads-sshd.html">SSHD 0.8.0</a></li>
-        <li><a href="./../downloads-vysper.html">Vysper 0.7</a></li>
-    </ul>
-    <h5>Projects</h5>
-    <ul>
-        <li><a href="./../mina-project/index.html">MINA</a></li>
-        <li><a href="./../asyncweb-project/index.html">AsyncWeb</a></li>
-        <li><a href="./../ftpserver-project/index.html">FtpServer</a></li>
-        <li><a href="./../sshd-project/index.html">SSHD</a></li>
-        <li><a href="./../vysper-project/index.html">Vysper</a></li>
-    </ul>
-
-    <h5>Community</h5>
-    <ul>
-      <li><a href="./../contributors.html" class="external-link" rel="nofollow">Team</a></li>
-      <li><a href="http://www.apache.org/licenses/" class="external-link" rel="nofollow">License</a></li>
-      <li><a href="http://www.apache.org/foundation/contributing.html" class="external-link" rel="nofollow">Contributing</a></li>
-      <li><a href="http://www.apache.org/" title="Apache Software Foundation" class="external-link" rel="nofollow">ASF main site</a></li>
-      <li><a href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks</a></li>
-      <li><a href="http://www.apache.org/foundation/sponsorship.html" title="The ASF sponsorship program" class="external-link" rel="nofollow">Sponsorship program</a></li>
-      <li><a href="http://www.apache.org/security/" class="external-link" rel="nofollow">Security</a></li>
-    </ul>
-
-    <h3><a name="Navigation-Upcoming"></a>Upcoming</h3>
-
+<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="reporting-a-bug">Reporting a Bug</h1>
 <p>We are using JIRA to track all FtpServer issues including bugs. Please visit our <a href="http://issues.apache.org/jira/browse/FTPSERVER">issue tracker page</a> to report a bug. </p>
 <h2 id="how-to-report-a-bug">How to report a bug</h2>
@@ -130,8 +124,6 @@
 </li>
 </ul>
 
-
-
                 </div><!-- rightColumn -->
                 <div id="endContent"></div>
             </div><!-- content -->

Modified: websites/staging/mina/trunk/content/ftpserver-project/running_ftpserver_standalone.html
==============================================================================
--- websites/staging/mina/trunk/content/ftpserver-project/running_ftpserver_standalone.html (original)
+++ websites/staging/mina/trunk/content/ftpserver-project/running_ftpserver_standalone.html Thu Nov 15 13:59:46 2012
@@ -20,7 +20,7 @@
 	<title>FtpServer  &mdash; Apache MINA</title>
 	
 		<link href="./../css/common.css" rel="stylesheet" type="text/css">
-		<link href="./../css/mina.css" rel="stylesheet" type="text/css">
+		<link href="./../css/ftpserver.css" rel="stylesheet" type="text/css">
 	
 </head>
   <body>
@@ -29,7 +29,7 @@
         <div id="subProjectsNavBar">
           <a href="./../">
             
-              <strong>Apache MINA Project</strong>
+              Apache MINA Project
             
           </a>
           &nbsp;|&nbsp;
@@ -47,7 +47,7 @@
           &nbsp;|&nbsp;
           <a href="./../ftpserver-project/index.html">
             
-              FtpServer
+              <strong>FtpServer</strong>
             
           </a>
           &nbsp;|&nbsp;
@@ -69,50 +69,44 @@
                               
           
           
-          
-          
-          
             <div id="navigation">
-
-    <h5>Latest Downloads</h5>
-    <ul>
-        <li><a href="./../downloads-mina.html">Mina 2.0.7</a></li>
-        <li><a href="./../downloads-ftpserver.html">FtpServer 1.0.6</a></li>
-        <li><a href="./../downloads-sshd.html">SSHD 0.8.0</a></li>
-        <li><a href="./../downloads-vysper.html">Vysper 0.7</a></li>
-    </ul>
-    <h5>Projects</h5>
-    <ul>
-        <li><a href="./../mina-project/index.html">MINA</a></li>
-        <li><a href="./../asyncweb-project/index.html">AsyncWeb</a></li>
-        <li><a href="./../ftpserver-project/index.html">FtpServer</a></li>
-        <li><a href="./../sshd-project/index.html">SSHD</a></li>
-        <li><a href="./../vysper-project/index.html">Vysper</a></li>
-    </ul>
-
-    <h5>Community</h5>
-    <ul>
-      <li><a href="./../contributors.html" class="external-link" rel="nofollow">Team</a></li>
-      <li><a href="http://www.apache.org/licenses/" class="external-link" rel="nofollow">License</a></li>
-      <li><a href="http://www.apache.org/foundation/contributing.html" class="external-link" rel="nofollow">Contributing</a></li>
-      <li><a href="http://www.apache.org/" title="Apache Software Foundation" class="external-link" rel="nofollow">ASF main site</a></li>
-      <li><a href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks</a></li>
-      <li><a href="http://www.apache.org/foundation/sponsorship.html" title="The ASF sponsorship program" class="external-link" rel="nofollow">Sponsorship program</a></li>
-      <li><a href="http://www.apache.org/security/" class="external-link" rel="nofollow">Security</a></li>
-    </ul>
-
-    <h3><a name="Navigation-Upcoming"></a>Upcoming</h3>
-
+<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="running-ftpserver-stand-alone-in-5-minutes">Running FtpServer stand-alone in 5 minutes</h1>
 <p>To get FtpServer up and running in stand-alone mode, you need to have a full distribution. Check out to build the source code and make sure you include the build for the distribution module</p>
 <h2 id="installing">Installing</h2>
@@ -149,8 +143,6 @@
 
 <p>That's it. Now you can configure the server to your likings. Have a look at either the ftpd-full.xml example or the configuration documentation. You can also set up FtpServer to run as a service on Windows or daemon on Linux/Unix.</p>
 
-
-
                 </div><!-- rightColumn -->
                 <div id="endContent"></div>
             </div><!-- content -->

Modified: websites/staging/mina/trunk/content/ftpserver-project/source.html
==============================================================================
--- websites/staging/mina/trunk/content/ftpserver-project/source.html (original)
+++ websites/staging/mina/trunk/content/ftpserver-project/source.html Thu Nov 15 13:59:46 2012
@@ -20,7 +20,7 @@
 	<title>FtpServer Source &mdash; Apache MINA</title>
 	
 		<link href="./../css/common.css" rel="stylesheet" type="text/css">
-		<link href="./../css/mina.css" rel="stylesheet" type="text/css">
+		<link href="./../css/ftpserver.css" rel="stylesheet" type="text/css">
 	
 </head>
   <body>
@@ -29,7 +29,7 @@
         <div id="subProjectsNavBar">
           <a href="./../">
             
-              <strong>Apache MINA Project</strong>
+              Apache MINA Project
             
           </a>
           &nbsp;|&nbsp;
@@ -47,7 +47,7 @@
           &nbsp;|&nbsp;
           <a href="./../ftpserver-project/index.html">
             
-              FtpServer
+              <strong>FtpServer</strong>
             
           </a>
           &nbsp;|&nbsp;
@@ -69,50 +69,44 @@
                               
           
           
-          
-          
-          
             <div id="navigation">
-
-    <h5>Latest Downloads</h5>
-    <ul>
-        <li><a href="./../downloads-mina.html">Mina 2.0.7</a></li>
-        <li><a href="./../downloads-ftpserver.html">FtpServer 1.0.6</a></li>
-        <li><a href="./../downloads-sshd.html">SSHD 0.8.0</a></li>
-        <li><a href="./../downloads-vysper.html">Vysper 0.7</a></li>
-    </ul>
-    <h5>Projects</h5>
-    <ul>
-        <li><a href="./../mina-project/index.html">MINA</a></li>
-        <li><a href="./../asyncweb-project/index.html">AsyncWeb</a></li>
-        <li><a href="./../ftpserver-project/index.html">FtpServer</a></li>
-        <li><a href="./../sshd-project/index.html">SSHD</a></li>
-        <li><a href="./../vysper-project/index.html">Vysper</a></li>
-    </ul>
-
-    <h5>Community</h5>
-    <ul>
-      <li><a href="./../contributors.html" class="external-link" rel="nofollow">Team</a></li>
-      <li><a href="http://www.apache.org/licenses/" class="external-link" rel="nofollow">License</a></li>
-      <li><a href="http://www.apache.org/foundation/contributing.html" class="external-link" rel="nofollow">Contributing</a></li>
-      <li><a href="http://www.apache.org/" title="Apache Software Foundation" class="external-link" rel="nofollow">ASF main site</a></li>
-      <li><a href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks</a></li>
-      <li><a href="http://www.apache.org/foundation/sponsorship.html" title="The ASF sponsorship program" class="external-link" rel="nofollow">Sponsorship program</a></li>
-      <li><a href="http://www.apache.org/security/" class="external-link" rel="nofollow">Security</a></li>
-    </ul>
-
-    <h3><a name="Navigation-Upcoming"></a>Upcoming</h3>
-
+<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>
@@ -150,8 +144,6 @@
 <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 -->

Modified: websites/staging/mina/trunk/content/ftpserver-project/testimonials.html
==============================================================================
--- websites/staging/mina/trunk/content/ftpserver-project/testimonials.html (original)
+++ websites/staging/mina/trunk/content/ftpserver-project/testimonials.html Thu Nov 15 13:59:46 2012
@@ -20,7 +20,7 @@
 	<title>FtpServer Testimonials &mdash; Apache MINA</title>
 	
 		<link href="./../css/common.css" rel="stylesheet" type="text/css">
-		<link href="./../css/mina.css" rel="stylesheet" type="text/css">
+		<link href="./../css/ftpserver.css" rel="stylesheet" type="text/css">
 	
 </head>
   <body>
@@ -29,7 +29,7 @@
         <div id="subProjectsNavBar">
           <a href="./../">
             
-              <strong>Apache MINA Project</strong>
+              Apache MINA Project
             
           </a>
           &nbsp;|&nbsp;
@@ -47,7 +47,7 @@
           &nbsp;|&nbsp;
           <a href="./../ftpserver-project/index.html">
             
-              FtpServer
+              <strong>FtpServer</strong>
             
           </a>
           &nbsp;|&nbsp;
@@ -69,50 +69,44 @@
                               
           
           
-          
-          
-          
             <div id="navigation">
-
-    <h5>Latest Downloads</h5>
-    <ul>
-        <li><a href="./../downloads-mina.html">Mina 2.0.7</a></li>
-        <li><a href="./../downloads-ftpserver.html">FtpServer 1.0.6</a></li>
-        <li><a href="./../downloads-sshd.html">SSHD 0.8.0</a></li>
-        <li><a href="./../downloads-vysper.html">Vysper 0.7</a></li>
-    </ul>
-    <h5>Projects</h5>
-    <ul>
-        <li><a href="./../mina-project/index.html">MINA</a></li>
-        <li><a href="./../asyncweb-project/index.html">AsyncWeb</a></li>
-        <li><a href="./../ftpserver-project/index.html">FtpServer</a></li>
-        <li><a href="./../sshd-project/index.html">SSHD</a></li>
-        <li><a href="./../vysper-project/index.html">Vysper</a></li>
-    </ul>
-
-    <h5>Community</h5>
-    <ul>
-      <li><a href="./../contributors.html" class="external-link" rel="nofollow">Team</a></li>
-      <li><a href="http://www.apache.org/licenses/" class="external-link" rel="nofollow">License</a></li>
-      <li><a href="http://www.apache.org/foundation/contributing.html" class="external-link" rel="nofollow">Contributing</a></li>
-      <li><a href="http://www.apache.org/" title="Apache Software Foundation" class="external-link" rel="nofollow">ASF main site</a></li>
-      <li><a href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks</a></li>
-      <li><a href="http://www.apache.org/foundation/sponsorship.html" title="The ASF sponsorship program" class="external-link" rel="nofollow">Sponsorship program</a></li>
-      <li><a href="http://www.apache.org/security/" class="external-link" rel="nofollow">Security</a></li>
-    </ul>
-
-    <h3><a name="Navigation-Upcoming"></a>Upcoming</h3>
-
+<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="testimonials">Testimonials</h1>
 <p><strong>Daniel Frank</strong> says:</p>
 <blockquote>
@@ -122,8 +116,6 @@ deciding to use Apache FtpServer as the 
 sharing solution, <a href="HostedFTP">HostedFTP</a></p>
 </blockquote>
 
-
-
                 </div><!-- rightColumn -->
                 <div id="endContent"></div>
             </div><!-- content -->

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 15 13:59:46 2012
@@ -29,13 +29,13 @@
         <div id="subProjectsNavBar">
           <a href="./../">
             
-              <strong>Apache MINA Project</strong>
+              Apache MINA Project
             
           </a>
           &nbsp;|&nbsp;
           <a href="./../mina-project/index.html">
             
-              MINA
+              <strong>MINA</strong>
             
           </a>
           &nbsp;|&nbsp;
@@ -71,42 +71,60 @@
           
           
           
-          
             <div id="navigation">
 
     <h5>Latest Downloads</h5>
     <ul>
-        <li><a href="./../downloads-mina.html">Mina 2.0.7</a></li>
-        <li><a href="./../downloads-ftpserver.html">FtpServer 1.0.6</a></li>
-        <li><a href="./../downloads-sshd.html">SSHD 0.8.0</a></li>
-        <li><a href="./../downloads-vysper.html">Vysper 0.7</a></li>
-    </ul>
-    <h5>Projects</h5>
-    <ul>
-        <li><a href="./../mina-project/index.html">MINA</a></li>
-        <li><a href="./../asyncweb-project/index.html">AsyncWeb</a></li>
-        <li><a href="./../ftpserver-project/index.html">FtpServer</a></li>
-        <li><a href="./../sshd-project/index.html">SSHD</a></li>
-        <li><a href="./../vysper-project/index.html">Vysper</a></li>
+        <li><a href="./../mina-project/downloads.html">Mina 2.0.7</a></li>
+    </ul>
+    <h5>Documentation</h5>
+    <ul>
+      <li><a href="./../mina-project/userguide/user-guide-toc.html" class="external-link" rel="nofollow">User guide</a></li>
+      <li><a href="./../mina-project/features.html" class="external-link" rel="nofollow">Features</a></li>
+      <li><a href="./../mina-project/road-map.html" class="external-link" rel="nofollow">Road Map</a></li>
+      <li><a href="./../mina-project/faq.html" class="external-link" rel="nofollow">FAQ</a></li>
+    </ul>
+    <h5>Resources</h5>
+    <ul>
+      <li><a href="./../mina-project/downloads.html" class="external-link" rel="nofollow">Downloads</a></li>
+      <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/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>
+      <li><a href="./../mina-project/developper-guide.html" class="external-link" rel="nofollow">Developers Guide</a></li>
+      <li><a href="./../mina-project/related-projects.html" class="external-link" rel="nofollow">Related Projects</a></li>
+      <li><a href="http://people.apache.org/~vgritsenko/stats/projects/mina.html" class="external-link" rel="nofollow">Statistics</a></li>
     </ul>
 
     <h5>Community</h5>
     <ul>
+      <li><a href="http://www.apache.org/foundation/contributing.html" class="external-link" rel="nofollow">Contributing</a></li>
       <li><a href="./../contributors.html" class="external-link" rel="nofollow">Team</a></li>
+      <li><a href="./../special-thanks.html" class="external-link" rel="nofollow">Special Thanks</a></li>
+      <li><a href="http://www.apache.org/security/" class="external-link" rel="nofollow">Security</a></li>
+    </ul>
+
+    <h5>About Apache</h5>
+    <ul>
+      <li><a href="http://www.apache.org" class="external-link" rel="nofollow">Apache main site</a></li>
       <li><a href="http://www.apache.org/licenses/" class="external-link" rel="nofollow">License</a></li>
-      <li><a href="http://www.apache.org/foundation/contributing.html" class="external-link" rel="nofollow">Contributing</a></li>
-      <li><a href="http://www.apache.org/" title="Apache Software Foundation" class="external-link" rel="nofollow">ASF main site</a></li>
-      <li><a href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks</a></li>
       <li><a href="http://www.apache.org/foundation/sponsorship.html" title="The ASF sponsorship program" class="external-link" rel="nofollow">Sponsorship program</a></li>
-      <li><a href="http://www.apache.org/security/" class="external-link" rel="nofollow">Security</a></li>
+      <li><a href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks</a></li>
     </ul>
 
     <h3><a name="Navigation-Upcoming"></a>Upcoming</h3>
+    <ul>
+      <li>No event</li>
+    </ul>
 
 </div>
 
 <!-- navigation -->
           
+          
         </div><!-- leftColumn -->
       <div id="rightColumn">
 

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 15 13:59:46 2012
@@ -29,13 +29,13 @@
         <div id="subProjectsNavBar">
           <a href="./../">
             
-              <strong>Apache MINA Project</strong>
+              Apache MINA Project
             
           </a>
           &nbsp;|&nbsp;
           <a href="./../mina-project/index.html">
             
-              MINA
+              <strong>MINA</strong>
             
           </a>
           &nbsp;|&nbsp;
@@ -71,42 +71,60 @@
           
           
           
-          
             <div id="navigation">
 
     <h5>Latest Downloads</h5>
     <ul>
-        <li><a href="./../downloads-mina.html">Mina 2.0.7</a></li>
-        <li><a href="./../downloads-ftpserver.html">FtpServer 1.0.6</a></li>
-        <li><a href="./../downloads-sshd.html">SSHD 0.8.0</a></li>
-        <li><a href="./../downloads-vysper.html">Vysper 0.7</a></li>
-    </ul>
-    <h5>Projects</h5>
-    <ul>
-        <li><a href="./../mina-project/index.html">MINA</a></li>
-        <li><a href="./../asyncweb-project/index.html">AsyncWeb</a></li>
-        <li><a href="./../ftpserver-project/index.html">FtpServer</a></li>
-        <li><a href="./../sshd-project/index.html">SSHD</a></li>
-        <li><a href="./../vysper-project/index.html">Vysper</a></li>
+        <li><a href="./../mina-project/downloads.html">Mina 2.0.7</a></li>
+    </ul>
+    <h5>Documentation</h5>
+    <ul>
+      <li><a href="./../mina-project/userguide/user-guide-toc.html" class="external-link" rel="nofollow">User guide</a></li>
+      <li><a href="./../mina-project/features.html" class="external-link" rel="nofollow">Features</a></li>
+      <li><a href="./../mina-project/road-map.html" class="external-link" rel="nofollow">Road Map</a></li>
+      <li><a href="./../mina-project/faq.html" class="external-link" rel="nofollow">FAQ</a></li>
+    </ul>
+    <h5>Resources</h5>
+    <ul>
+      <li><a href="./../mina-project/downloads.html" class="external-link" rel="nofollow">Downloads</a></li>
+      <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/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>
+      <li><a href="./../mina-project/developper-guide.html" class="external-link" rel="nofollow">Developers Guide</a></li>
+      <li><a href="./../mina-project/related-projects.html" class="external-link" rel="nofollow">Related Projects</a></li>
+      <li><a href="http://people.apache.org/~vgritsenko/stats/projects/mina.html" class="external-link" rel="nofollow">Statistics</a></li>
     </ul>
 
     <h5>Community</h5>
     <ul>
+      <li><a href="http://www.apache.org/foundation/contributing.html" class="external-link" rel="nofollow">Contributing</a></li>
       <li><a href="./../contributors.html" class="external-link" rel="nofollow">Team</a></li>
+      <li><a href="./../special-thanks.html" class="external-link" rel="nofollow">Special Thanks</a></li>
+      <li><a href="http://www.apache.org/security/" class="external-link" rel="nofollow">Security</a></li>
+    </ul>
+
+    <h5>About Apache</h5>
+    <ul>
+      <li><a href="http://www.apache.org" class="external-link" rel="nofollow">Apache main site</a></li>
       <li><a href="http://www.apache.org/licenses/" class="external-link" rel="nofollow">License</a></li>
-      <li><a href="http://www.apache.org/foundation/contributing.html" class="external-link" rel="nofollow">Contributing</a></li>
-      <li><a href="http://www.apache.org/" title="Apache Software Foundation" class="external-link" rel="nofollow">ASF main site</a></li>
-      <li><a href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks</a></li>
       <li><a href="http://www.apache.org/foundation/sponsorship.html" title="The ASF sponsorship program" class="external-link" rel="nofollow">Sponsorship program</a></li>
-      <li><a href="http://www.apache.org/security/" class="external-link" rel="nofollow">Security</a></li>
+      <li><a href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks</a></li>
     </ul>
 
     <h3><a name="Navigation-Upcoming"></a>Upcoming</h3>
+    <ul>
+      <li>No event</li>
+    </ul>
 
 </div>
 
 <!-- navigation -->
           
+          
         </div><!-- leftColumn -->
       <div id="rightColumn">
 

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 15 13:59:46 2012
@@ -29,13 +29,13 @@
         <div id="subProjectsNavBar">
           <a href="./../">
             
-              <strong>Apache MINA Project</strong>
+              Apache MINA Project
             
           </a>
           &nbsp;|&nbsp;
           <a href="./../mina-project/index.html">
             
-              MINA
+              <strong>MINA</strong>
             
           </a>
           &nbsp;|&nbsp;
@@ -71,42 +71,60 @@
           
           
           
-          
             <div id="navigation">
 
     <h5>Latest Downloads</h5>
     <ul>
-        <li><a href="./../downloads-mina.html">Mina 2.0.7</a></li>
-        <li><a href="./../downloads-ftpserver.html">FtpServer 1.0.6</a></li>
-        <li><a href="./../downloads-sshd.html">SSHD 0.8.0</a></li>
-        <li><a href="./../downloads-vysper.html">Vysper 0.7</a></li>
+        <li><a href="./../mina-project/downloads.html">Mina 2.0.7</a></li>
+    </ul>
+    <h5>Documentation</h5>
+    <ul>
+      <li><a href="./../mina-project/userguide/user-guide-toc.html" class="external-link" rel="nofollow">User guide</a></li>
+      <li><a href="./../mina-project/features.html" class="external-link" rel="nofollow">Features</a></li>
+      <li><a href="./../mina-project/road-map.html" class="external-link" rel="nofollow">Road Map</a></li>
+      <li><a href="./../mina-project/faq.html" class="external-link" rel="nofollow">FAQ</a></li>
     </ul>
-    <h5>Projects</h5>
+    <h5>Resources</h5>
     <ul>
-        <li><a href="./../mina-project/index.html">MINA</a></li>
-        <li><a href="./../asyncweb-project/index.html">AsyncWeb</a></li>
-        <li><a href="./../ftpserver-project/index.html">FtpServer</a></li>
-        <li><a href="./../sshd-project/index.html">SSHD</a></li>
-        <li><a href="./../vysper-project/index.html">Vysper</a></li>
+      <li><a href="./../mina-project/downloads.html" class="external-link" rel="nofollow">Downloads</a></li>
+      <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/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>
+      <li><a href="./../mina-project/developper-guide.html" class="external-link" rel="nofollow">Developers Guide</a></li>
+      <li><a href="./../mina-project/related-projects.html" class="external-link" rel="nofollow">Related Projects</a></li>
+      <li><a href="http://people.apache.org/~vgritsenko/stats/projects/mina.html" class="external-link" rel="nofollow">Statistics</a></li>
     </ul>
 
     <h5>Community</h5>
     <ul>
+      <li><a href="http://www.apache.org/foundation/contributing.html" class="external-link" rel="nofollow">Contributing</a></li>
       <li><a href="./../contributors.html" class="external-link" rel="nofollow">Team</a></li>
+      <li><a href="./../special-thanks.html" class="external-link" rel="nofollow">Special Thanks</a></li>
+      <li><a href="http://www.apache.org/security/" class="external-link" rel="nofollow">Security</a></li>
+    </ul>
+
+    <h5>About Apache</h5>
+    <ul>
+      <li><a href="http://www.apache.org" class="external-link" rel="nofollow">Apache main site</a></li>
       <li><a href="http://www.apache.org/licenses/" class="external-link" rel="nofollow">License</a></li>
-      <li><a href="http://www.apache.org/foundation/contributing.html" class="external-link" rel="nofollow">Contributing</a></li>
-      <li><a href="http://www.apache.org/" title="Apache Software Foundation" class="external-link" rel="nofollow">ASF main site</a></li>
-      <li><a href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks</a></li>
       <li><a href="http://www.apache.org/foundation/sponsorship.html" title="The ASF sponsorship program" class="external-link" rel="nofollow">Sponsorship program</a></li>
-      <li><a href="http://www.apache.org/security/" class="external-link" rel="nofollow">Security</a></li>
+      <li><a href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks</a></li>
     </ul>
 
     <h3><a name="Navigation-Upcoming"></a>Upcoming</h3>
+    <ul>
+      <li>No event</li>
+    </ul>
 
 </div>
 
 <!-- navigation -->
           
+          
         </div><!-- leftColumn -->
       <div id="rightColumn">
 

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 15 13:59:46 2012
@@ -29,13 +29,13 @@
         <div id="subProjectsNavBar">
           <a href="./../">
             
-              <strong>Apache MINA Project</strong>
+              Apache MINA Project
             
           </a>
           &nbsp;|&nbsp;
           <a href="./../mina-project/index.html">
             
-              MINA
+              <strong>MINA</strong>
             
           </a>
           &nbsp;|&nbsp;
@@ -71,42 +71,60 @@
           
           
           
-          
             <div id="navigation">
 
     <h5>Latest Downloads</h5>
     <ul>
-        <li><a href="./../downloads-mina.html">Mina 2.0.7</a></li>
-        <li><a href="./../downloads-ftpserver.html">FtpServer 1.0.6</a></li>
-        <li><a href="./../downloads-sshd.html">SSHD 0.8.0</a></li>
-        <li><a href="./../downloads-vysper.html">Vysper 0.7</a></li>
-    </ul>
-    <h5>Projects</h5>
-    <ul>
-        <li><a href="./../mina-project/index.html">MINA</a></li>
-        <li><a href="./../asyncweb-project/index.html">AsyncWeb</a></li>
-        <li><a href="./../ftpserver-project/index.html">FtpServer</a></li>
-        <li><a href="./../sshd-project/index.html">SSHD</a></li>
-        <li><a href="./../vysper-project/index.html">Vysper</a></li>
+        <li><a href="./../mina-project/downloads.html">Mina 2.0.7</a></li>
+    </ul>
+    <h5>Documentation</h5>
+    <ul>
+      <li><a href="./../mina-project/userguide/user-guide-toc.html" class="external-link" rel="nofollow">User guide</a></li>
+      <li><a href="./../mina-project/features.html" class="external-link" rel="nofollow">Features</a></li>
+      <li><a href="./../mina-project/road-map.html" class="external-link" rel="nofollow">Road Map</a></li>
+      <li><a href="./../mina-project/faq.html" class="external-link" rel="nofollow">FAQ</a></li>
+    </ul>
+    <h5>Resources</h5>
+    <ul>
+      <li><a href="./../mina-project/downloads.html" class="external-link" rel="nofollow">Downloads</a></li>
+      <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/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>
+      <li><a href="./../mina-project/developper-guide.html" class="external-link" rel="nofollow">Developers Guide</a></li>
+      <li><a href="./../mina-project/related-projects.html" class="external-link" rel="nofollow">Related Projects</a></li>
+      <li><a href="http://people.apache.org/~vgritsenko/stats/projects/mina.html" class="external-link" rel="nofollow">Statistics</a></li>
     </ul>
 
     <h5>Community</h5>
     <ul>
+      <li><a href="http://www.apache.org/foundation/contributing.html" class="external-link" rel="nofollow">Contributing</a></li>
       <li><a href="./../contributors.html" class="external-link" rel="nofollow">Team</a></li>
+      <li><a href="./../special-thanks.html" class="external-link" rel="nofollow">Special Thanks</a></li>
+      <li><a href="http://www.apache.org/security/" class="external-link" rel="nofollow">Security</a></li>
+    </ul>
+
+    <h5>About Apache</h5>
+    <ul>
+      <li><a href="http://www.apache.org" class="external-link" rel="nofollow">Apache main site</a></li>
       <li><a href="http://www.apache.org/licenses/" class="external-link" rel="nofollow">License</a></li>
-      <li><a href="http://www.apache.org/foundation/contributing.html" class="external-link" rel="nofollow">Contributing</a></li>
-      <li><a href="http://www.apache.org/" title="Apache Software Foundation" class="external-link" rel="nofollow">ASF main site</a></li>
-      <li><a href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks</a></li>
       <li><a href="http://www.apache.org/foundation/sponsorship.html" title="The ASF sponsorship program" class="external-link" rel="nofollow">Sponsorship program</a></li>
-      <li><a href="http://www.apache.org/security/" class="external-link" rel="nofollow">Security</a></li>
+      <li><a href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks</a></li>
     </ul>
 
     <h3><a name="Navigation-Upcoming"></a>Upcoming</h3>
+    <ul>
+      <li>No event</li>
+    </ul>
 
 </div>
 
 <!-- navigation -->
           
+          
         </div><!-- leftColumn -->
       <div id="rightColumn">
 

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 15 13:59:46 2012
@@ -29,13 +29,13 @@
         <div id="subProjectsNavBar">
           <a href="./../">
             
-              <strong>Apache MINA Project</strong>
+              Apache MINA Project
             
           </a>
           &nbsp;|&nbsp;
           <a href="./../mina-project/index.html">
             
-              MINA
+              <strong>MINA</strong>
             
           </a>
           &nbsp;|&nbsp;
@@ -71,42 +71,60 @@
           
           
           
-          
             <div id="navigation">
 
     <h5>Latest Downloads</h5>
     <ul>
-        <li><a href="./../downloads-mina.html">Mina 2.0.7</a></li>
-        <li><a href="./../downloads-ftpserver.html">FtpServer 1.0.6</a></li>
-        <li><a href="./../downloads-sshd.html">SSHD 0.8.0</a></li>
-        <li><a href="./../downloads-vysper.html">Vysper 0.7</a></li>
+        <li><a href="./../mina-project/downloads.html">Mina 2.0.7</a></li>
+    </ul>
+    <h5>Documentation</h5>
+    <ul>
+      <li><a href="./../mina-project/userguide/user-guide-toc.html" class="external-link" rel="nofollow">User guide</a></li>
+      <li><a href="./../mina-project/features.html" class="external-link" rel="nofollow">Features</a></li>
+      <li><a href="./../mina-project/road-map.html" class="external-link" rel="nofollow">Road Map</a></li>
+      <li><a href="./../mina-project/faq.html" class="external-link" rel="nofollow">FAQ</a></li>
     </ul>
-    <h5>Projects</h5>
+    <h5>Resources</h5>
     <ul>
-        <li><a href="./../mina-project/index.html">MINA</a></li>
-        <li><a href="./../asyncweb-project/index.html">AsyncWeb</a></li>
-        <li><a href="./../ftpserver-project/index.html">FtpServer</a></li>
-        <li><a href="./../sshd-project/index.html">SSHD</a></li>
-        <li><a href="./../vysper-project/index.html">Vysper</a></li>
+      <li><a href="./../mina-project/downloads.html" class="external-link" rel="nofollow">Downloads</a></li>
+      <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/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>
+      <li><a href="./../mina-project/developper-guide.html" class="external-link" rel="nofollow">Developers Guide</a></li>
+      <li><a href="./../mina-project/related-projects.html" class="external-link" rel="nofollow">Related Projects</a></li>
+      <li><a href="http://people.apache.org/~vgritsenko/stats/projects/mina.html" class="external-link" rel="nofollow">Statistics</a></li>
     </ul>
 
     <h5>Community</h5>
     <ul>
+      <li><a href="http://www.apache.org/foundation/contributing.html" class="external-link" rel="nofollow">Contributing</a></li>
       <li><a href="./../contributors.html" class="external-link" rel="nofollow">Team</a></li>
+      <li><a href="./../special-thanks.html" class="external-link" rel="nofollow">Special Thanks</a></li>
+      <li><a href="http://www.apache.org/security/" class="external-link" rel="nofollow">Security</a></li>
+    </ul>
+
+    <h5>About Apache</h5>
+    <ul>
+      <li><a href="http://www.apache.org" class="external-link" rel="nofollow">Apache main site</a></li>
       <li><a href="http://www.apache.org/licenses/" class="external-link" rel="nofollow">License</a></li>
-      <li><a href="http://www.apache.org/foundation/contributing.html" class="external-link" rel="nofollow">Contributing</a></li>
-      <li><a href="http://www.apache.org/" title="Apache Software Foundation" class="external-link" rel="nofollow">ASF main site</a></li>
-      <li><a href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks</a></li>
       <li><a href="http://www.apache.org/foundation/sponsorship.html" title="The ASF sponsorship program" class="external-link" rel="nofollow">Sponsorship program</a></li>
-      <li><a href="http://www.apache.org/security/" class="external-link" rel="nofollow">Security</a></li>
+      <li><a href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks</a></li>
     </ul>
 
     <h3><a name="Navigation-Upcoming"></a>Upcoming</h3>
+    <ul>
+      <li>No event</li>
+    </ul>
 
 </div>
 
 <!-- navigation -->
           
+          
         </div><!-- leftColumn -->
       <div id="rightColumn">
 

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 15 13:59:46 2012
@@ -29,13 +29,13 @@
         <div id="subProjectsNavBar">
           <a href="./../">
             
-              <strong>Apache MINA Project</strong>
+              Apache MINA Project
             
           </a>
           &nbsp;|&nbsp;
           <a href="./../mina-project/index.html">
             
-              MINA
+              <strong>MINA</strong>
             
           </a>
           &nbsp;|&nbsp;
@@ -71,42 +71,60 @@
           
           
           
-          
             <div id="navigation">
 
     <h5>Latest Downloads</h5>
     <ul>
-        <li><a href="./../downloads-mina.html">Mina 2.0.7</a></li>
-        <li><a href="./../downloads-ftpserver.html">FtpServer 1.0.6</a></li>
-        <li><a href="./../downloads-sshd.html">SSHD 0.8.0</a></li>
-        <li><a href="./../downloads-vysper.html">Vysper 0.7</a></li>
-    </ul>
-    <h5>Projects</h5>
-    <ul>
-        <li><a href="./../mina-project/index.html">MINA</a></li>
-        <li><a href="./../asyncweb-project/index.html">AsyncWeb</a></li>
-        <li><a href="./../ftpserver-project/index.html">FtpServer</a></li>
-        <li><a href="./../sshd-project/index.html">SSHD</a></li>
-        <li><a href="./../vysper-project/index.html">Vysper</a></li>
+        <li><a href="./../mina-project/downloads.html">Mina 2.0.7</a></li>
+    </ul>
+    <h5>Documentation</h5>
+    <ul>
+      <li><a href="./../mina-project/userguide/user-guide-toc.html" class="external-link" rel="nofollow">User guide</a></li>
+      <li><a href="./../mina-project/features.html" class="external-link" rel="nofollow">Features</a></li>
+      <li><a href="./../mina-project/road-map.html" class="external-link" rel="nofollow">Road Map</a></li>
+      <li><a href="./../mina-project/faq.html" class="external-link" rel="nofollow">FAQ</a></li>
+    </ul>
+    <h5>Resources</h5>
+    <ul>
+      <li><a href="./../mina-project/downloads.html" class="external-link" rel="nofollow">Downloads</a></li>
+      <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/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>
+      <li><a href="./../mina-project/developper-guide.html" class="external-link" rel="nofollow">Developers Guide</a></li>
+      <li><a href="./../mina-project/related-projects.html" class="external-link" rel="nofollow">Related Projects</a></li>
+      <li><a href="http://people.apache.org/~vgritsenko/stats/projects/mina.html" class="external-link" rel="nofollow">Statistics</a></li>
     </ul>
 
     <h5>Community</h5>
     <ul>
+      <li><a href="http://www.apache.org/foundation/contributing.html" class="external-link" rel="nofollow">Contributing</a></li>
       <li><a href="./../contributors.html" class="external-link" rel="nofollow">Team</a></li>
+      <li><a href="./../special-thanks.html" class="external-link" rel="nofollow">Special Thanks</a></li>
+      <li><a href="http://www.apache.org/security/" class="external-link" rel="nofollow">Security</a></li>
+    </ul>
+
+    <h5>About Apache</h5>
+    <ul>
+      <li><a href="http://www.apache.org" class="external-link" rel="nofollow">Apache main site</a></li>
       <li><a href="http://www.apache.org/licenses/" class="external-link" rel="nofollow">License</a></li>
-      <li><a href="http://www.apache.org/foundation/contributing.html" class="external-link" rel="nofollow">Contributing</a></li>
-      <li><a href="http://www.apache.org/" title="Apache Software Foundation" class="external-link" rel="nofollow">ASF main site</a></li>
-      <li><a href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks</a></li>
       <li><a href="http://www.apache.org/foundation/sponsorship.html" title="The ASF sponsorship program" class="external-link" rel="nofollow">Sponsorship program</a></li>
-      <li><a href="http://www.apache.org/security/" class="external-link" rel="nofollow">Security</a></li>
+      <li><a href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks</a></li>
     </ul>
 
     <h3><a name="Navigation-Upcoming"></a>Upcoming</h3>
+    <ul>
+      <li>No event</li>
+    </ul>
 
 </div>
 
 <!-- navigation -->
           
+          
         </div><!-- leftColumn -->
       <div id="rightColumn">
 

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 15 13:59:46 2012
@@ -29,13 +29,13 @@
         <div id="subProjectsNavBar">
           <a href="./../">
             
-              <strong>Apache MINA Project</strong>
+              Apache MINA Project
             
           </a>
           &nbsp;|&nbsp;
           <a href="./../mina-project/index.html">
             
-              MINA
+              <strong>MINA</strong>
             
           </a>
           &nbsp;|&nbsp;
@@ -71,49 +71,68 @@
           
           
           
-          
             <div id="navigation">
 
     <h5>Latest Downloads</h5>
     <ul>
-        <li><a href="./../downloads-mina.html">Mina 2.0.7</a></li>
-        <li><a href="./../downloads-ftpserver.html">FtpServer 1.0.6</a></li>
-        <li><a href="./../downloads-sshd.html">SSHD 0.8.0</a></li>
-        <li><a href="./../downloads-vysper.html">Vysper 0.7</a></li>
-    </ul>
-    <h5>Projects</h5>
-    <ul>
-        <li><a href="./../mina-project/index.html">MINA</a></li>
-        <li><a href="./../asyncweb-project/index.html">AsyncWeb</a></li>
-        <li><a href="./../ftpserver-project/index.html">FtpServer</a></li>
-        <li><a href="./../sshd-project/index.html">SSHD</a></li>
-        <li><a href="./../vysper-project/index.html">Vysper</a></li>
+        <li><a href="./../mina-project/downloads.html">Mina 2.0.7</a></li>
+    </ul>
+    <h5>Documentation</h5>
+    <ul>
+      <li><a href="./../mina-project/userguide/user-guide-toc.html" class="external-link" rel="nofollow">User guide</a></li>
+      <li><a href="./../mina-project/features.html" class="external-link" rel="nofollow">Features</a></li>
+      <li><a href="./../mina-project/road-map.html" class="external-link" rel="nofollow">Road Map</a></li>
+      <li><a href="./../mina-project/faq.html" class="external-link" rel="nofollow">FAQ</a></li>
+    </ul>
+    <h5>Resources</h5>
+    <ul>
+      <li><a href="./../mina-project/downloads.html" class="external-link" rel="nofollow">Downloads</a></li>
+      <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/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>
+      <li><a href="./../mina-project/developper-guide.html" class="external-link" rel="nofollow">Developers Guide</a></li>
+      <li><a href="./../mina-project/related-projects.html" class="external-link" rel="nofollow">Related Projects</a></li>
+      <li><a href="http://people.apache.org/~vgritsenko/stats/projects/mina.html" class="external-link" rel="nofollow">Statistics</a></li>
     </ul>
 
     <h5>Community</h5>
     <ul>
+      <li><a href="http://www.apache.org/foundation/contributing.html" class="external-link" rel="nofollow">Contributing</a></li>
       <li><a href="./../contributors.html" class="external-link" rel="nofollow">Team</a></li>
+      <li><a href="./../special-thanks.html" class="external-link" rel="nofollow">Special Thanks</a></li>
+      <li><a href="http://www.apache.org/security/" class="external-link" rel="nofollow">Security</a></li>
+    </ul>
+
+    <h5>About Apache</h5>
+    <ul>
+      <li><a href="http://www.apache.org" class="external-link" rel="nofollow">Apache main site</a></li>
       <li><a href="http://www.apache.org/licenses/" class="external-link" rel="nofollow">License</a></li>
-      <li><a href="http://www.apache.org/foundation/contributing.html" class="external-link" rel="nofollow">Contributing</a></li>
-      <li><a href="http://www.apache.org/" title="Apache Software Foundation" class="external-link" rel="nofollow">ASF main site</a></li>
-      <li><a href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks</a></li>
       <li><a href="http://www.apache.org/foundation/sponsorship.html" title="The ASF sponsorship program" class="external-link" rel="nofollow">Sponsorship program</a></li>
-      <li><a href="http://www.apache.org/security/" class="external-link" rel="nofollow">Security</a></li>
+      <li><a href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks</a></li>
     </ul>
 
     <h3><a name="Navigation-Upcoming"></a>Upcoming</h3>
+    <ul>
+      <li>No event</li>
+    </ul>
 
 </div>
 
 <!-- navigation -->
           
+          
         </div><!-- leftColumn -->
       <div id="rightColumn">
 
 
 
 
-<h1 id="welcome-to-apache-mina">Welcome to Apache MINA</h1>
+
+  <h1 id="welcome-to-apache-mina">Welcome to Apache MINA</h1>
 <h2 id="overview">Overview</h2>
 <p>Apache  <abbr title="Multipurpose Infrastructure for Network Applications">MINA</abbr> is a network application framework which helps users develop high performance and high scalability network applications easily.  It provides an abstract &middot;event-driven &middot; asynchronous API over various transports such as TCP/IP and UDP/IP via Java NIO.</p>
 <p>Apache MINA is often called:</p>
@@ -123,6 +142,40 @@
 <li>a networking &middot; socket library.</li>
 </ul>
 <p>However, it's much more than that.  Please take a look around the list of the <a href="features.html">features</a> that enable rapid network application development, and <a href="testimonialshtml">what people says about MINA</a>.  Please grab yourself a <a href="downloads.html">download</a>, try our <a href="quick-start-guid.html">Quick Start Guide</a>, surf our <a href="faq.html">FAQ</a> or start join us on <a href="community.html">our community</a></p>
+  
+    <div class="news"><p>Notice:    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.</p>
+<h1 id="news">News</h1>
+<h2 id="mina-207-released-posted-on-october-12-2012">MINA 2.0.7 released <em>posted on October, 12, 2012</em></h2>
+<p>The Apache MINA project is pleased to announce MINA 2.0.7 ! This version is a bug fix release.</p>
+<p>It fixes a regression introduced in MINA 2.0.5, and some performance improvements for the UDP server.</p>
+<p>We recommend all users to upgrade to this release. We consider this a stable and production ready release.</p>
+<p><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=10670&amp;version=12323341">Release note1</a>
+<a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=10670&amp;version=12316652">Release note2</a></p>
+<h2 id="mina-205-released-posted-on-august-26-2012">MINA 2.0.5 released <em>posted on August, 26, 2012</em></h2>
+<p>The Apache MINA project is pleased to announce MINA 2.0.5 ! This version is a bug fix release.</p>
+<p>We recommend all users to upgrade to this release. We consider this a stable and production ready release.</p>
+<p><a href="http://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=10670&amp;version=12316474">Release note</a></p>
+<h2 id="mina-204-released-posted-on-august-26-2012">MINA 2.0.4 released <em>posted on August, 26, 2012</em></h2>
+<p>The Apache MINA project is pleased to announce MINA 2.0.4 ! This version is a bug fix release.</p>
+<p>We recommend all users to upgrade to this release. We consider this a stable and production ready release.</p>
+<p><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=10670&amp;version=12316009">Release note</a></p></div>
+  
+
 
 
 

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 15 13:59:46 2012
@@ -29,13 +29,13 @@
         <div id="subProjectsNavBar">
           <a href="./../">
             
-              <strong>Apache MINA Project</strong>
+              Apache MINA Project
             
           </a>
           &nbsp;|&nbsp;
           <a href="./../mina-project/index.html">
             
-              MINA
+              <strong>MINA</strong>
             
           </a>
           &nbsp;|&nbsp;
@@ -71,42 +71,60 @@
           
           
           
-          
             <div id="navigation">
 
     <h5>Latest Downloads</h5>
     <ul>
-        <li><a href="./../downloads-mina.html">Mina 2.0.7</a></li>
-        <li><a href="./../downloads-ftpserver.html">FtpServer 1.0.6</a></li>
-        <li><a href="./../downloads-sshd.html">SSHD 0.8.0</a></li>
-        <li><a href="./../downloads-vysper.html">Vysper 0.7</a></li>
-    </ul>
-    <h5>Projects</h5>
-    <ul>
-        <li><a href="./../mina-project/index.html">MINA</a></li>
-        <li><a href="./../asyncweb-project/index.html">AsyncWeb</a></li>
-        <li><a href="./../ftpserver-project/index.html">FtpServer</a></li>
-        <li><a href="./../sshd-project/index.html">SSHD</a></li>
-        <li><a href="./../vysper-project/index.html">Vysper</a></li>
+        <li><a href="./../mina-project/downloads.html">Mina 2.0.7</a></li>
+    </ul>
+    <h5>Documentation</h5>
+    <ul>
+      <li><a href="./../mina-project/userguide/user-guide-toc.html" class="external-link" rel="nofollow">User guide</a></li>
+      <li><a href="./../mina-project/features.html" class="external-link" rel="nofollow">Features</a></li>
+      <li><a href="./../mina-project/road-map.html" class="external-link" rel="nofollow">Road Map</a></li>
+      <li><a href="./../mina-project/faq.html" class="external-link" rel="nofollow">FAQ</a></li>
+    </ul>
+    <h5>Resources</h5>
+    <ul>
+      <li><a href="./../mina-project/downloads.html" class="external-link" rel="nofollow">Downloads</a></li>
+      <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/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>
+      <li><a href="./../mina-project/developper-guide.html" class="external-link" rel="nofollow">Developers Guide</a></li>
+      <li><a href="./../mina-project/related-projects.html" class="external-link" rel="nofollow">Related Projects</a></li>
+      <li><a href="http://people.apache.org/~vgritsenko/stats/projects/mina.html" class="external-link" rel="nofollow">Statistics</a></li>
     </ul>
 
     <h5>Community</h5>
     <ul>
+      <li><a href="http://www.apache.org/foundation/contributing.html" class="external-link" rel="nofollow">Contributing</a></li>
       <li><a href="./../contributors.html" class="external-link" rel="nofollow">Team</a></li>
+      <li><a href="./../special-thanks.html" class="external-link" rel="nofollow">Special Thanks</a></li>
+      <li><a href="http://www.apache.org/security/" class="external-link" rel="nofollow">Security</a></li>
+    </ul>
+
+    <h5>About Apache</h5>
+    <ul>
+      <li><a href="http://www.apache.org" class="external-link" rel="nofollow">Apache main site</a></li>
       <li><a href="http://www.apache.org/licenses/" class="external-link" rel="nofollow">License</a></li>
-      <li><a href="http://www.apache.org/foundation/contributing.html" class="external-link" rel="nofollow">Contributing</a></li>
-      <li><a href="http://www.apache.org/" title="Apache Software Foundation" class="external-link" rel="nofollow">ASF main site</a></li>
-      <li><a href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks</a></li>
       <li><a href="http://www.apache.org/foundation/sponsorship.html" title="The ASF sponsorship program" class="external-link" rel="nofollow">Sponsorship program</a></li>
-      <li><a href="http://www.apache.org/security/" class="external-link" rel="nofollow">Security</a></li>
+      <li><a href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks</a></li>
     </ul>
 
     <h3><a name="Navigation-Upcoming"></a>Upcoming</h3>
+    <ul>
+      <li>No event</li>
+    </ul>
 
 </div>
 
 <!-- navigation -->
           
+          
         </div><!-- leftColumn -->
       <div id="rightColumn">
 

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 15 13:59:46 2012
@@ -29,13 +29,13 @@
         <div id="subProjectsNavBar">
           <a href="./../">
             
-              <strong>Apache MINA Project</strong>
+              Apache MINA Project
             
           </a>
           &nbsp;|&nbsp;
           <a href="./../mina-project/index.html">
             
-              MINA
+              <strong>MINA</strong>
             
           </a>
           &nbsp;|&nbsp;
@@ -71,42 +71,60 @@
           
           
           
-          
             <div id="navigation">
 
     <h5>Latest Downloads</h5>
     <ul>
-        <li><a href="./../downloads-mina.html">Mina 2.0.7</a></li>
-        <li><a href="./../downloads-ftpserver.html">FtpServer 1.0.6</a></li>
-        <li><a href="./../downloads-sshd.html">SSHD 0.8.0</a></li>
-        <li><a href="./../downloads-vysper.html">Vysper 0.7</a></li>
-    </ul>
-    <h5>Projects</h5>
-    <ul>
-        <li><a href="./../mina-project/index.html">MINA</a></li>
-        <li><a href="./../asyncweb-project/index.html">AsyncWeb</a></li>
-        <li><a href="./../ftpserver-project/index.html">FtpServer</a></li>
-        <li><a href="./../sshd-project/index.html">SSHD</a></li>
-        <li><a href="./../vysper-project/index.html">Vysper</a></li>
+        <li><a href="./../mina-project/downloads.html">Mina 2.0.7</a></li>
+    </ul>
+    <h5>Documentation</h5>
+    <ul>
+      <li><a href="./../mina-project/userguide/user-guide-toc.html" class="external-link" rel="nofollow">User guide</a></li>
+      <li><a href="./../mina-project/features.html" class="external-link" rel="nofollow">Features</a></li>
+      <li><a href="./../mina-project/road-map.html" class="external-link" rel="nofollow">Road Map</a></li>
+      <li><a href="./../mina-project/faq.html" class="external-link" rel="nofollow">FAQ</a></li>
+    </ul>
+    <h5>Resources</h5>
+    <ul>
+      <li><a href="./../mina-project/downloads.html" class="external-link" rel="nofollow">Downloads</a></li>
+      <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/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>
+      <li><a href="./../mina-project/developper-guide.html" class="external-link" rel="nofollow">Developers Guide</a></li>
+      <li><a href="./../mina-project/related-projects.html" class="external-link" rel="nofollow">Related Projects</a></li>
+      <li><a href="http://people.apache.org/~vgritsenko/stats/projects/mina.html" class="external-link" rel="nofollow">Statistics</a></li>
     </ul>
 
     <h5>Community</h5>
     <ul>
+      <li><a href="http://www.apache.org/foundation/contributing.html" class="external-link" rel="nofollow">Contributing</a></li>
       <li><a href="./../contributors.html" class="external-link" rel="nofollow">Team</a></li>
+      <li><a href="./../special-thanks.html" class="external-link" rel="nofollow">Special Thanks</a></li>
+      <li><a href="http://www.apache.org/security/" class="external-link" rel="nofollow">Security</a></li>
+    </ul>
+
+    <h5>About Apache</h5>
+    <ul>
+      <li><a href="http://www.apache.org" class="external-link" rel="nofollow">Apache main site</a></li>
       <li><a href="http://www.apache.org/licenses/" class="external-link" rel="nofollow">License</a></li>
-      <li><a href="http://www.apache.org/foundation/contributing.html" class="external-link" rel="nofollow">Contributing</a></li>
-      <li><a href="http://www.apache.org/" title="Apache Software Foundation" class="external-link" rel="nofollow">ASF main site</a></li>
-      <li><a href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks</a></li>
       <li><a href="http://www.apache.org/foundation/sponsorship.html" title="The ASF sponsorship program" class="external-link" rel="nofollow">Sponsorship program</a></li>
-      <li><a href="http://www.apache.org/security/" class="external-link" rel="nofollow">Security</a></li>
+      <li><a href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks</a></li>
     </ul>
 
     <h3><a name="Navigation-Upcoming"></a>Upcoming</h3>
+    <ul>
+      <li>No event</li>
+    </ul>
 
 </div>
 
 <!-- navigation -->
           
+          
         </div><!-- leftColumn -->
       <div id="rightColumn">