You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by bu...@apache.org on 2014/10/16 16:58:05 UTC

svn commit: r925968 [3/14] - in /websites/staging/directory/trunk/content: ./ apacheds/ apacheds/advanced-ug/ apacheds/basic-ug/ apacheds/configuration/ apacheds/download/ apacheds/kerberos-ug/ api/ api/download/ api/groovy-api/ api/user-guide/ escimo/...

Modified: websites/staging/directory/trunk/content/apacheds/advanced-ug/4.2.6.2-selections.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/advanced-ug/4.2.6.2-selections.html (original)
+++ websites/staging/directory/trunk/content/apacheds/advanced-ug/4.2.6.2-selections.html Thu Oct 16 14:57:59 2014
@@ -105,33 +105,31 @@
         <li><a href="./../../apacheds/gen-docs/latest/apidocs">JavaDocs</a></li>
     </ul>
     
+    <a href="http://bit.ly/1n9YlQT" target="_blank">
+      <img src="http://bit.ly/1ttg6CE" width="125" height="125" alt="I'm Speaking at ApacheCon Europe 2014! Join me!" title="I'm Speaking at ApacheCon Europe 2014! Join me!" border="0">
+    </a>
     
-    <h5>Support</h5>
+    <h5>ApacheDS 2.0</h5>
     <ul>
-        <li><a href="./../../mailing-lists-and-irc.html">Mailing Lists &amp; IRC</a></li>
-        <li><a href="./../../sources.html">Sources</a></li>
-        <li><a href="./../../issue-tracking.html">Issue Tracking</a></li>
-        <li><a href="./../../commercial-support.html">Commercial Support</a></li>
+        <li><a href="./../../apacheds/">Home</a></li>
+        <li><a href="./../../apacheds/news.html">News</a></li>
+        <li><a href="./../../apacheds/features.html">Features</a></li>
     </ul>
-    <h5>Community</h5>
+    <h5>Downloads</h5>
     <ul>
-        <li><a href="./../../contribute.html">How to Contribute</a></li>
-        <li><a href="./../../team.html">Team</a></li>
-        <li><a href="./../../original-project-proposal.html">Original Project Proposal</a></li>
-        <li><a href="./../../special-thanks.html" class="external-link" rel="nofollow">Special Thanks</a></li>
+        <li><a href="./../../apacheds/downloads.html">ApacheDS 2.0.0-M17</a>&nbsp;&nbsp;<img src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+        <li><a href="./../../apacheds/download-old-versions.html">Older versions</a></li>
     </ul>
-    <h5>About Apache</h5>
+    <h5>Documentation</h5>
     <ul>
-        <li><a href="http://www.apache.org/">Apache</a></li>
-        <li><a href="http://www.apache.org/licenses/">License</a></li>
-        <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-        <li><a href="http://www.apache.org/security/">Security</a></li>
+        <li><a href="./../../apacheds/basic-user-guide.html">Basic User Guide </a></li>
+        <li><a href="./../../apacheds/advanced-user-guide.html">Advanced User Guide</a></li>
+        <li><a href="./../../apacheds/developer-guide.html">Developer Guide</a></li>
+        <li><a href="./../../apacheds/kerberos-user-guide.html">Kerberos User Guide</a></li>
+        <li><a href="./../../apacheds/configuration/ads-2.0-configuration.html">Configuration</a></li>
+        <li><a href="./../../apacheds/gen-docs/latest/apidocs">JavaDocs</a></li>
     </ul>
     
-    
-</div><!-- navigation -->
-
                 </div><!-- leftColumn -->
                 <div id="rightColumn">
 

Modified: websites/staging/directory/trunk/content/apacheds/advanced-ug/4.2.6.3-constraints.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/advanced-ug/4.2.6.3-constraints.html (original)
+++ websites/staging/directory/trunk/content/apacheds/advanced-ug/4.2.6.3-constraints.html Thu Oct 16 14:57:59 2014
@@ -105,33 +105,31 @@
         <li><a href="./../../apacheds/gen-docs/latest/apidocs">JavaDocs</a></li>
     </ul>
     
+    <a href="http://bit.ly/1n9YlQT" target="_blank">
+      <img src="http://bit.ly/1ttg6CE" width="125" height="125" alt="I'm Speaking at ApacheCon Europe 2014! Join me!" title="I'm Speaking at ApacheCon Europe 2014! Join me!" border="0">
+    </a>
     
-    <h5>Support</h5>
+    <h5>ApacheDS 2.0</h5>
     <ul>
-        <li><a href="./../../mailing-lists-and-irc.html">Mailing Lists &amp; IRC</a></li>
-        <li><a href="./../../sources.html">Sources</a></li>
-        <li><a href="./../../issue-tracking.html">Issue Tracking</a></li>
-        <li><a href="./../../commercial-support.html">Commercial Support</a></li>
+        <li><a href="./../../apacheds/">Home</a></li>
+        <li><a href="./../../apacheds/news.html">News</a></li>
+        <li><a href="./../../apacheds/features.html">Features</a></li>
     </ul>
-    <h5>Community</h5>
+    <h5>Downloads</h5>
     <ul>
-        <li><a href="./../../contribute.html">How to Contribute</a></li>
-        <li><a href="./../../team.html">Team</a></li>
-        <li><a href="./../../original-project-proposal.html">Original Project Proposal</a></li>
-        <li><a href="./../../special-thanks.html" class="external-link" rel="nofollow">Special Thanks</a></li>
+        <li><a href="./../../apacheds/downloads.html">ApacheDS 2.0.0-M17</a>&nbsp;&nbsp;<img src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+        <li><a href="./../../apacheds/download-old-versions.html">Older versions</a></li>
     </ul>
-    <h5>About Apache</h5>
+    <h5>Documentation</h5>
     <ul>
-        <li><a href="http://www.apache.org/">Apache</a></li>
-        <li><a href="http://www.apache.org/licenses/">License</a></li>
-        <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-        <li><a href="http://www.apache.org/security/">Security</a></li>
+        <li><a href="./../../apacheds/basic-user-guide.html">Basic User Guide </a></li>
+        <li><a href="./../../apacheds/advanced-user-guide.html">Advanced User Guide</a></li>
+        <li><a href="./../../apacheds/developer-guide.html">Developer Guide</a></li>
+        <li><a href="./../../apacheds/kerberos-user-guide.html">Kerberos User Guide</a></li>
+        <li><a href="./../../apacheds/configuration/ads-2.0-configuration.html">Configuration</a></li>
+        <li><a href="./../../apacheds/gen-docs/latest/apidocs">JavaDocs</a></li>
     </ul>
     
-    
-</div><!-- navigation -->
-
                 </div><!-- leftColumn -->
                 <div id="rightColumn">
 

Modified: websites/staging/directory/trunk/content/apacheds/advanced-ug/4.2.6.4-priority.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/advanced-ug/4.2.6.4-priority.html (original)
+++ websites/staging/directory/trunk/content/apacheds/advanced-ug/4.2.6.4-priority.html Thu Oct 16 14:57:59 2014
@@ -105,33 +105,31 @@
         <li><a href="./../../apacheds/gen-docs/latest/apidocs">JavaDocs</a></li>
     </ul>
     
+    <a href="http://bit.ly/1n9YlQT" target="_blank">
+      <img src="http://bit.ly/1ttg6CE" width="125" height="125" alt="I'm Speaking at ApacheCon Europe 2014! Join me!" title="I'm Speaking at ApacheCon Europe 2014! Join me!" border="0">
+    </a>
     
-    <h5>Support</h5>
+    <h5>ApacheDS 2.0</h5>
     <ul>
-        <li><a href="./../../mailing-lists-and-irc.html">Mailing Lists &amp; IRC</a></li>
-        <li><a href="./../../sources.html">Sources</a></li>
-        <li><a href="./../../issue-tracking.html">Issue Tracking</a></li>
-        <li><a href="./../../commercial-support.html">Commercial Support</a></li>
+        <li><a href="./../../apacheds/">Home</a></li>
+        <li><a href="./../../apacheds/news.html">News</a></li>
+        <li><a href="./../../apacheds/features.html">Features</a></li>
     </ul>
-    <h5>Community</h5>
+    <h5>Downloads</h5>
     <ul>
-        <li><a href="./../../contribute.html">How to Contribute</a></li>
-        <li><a href="./../../team.html">Team</a></li>
-        <li><a href="./../../original-project-proposal.html">Original Project Proposal</a></li>
-        <li><a href="./../../special-thanks.html" class="external-link" rel="nofollow">Special Thanks</a></li>
+        <li><a href="./../../apacheds/downloads.html">ApacheDS 2.0.0-M17</a>&nbsp;&nbsp;<img src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+        <li><a href="./../../apacheds/download-old-versions.html">Older versions</a></li>
     </ul>
-    <h5>About Apache</h5>
+    <h5>Documentation</h5>
     <ul>
-        <li><a href="http://www.apache.org/">Apache</a></li>
-        <li><a href="http://www.apache.org/licenses/">License</a></li>
-        <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-        <li><a href="http://www.apache.org/security/">Security</a></li>
+        <li><a href="./../../apacheds/basic-user-guide.html">Basic User Guide </a></li>
+        <li><a href="./../../apacheds/advanced-user-guide.html">Advanced User Guide</a></li>
+        <li><a href="./../../apacheds/developer-guide.html">Developer Guide</a></li>
+        <li><a href="./../../apacheds/kerberos-user-guide.html">Kerberos User Guide</a></li>
+        <li><a href="./../../apacheds/configuration/ads-2.0-configuration.html">Configuration</a></li>
+        <li><a href="./../../apacheds/gen-docs/latest/apidocs">JavaDocs</a></li>
     </ul>
     
-    
-</div><!-- navigation -->
-
                 </div><!-- leftColumn -->
                 <div id="rightColumn">
 

Modified: websites/staging/directory/trunk/content/apacheds/advanced-ug/4.2.7-using-acis-trail.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/advanced-ug/4.2.7-using-acis-trail.html (original)
+++ websites/staging/directory/trunk/content/apacheds/advanced-ug/4.2.7-using-acis-trail.html Thu Oct 16 14:57:59 2014
@@ -105,33 +105,31 @@
         <li><a href="./../../apacheds/gen-docs/latest/apidocs">JavaDocs</a></li>
     </ul>
     
+    <a href="http://bit.ly/1n9YlQT" target="_blank">
+      <img src="http://bit.ly/1ttg6CE" width="125" height="125" alt="I'm Speaking at ApacheCon Europe 2014! Join me!" title="I'm Speaking at ApacheCon Europe 2014! Join me!" border="0">
+    </a>
     
-    <h5>Support</h5>
+    <h5>ApacheDS 2.0</h5>
     <ul>
-        <li><a href="./../../mailing-lists-and-irc.html">Mailing Lists &amp; IRC</a></li>
-        <li><a href="./../../sources.html">Sources</a></li>
-        <li><a href="./../../issue-tracking.html">Issue Tracking</a></li>
-        <li><a href="./../../commercial-support.html">Commercial Support</a></li>
+        <li><a href="./../../apacheds/">Home</a></li>
+        <li><a href="./../../apacheds/news.html">News</a></li>
+        <li><a href="./../../apacheds/features.html">Features</a></li>
     </ul>
-    <h5>Community</h5>
+    <h5>Downloads</h5>
     <ul>
-        <li><a href="./../../contribute.html">How to Contribute</a></li>
-        <li><a href="./../../team.html">Team</a></li>
-        <li><a href="./../../original-project-proposal.html">Original Project Proposal</a></li>
-        <li><a href="./../../special-thanks.html" class="external-link" rel="nofollow">Special Thanks</a></li>
+        <li><a href="./../../apacheds/downloads.html">ApacheDS 2.0.0-M17</a>&nbsp;&nbsp;<img src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+        <li><a href="./../../apacheds/download-old-versions.html">Older versions</a></li>
     </ul>
-    <h5>About Apache</h5>
+    <h5>Documentation</h5>
     <ul>
-        <li><a href="http://www.apache.org/">Apache</a></li>
-        <li><a href="http://www.apache.org/licenses/">License</a></li>
-        <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-        <li><a href="http://www.apache.org/security/">Security</a></li>
+        <li><a href="./../../apacheds/basic-user-guide.html">Basic User Guide </a></li>
+        <li><a href="./../../apacheds/advanced-user-guide.html">Advanced User Guide</a></li>
+        <li><a href="./../../apacheds/developer-guide.html">Developer Guide</a></li>
+        <li><a href="./../../apacheds/kerberos-user-guide.html">Kerberos User Guide</a></li>
+        <li><a href="./../../apacheds/configuration/ads-2.0-configuration.html">Configuration</a></li>
+        <li><a href="./../../apacheds/gen-docs/latest/apidocs">JavaDocs</a></li>
     </ul>
     
-    
-</div><!-- navigation -->
-
                 </div><!-- leftColumn -->
                 <div id="rightColumn">
 

Modified: websites/staging/directory/trunk/content/apacheds/advanced-ug/4.2.7.1-enable-authenticated-users-to-browse-and-read-entries.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/advanced-ug/4.2.7.1-enable-authenticated-users-to-browse-and-read-entries.html (original)
+++ websites/staging/directory/trunk/content/apacheds/advanced-ug/4.2.7.1-enable-authenticated-users-to-browse-and-read-entries.html Thu Oct 16 14:57:59 2014
@@ -105,33 +105,31 @@
         <li><a href="./../../apacheds/gen-docs/latest/apidocs">JavaDocs</a></li>
     </ul>
     
+    <a href="http://bit.ly/1n9YlQT" target="_blank">
+      <img src="http://bit.ly/1ttg6CE" width="125" height="125" alt="I'm Speaking at ApacheCon Europe 2014! Join me!" title="I'm Speaking at ApacheCon Europe 2014! Join me!" border="0">
+    </a>
     
-    <h5>Support</h5>
+    <h5>ApacheDS 2.0</h5>
     <ul>
-        <li><a href="./../../mailing-lists-and-irc.html">Mailing Lists &amp; IRC</a></li>
-        <li><a href="./../../sources.html">Sources</a></li>
-        <li><a href="./../../issue-tracking.html">Issue Tracking</a></li>
-        <li><a href="./../../commercial-support.html">Commercial Support</a></li>
+        <li><a href="./../../apacheds/">Home</a></li>
+        <li><a href="./../../apacheds/news.html">News</a></li>
+        <li><a href="./../../apacheds/features.html">Features</a></li>
     </ul>
-    <h5>Community</h5>
+    <h5>Downloads</h5>
     <ul>
-        <li><a href="./../../contribute.html">How to Contribute</a></li>
-        <li><a href="./../../team.html">Team</a></li>
-        <li><a href="./../../original-project-proposal.html">Original Project Proposal</a></li>
-        <li><a href="./../../special-thanks.html" class="external-link" rel="nofollow">Special Thanks</a></li>
+        <li><a href="./../../apacheds/downloads.html">ApacheDS 2.0.0-M17</a>&nbsp;&nbsp;<img src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+        <li><a href="./../../apacheds/download-old-versions.html">Older versions</a></li>
     </ul>
-    <h5>About Apache</h5>
+    <h5>Documentation</h5>
     <ul>
-        <li><a href="http://www.apache.org/">Apache</a></li>
-        <li><a href="http://www.apache.org/licenses/">License</a></li>
-        <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-        <li><a href="http://www.apache.org/security/">Security</a></li>
+        <li><a href="./../../apacheds/basic-user-guide.html">Basic User Guide </a></li>
+        <li><a href="./../../apacheds/advanced-user-guide.html">Advanced User Guide</a></li>
+        <li><a href="./../../apacheds/developer-guide.html">Developer Guide</a></li>
+        <li><a href="./../../apacheds/kerberos-user-guide.html">Kerberos User Guide</a></li>
+        <li><a href="./../../apacheds/configuration/ads-2.0-configuration.html">Configuration</a></li>
+        <li><a href="./../../apacheds/gen-docs/latest/apidocs">JavaDocs</a></li>
     </ul>
     
-    
-</div><!-- navigation -->
-
                 </div><!-- leftColumn -->
                 <div id="rightColumn">
 

Modified: websites/staging/directory/trunk/content/apacheds/advanced-ug/4.2.7.2-allow-self-password-modify.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/advanced-ug/4.2.7.2-allow-self-password-modify.html (original)
+++ websites/staging/directory/trunk/content/apacheds/advanced-ug/4.2.7.2-allow-self-password-modify.html Thu Oct 16 14:57:59 2014
@@ -105,33 +105,31 @@
         <li><a href="./../../apacheds/gen-docs/latest/apidocs">JavaDocs</a></li>
     </ul>
     
+    <a href="http://bit.ly/1n9YlQT" target="_blank">
+      <img src="http://bit.ly/1ttg6CE" width="125" height="125" alt="I'm Speaking at ApacheCon Europe 2014! Join me!" title="I'm Speaking at ApacheCon Europe 2014! Join me!" border="0">
+    </a>
     
-    <h5>Support</h5>
+    <h5>ApacheDS 2.0</h5>
     <ul>
-        <li><a href="./../../mailing-lists-and-irc.html">Mailing Lists &amp; IRC</a></li>
-        <li><a href="./../../sources.html">Sources</a></li>
-        <li><a href="./../../issue-tracking.html">Issue Tracking</a></li>
-        <li><a href="./../../commercial-support.html">Commercial Support</a></li>
+        <li><a href="./../../apacheds/">Home</a></li>
+        <li><a href="./../../apacheds/news.html">News</a></li>
+        <li><a href="./../../apacheds/features.html">Features</a></li>
     </ul>
-    <h5>Community</h5>
+    <h5>Downloads</h5>
     <ul>
-        <li><a href="./../../contribute.html">How to Contribute</a></li>
-        <li><a href="./../../team.html">Team</a></li>
-        <li><a href="./../../original-project-proposal.html">Original Project Proposal</a></li>
-        <li><a href="./../../special-thanks.html" class="external-link" rel="nofollow">Special Thanks</a></li>
+        <li><a href="./../../apacheds/downloads.html">ApacheDS 2.0.0-M17</a>&nbsp;&nbsp;<img src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+        <li><a href="./../../apacheds/download-old-versions.html">Older versions</a></li>
     </ul>
-    <h5>About Apache</h5>
+    <h5>Documentation</h5>
     <ul>
-        <li><a href="http://www.apache.org/">Apache</a></li>
-        <li><a href="http://www.apache.org/licenses/">License</a></li>
-        <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-        <li><a href="http://www.apache.org/security/">Security</a></li>
+        <li><a href="./../../apacheds/basic-user-guide.html">Basic User Guide </a></li>
+        <li><a href="./../../apacheds/advanced-user-guide.html">Advanced User Guide</a></li>
+        <li><a href="./../../apacheds/developer-guide.html">Developer Guide</a></li>
+        <li><a href="./../../apacheds/kerberos-user-guide.html">Kerberos User Guide</a></li>
+        <li><a href="./../../apacheds/configuration/ads-2.0-configuration.html">Configuration</a></li>
+        <li><a href="./../../apacheds/gen-docs/latest/apidocs">JavaDocs</a></li>
     </ul>
     
-    
-</div><!-- navigation -->
-
                 </div><!-- leftColumn -->
                 <div id="rightColumn">
 

Modified: websites/staging/directory/trunk/content/apacheds/advanced-ug/4.2.8-acis-administration.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/advanced-ug/4.2.8-acis-administration.html (original)
+++ websites/staging/directory/trunk/content/apacheds/advanced-ug/4.2.8-acis-administration.html Thu Oct 16 14:57:59 2014
@@ -105,33 +105,31 @@
         <li><a href="./../../apacheds/gen-docs/latest/apidocs">JavaDocs</a></li>
     </ul>
     
+    <a href="http://bit.ly/1n9YlQT" target="_blank">
+      <img src="http://bit.ly/1ttg6CE" width="125" height="125" alt="I'm Speaking at ApacheCon Europe 2014! Join me!" title="I'm Speaking at ApacheCon Europe 2014! Join me!" border="0">
+    </a>
     
-    <h5>Support</h5>
+    <h5>ApacheDS 2.0</h5>
     <ul>
-        <li><a href="./../../mailing-lists-and-irc.html">Mailing Lists &amp; IRC</a></li>
-        <li><a href="./../../sources.html">Sources</a></li>
-        <li><a href="./../../issue-tracking.html">Issue Tracking</a></li>
-        <li><a href="./../../commercial-support.html">Commercial Support</a></li>
+        <li><a href="./../../apacheds/">Home</a></li>
+        <li><a href="./../../apacheds/news.html">News</a></li>
+        <li><a href="./../../apacheds/features.html">Features</a></li>
     </ul>
-    <h5>Community</h5>
+    <h5>Downloads</h5>
     <ul>
-        <li><a href="./../../contribute.html">How to Contribute</a></li>
-        <li><a href="./../../team.html">Team</a></li>
-        <li><a href="./../../original-project-proposal.html">Original Project Proposal</a></li>
-        <li><a href="./../../special-thanks.html" class="external-link" rel="nofollow">Special Thanks</a></li>
+        <li><a href="./../../apacheds/downloads.html">ApacheDS 2.0.0-M17</a>&nbsp;&nbsp;<img src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+        <li><a href="./../../apacheds/download-old-versions.html">Older versions</a></li>
     </ul>
-    <h5>About Apache</h5>
+    <h5>Documentation</h5>
     <ul>
-        <li><a href="http://www.apache.org/">Apache</a></li>
-        <li><a href="http://www.apache.org/licenses/">License</a></li>
-        <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-        <li><a href="http://www.apache.org/security/">Security</a></li>
+        <li><a href="./../../apacheds/basic-user-guide.html">Basic User Guide </a></li>
+        <li><a href="./../../apacheds/advanced-user-guide.html">Advanced User Guide</a></li>
+        <li><a href="./../../apacheds/developer-guide.html">Developer Guide</a></li>
+        <li><a href="./../../apacheds/kerberos-user-guide.html">Kerberos User Guide</a></li>
+        <li><a href="./../../apacheds/configuration/ads-2.0-configuration.html">Configuration</a></li>
+        <li><a href="./../../apacheds/gen-docs/latest/apidocs">JavaDocs</a></li>
     </ul>
     
-    
-</div><!-- navigation -->
-
                 </div><!-- leftColumn -->
                 <div id="rightColumn">
 

Modified: websites/staging/directory/trunk/content/apacheds/advanced-ug/4.2.9-migration-from-other-ldap-servers.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/advanced-ug/4.2.9-migration-from-other-ldap-servers.html (original)
+++ websites/staging/directory/trunk/content/apacheds/advanced-ug/4.2.9-migration-from-other-ldap-servers.html Thu Oct 16 14:57:59 2014
@@ -105,33 +105,31 @@
         <li><a href="./../../apacheds/gen-docs/latest/apidocs">JavaDocs</a></li>
     </ul>
     
+    <a href="http://bit.ly/1n9YlQT" target="_blank">
+      <img src="http://bit.ly/1ttg6CE" width="125" height="125" alt="I'm Speaking at ApacheCon Europe 2014! Join me!" title="I'm Speaking at ApacheCon Europe 2014! Join me!" border="0">
+    </a>
     
-    <h5>Support</h5>
+    <h5>ApacheDS 2.0</h5>
     <ul>
-        <li><a href="./../../mailing-lists-and-irc.html">Mailing Lists &amp; IRC</a></li>
-        <li><a href="./../../sources.html">Sources</a></li>
-        <li><a href="./../../issue-tracking.html">Issue Tracking</a></li>
-        <li><a href="./../../commercial-support.html">Commercial Support</a></li>
+        <li><a href="./../../apacheds/">Home</a></li>
+        <li><a href="./../../apacheds/news.html">News</a></li>
+        <li><a href="./../../apacheds/features.html">Features</a></li>
     </ul>
-    <h5>Community</h5>
+    <h5>Downloads</h5>
     <ul>
-        <li><a href="./../../contribute.html">How to Contribute</a></li>
-        <li><a href="./../../team.html">Team</a></li>
-        <li><a href="./../../original-project-proposal.html">Original Project Proposal</a></li>
-        <li><a href="./../../special-thanks.html" class="external-link" rel="nofollow">Special Thanks</a></li>
+        <li><a href="./../../apacheds/downloads.html">ApacheDS 2.0.0-M17</a>&nbsp;&nbsp;<img src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+        <li><a href="./../../apacheds/download-old-versions.html">Older versions</a></li>
     </ul>
-    <h5>About Apache</h5>
+    <h5>Documentation</h5>
     <ul>
-        <li><a href="http://www.apache.org/">Apache</a></li>
-        <li><a href="http://www.apache.org/licenses/">License</a></li>
-        <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-        <li><a href="http://www.apache.org/security/">Security</a></li>
+        <li><a href="./../../apacheds/basic-user-guide.html">Basic User Guide </a></li>
+        <li><a href="./../../apacheds/advanced-user-guide.html">Advanced User Guide</a></li>
+        <li><a href="./../../apacheds/developer-guide.html">Developer Guide</a></li>
+        <li><a href="./../../apacheds/kerberos-user-guide.html">Kerberos User Guide</a></li>
+        <li><a href="./../../apacheds/configuration/ads-2.0-configuration.html">Configuration</a></li>
+        <li><a href="./../../apacheds/gen-docs/latest/apidocs">JavaDocs</a></li>
     </ul>
     
-    
-</div><!-- navigation -->
-
                 </div><!-- leftColumn -->
                 <div id="rightColumn">
 

Modified: websites/staging/directory/trunk/content/apacheds/advanced-ug/4.3-password-policy.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/advanced-ug/4.3-password-policy.html (original)
+++ websites/staging/directory/trunk/content/apacheds/advanced-ug/4.3-password-policy.html Thu Oct 16 14:57:59 2014
@@ -105,33 +105,31 @@
         <li><a href="./../../apacheds/gen-docs/latest/apidocs">JavaDocs</a></li>
     </ul>
     
+    <a href="http://bit.ly/1n9YlQT" target="_blank">
+      <img src="http://bit.ly/1ttg6CE" width="125" height="125" alt="I'm Speaking at ApacheCon Europe 2014! Join me!" title="I'm Speaking at ApacheCon Europe 2014! Join me!" border="0">
+    </a>
     
-    <h5>Support</h5>
+    <h5>ApacheDS 2.0</h5>
     <ul>
-        <li><a href="./../../mailing-lists-and-irc.html">Mailing Lists &amp; IRC</a></li>
-        <li><a href="./../../sources.html">Sources</a></li>
-        <li><a href="./../../issue-tracking.html">Issue Tracking</a></li>
-        <li><a href="./../../commercial-support.html">Commercial Support</a></li>
+        <li><a href="./../../apacheds/">Home</a></li>
+        <li><a href="./../../apacheds/news.html">News</a></li>
+        <li><a href="./../../apacheds/features.html">Features</a></li>
     </ul>
-    <h5>Community</h5>
+    <h5>Downloads</h5>
     <ul>
-        <li><a href="./../../contribute.html">How to Contribute</a></li>
-        <li><a href="./../../team.html">Team</a></li>
-        <li><a href="./../../original-project-proposal.html">Original Project Proposal</a></li>
-        <li><a href="./../../special-thanks.html" class="external-link" rel="nofollow">Special Thanks</a></li>
+        <li><a href="./../../apacheds/downloads.html">ApacheDS 2.0.0-M17</a>&nbsp;&nbsp;<img src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+        <li><a href="./../../apacheds/download-old-versions.html">Older versions</a></li>
     </ul>
-    <h5>About Apache</h5>
+    <h5>Documentation</h5>
     <ul>
-        <li><a href="http://www.apache.org/">Apache</a></li>
-        <li><a href="http://www.apache.org/licenses/">License</a></li>
-        <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-        <li><a href="http://www.apache.org/security/">Security</a></li>
+        <li><a href="./../../apacheds/basic-user-guide.html">Basic User Guide </a></li>
+        <li><a href="./../../apacheds/advanced-user-guide.html">Advanced User Guide</a></li>
+        <li><a href="./../../apacheds/developer-guide.html">Developer Guide</a></li>
+        <li><a href="./../../apacheds/kerberos-user-guide.html">Kerberos User Guide</a></li>
+        <li><a href="./../../apacheds/configuration/ads-2.0-configuration.html">Configuration</a></li>
+        <li><a href="./../../apacheds/gen-docs/latest/apidocs">JavaDocs</a></li>
     </ul>
     
-    
-</div><!-- navigation -->
-
                 </div><!-- leftColumn -->
                 <div id="rightColumn">
 

Modified: websites/staging/directory/trunk/content/apacheds/advanced-ug/5-administration.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/advanced-ug/5-administration.html (original)
+++ websites/staging/directory/trunk/content/apacheds/advanced-ug/5-administration.html Thu Oct 16 14:57:59 2014
@@ -105,33 +105,31 @@
         <li><a href="./../../apacheds/gen-docs/latest/apidocs">JavaDocs</a></li>
     </ul>
     
+    <a href="http://bit.ly/1n9YlQT" target="_blank">
+      <img src="http://bit.ly/1ttg6CE" width="125" height="125" alt="I'm Speaking at ApacheCon Europe 2014! Join me!" title="I'm Speaking at ApacheCon Europe 2014! Join me!" border="0">
+    </a>
     
-    <h5>Support</h5>
+    <h5>ApacheDS 2.0</h5>
     <ul>
-        <li><a href="./../../mailing-lists-and-irc.html">Mailing Lists &amp; IRC</a></li>
-        <li><a href="./../../sources.html">Sources</a></li>
-        <li><a href="./../../issue-tracking.html">Issue Tracking</a></li>
-        <li><a href="./../../commercial-support.html">Commercial Support</a></li>
+        <li><a href="./../../apacheds/">Home</a></li>
+        <li><a href="./../../apacheds/news.html">News</a></li>
+        <li><a href="./../../apacheds/features.html">Features</a></li>
     </ul>
-    <h5>Community</h5>
+    <h5>Downloads</h5>
     <ul>
-        <li><a href="./../../contribute.html">How to Contribute</a></li>
-        <li><a href="./../../team.html">Team</a></li>
-        <li><a href="./../../original-project-proposal.html">Original Project Proposal</a></li>
-        <li><a href="./../../special-thanks.html" class="external-link" rel="nofollow">Special Thanks</a></li>
+        <li><a href="./../../apacheds/downloads.html">ApacheDS 2.0.0-M17</a>&nbsp;&nbsp;<img src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+        <li><a href="./../../apacheds/download-old-versions.html">Older versions</a></li>
     </ul>
-    <h5>About Apache</h5>
+    <h5>Documentation</h5>
     <ul>
-        <li><a href="http://www.apache.org/">Apache</a></li>
-        <li><a href="http://www.apache.org/licenses/">License</a></li>
-        <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-        <li><a href="http://www.apache.org/security/">Security</a></li>
+        <li><a href="./../../apacheds/basic-user-guide.html">Basic User Guide </a></li>
+        <li><a href="./../../apacheds/advanced-user-guide.html">Advanced User Guide</a></li>
+        <li><a href="./../../apacheds/developer-guide.html">Developer Guide</a></li>
+        <li><a href="./../../apacheds/kerberos-user-guide.html">Kerberos User Guide</a></li>
+        <li><a href="./../../apacheds/configuration/ads-2.0-configuration.html">Configuration</a></li>
+        <li><a href="./../../apacheds/gen-docs/latest/apidocs">JavaDocs</a></li>
     </ul>
     
-    
-</div><!-- navigation -->
-
                 </div><!-- leftColumn -->
                 <div id="rightColumn">
 

Modified: websites/staging/directory/trunk/content/apacheds/advanced-ug/5.1-layout.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/advanced-ug/5.1-layout.html (original)
+++ websites/staging/directory/trunk/content/apacheds/advanced-ug/5.1-layout.html Thu Oct 16 14:57:59 2014
@@ -105,33 +105,31 @@
         <li><a href="./../../apacheds/gen-docs/latest/apidocs">JavaDocs</a></li>
     </ul>
     
+    <a href="http://bit.ly/1n9YlQT" target="_blank">
+      <img src="http://bit.ly/1ttg6CE" width="125" height="125" alt="I'm Speaking at ApacheCon Europe 2014! Join me!" title="I'm Speaking at ApacheCon Europe 2014! Join me!" border="0">
+    </a>
     
-    <h5>Support</h5>
+    <h5>ApacheDS 2.0</h5>
     <ul>
-        <li><a href="./../../mailing-lists-and-irc.html">Mailing Lists &amp; IRC</a></li>
-        <li><a href="./../../sources.html">Sources</a></li>
-        <li><a href="./../../issue-tracking.html">Issue Tracking</a></li>
-        <li><a href="./../../commercial-support.html">Commercial Support</a></li>
+        <li><a href="./../../apacheds/">Home</a></li>
+        <li><a href="./../../apacheds/news.html">News</a></li>
+        <li><a href="./../../apacheds/features.html">Features</a></li>
     </ul>
-    <h5>Community</h5>
+    <h5>Downloads</h5>
     <ul>
-        <li><a href="./../../contribute.html">How to Contribute</a></li>
-        <li><a href="./../../team.html">Team</a></li>
-        <li><a href="./../../original-project-proposal.html">Original Project Proposal</a></li>
-        <li><a href="./../../special-thanks.html" class="external-link" rel="nofollow">Special Thanks</a></li>
+        <li><a href="./../../apacheds/downloads.html">ApacheDS 2.0.0-M17</a>&nbsp;&nbsp;<img src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+        <li><a href="./../../apacheds/download-old-versions.html">Older versions</a></li>
     </ul>
-    <h5>About Apache</h5>
+    <h5>Documentation</h5>
     <ul>
-        <li><a href="http://www.apache.org/">Apache</a></li>
-        <li><a href="http://www.apache.org/licenses/">License</a></li>
-        <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-        <li><a href="http://www.apache.org/security/">Security</a></li>
+        <li><a href="./../../apacheds/basic-user-guide.html">Basic User Guide </a></li>
+        <li><a href="./../../apacheds/advanced-user-guide.html">Advanced User Guide</a></li>
+        <li><a href="./../../apacheds/developer-guide.html">Developer Guide</a></li>
+        <li><a href="./../../apacheds/kerberos-user-guide.html">Kerberos User Guide</a></li>
+        <li><a href="./../../apacheds/configuration/ads-2.0-configuration.html">Configuration</a></li>
+        <li><a href="./../../apacheds/gen-docs/latest/apidocs">JavaDocs</a></li>
     </ul>
     
-    
-</div><!-- navigation -->
-
                 </div><!-- leftColumn -->
                 <div id="rightColumn">
 

Modified: websites/staging/directory/trunk/content/apacheds/advanced-ug/5.2-start-stop.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/advanced-ug/5.2-start-stop.html (original)
+++ websites/staging/directory/trunk/content/apacheds/advanced-ug/5.2-start-stop.html Thu Oct 16 14:57:59 2014
@@ -105,33 +105,31 @@
         <li><a href="./../../apacheds/gen-docs/latest/apidocs">JavaDocs</a></li>
     </ul>
     
+    <a href="http://bit.ly/1n9YlQT" target="_blank">
+      <img src="http://bit.ly/1ttg6CE" width="125" height="125" alt="I'm Speaking at ApacheCon Europe 2014! Join me!" title="I'm Speaking at ApacheCon Europe 2014! Join me!" border="0">
+    </a>
     
-    <h5>Support</h5>
+    <h5>ApacheDS 2.0</h5>
     <ul>
-        <li><a href="./../../mailing-lists-and-irc.html">Mailing Lists &amp; IRC</a></li>
-        <li><a href="./../../sources.html">Sources</a></li>
-        <li><a href="./../../issue-tracking.html">Issue Tracking</a></li>
-        <li><a href="./../../commercial-support.html">Commercial Support</a></li>
+        <li><a href="./../../apacheds/">Home</a></li>
+        <li><a href="./../../apacheds/news.html">News</a></li>
+        <li><a href="./../../apacheds/features.html">Features</a></li>
     </ul>
-    <h5>Community</h5>
+    <h5>Downloads</h5>
     <ul>
-        <li><a href="./../../contribute.html">How to Contribute</a></li>
-        <li><a href="./../../team.html">Team</a></li>
-        <li><a href="./../../original-project-proposal.html">Original Project Proposal</a></li>
-        <li><a href="./../../special-thanks.html" class="external-link" rel="nofollow">Special Thanks</a></li>
+        <li><a href="./../../apacheds/downloads.html">ApacheDS 2.0.0-M17</a>&nbsp;&nbsp;<img src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+        <li><a href="./../../apacheds/download-old-versions.html">Older versions</a></li>
     </ul>
-    <h5>About Apache</h5>
+    <h5>Documentation</h5>
     <ul>
-        <li><a href="http://www.apache.org/">Apache</a></li>
-        <li><a href="http://www.apache.org/licenses/">License</a></li>
-        <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-        <li><a href="http://www.apache.org/security/">Security</a></li>
+        <li><a href="./../../apacheds/basic-user-guide.html">Basic User Guide </a></li>
+        <li><a href="./../../apacheds/advanced-user-guide.html">Advanced User Guide</a></li>
+        <li><a href="./../../apacheds/developer-guide.html">Developer Guide</a></li>
+        <li><a href="./../../apacheds/kerberos-user-guide.html">Kerberos User Guide</a></li>
+        <li><a href="./../../apacheds/configuration/ads-2.0-configuration.html">Configuration</a></li>
+        <li><a href="./../../apacheds/gen-docs/latest/apidocs">JavaDocs</a></li>
     </ul>
     
-    
-</div><!-- navigation -->
-
                 </div><!-- leftColumn -->
                 <div id="rightColumn">
 

Modified: websites/staging/directory/trunk/content/apacheds/advanced-ug/5.3-logs.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/advanced-ug/5.3-logs.html (original)
+++ websites/staging/directory/trunk/content/apacheds/advanced-ug/5.3-logs.html Thu Oct 16 14:57:59 2014
@@ -105,33 +105,31 @@
         <li><a href="./../../apacheds/gen-docs/latest/apidocs">JavaDocs</a></li>
     </ul>
     
+    <a href="http://bit.ly/1n9YlQT" target="_blank">
+      <img src="http://bit.ly/1ttg6CE" width="125" height="125" alt="I'm Speaking at ApacheCon Europe 2014! Join me!" title="I'm Speaking at ApacheCon Europe 2014! Join me!" border="0">
+    </a>
     
-    <h5>Support</h5>
+    <h5>ApacheDS 2.0</h5>
     <ul>
-        <li><a href="./../../mailing-lists-and-irc.html">Mailing Lists &amp; IRC</a></li>
-        <li><a href="./../../sources.html">Sources</a></li>
-        <li><a href="./../../issue-tracking.html">Issue Tracking</a></li>
-        <li><a href="./../../commercial-support.html">Commercial Support</a></li>
+        <li><a href="./../../apacheds/">Home</a></li>
+        <li><a href="./../../apacheds/news.html">News</a></li>
+        <li><a href="./../../apacheds/features.html">Features</a></li>
     </ul>
-    <h5>Community</h5>
+    <h5>Downloads</h5>
     <ul>
-        <li><a href="./../../contribute.html">How to Contribute</a></li>
-        <li><a href="./../../team.html">Team</a></li>
-        <li><a href="./../../original-project-proposal.html">Original Project Proposal</a></li>
-        <li><a href="./../../special-thanks.html" class="external-link" rel="nofollow">Special Thanks</a></li>
+        <li><a href="./../../apacheds/downloads.html">ApacheDS 2.0.0-M17</a>&nbsp;&nbsp;<img src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+        <li><a href="./../../apacheds/download-old-versions.html">Older versions</a></li>
     </ul>
-    <h5>About Apache</h5>
+    <h5>Documentation</h5>
     <ul>
-        <li><a href="http://www.apache.org/">Apache</a></li>
-        <li><a href="http://www.apache.org/licenses/">License</a></li>
-        <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-        <li><a href="http://www.apache.org/security/">Security</a></li>
+        <li><a href="./../../apacheds/basic-user-guide.html">Basic User Guide </a></li>
+        <li><a href="./../../apacheds/advanced-user-guide.html">Advanced User Guide</a></li>
+        <li><a href="./../../apacheds/developer-guide.html">Developer Guide</a></li>
+        <li><a href="./../../apacheds/kerberos-user-guide.html">Kerberos User Guide</a></li>
+        <li><a href="./../../apacheds/configuration/ads-2.0-configuration.html">Configuration</a></li>
+        <li><a href="./../../apacheds/gen-docs/latest/apidocs">JavaDocs</a></li>
     </ul>
     
-    
-</div><!-- navigation -->
-
                 </div><!-- leftColumn -->
                 <div id="rightColumn">
 

Modified: websites/staging/directory/trunk/content/apacheds/advanced-ug/5.4-replication.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/advanced-ug/5.4-replication.html (original)
+++ websites/staging/directory/trunk/content/apacheds/advanced-ug/5.4-replication.html Thu Oct 16 14:57:59 2014
@@ -105,33 +105,31 @@
         <li><a href="./../../apacheds/gen-docs/latest/apidocs">JavaDocs</a></li>
     </ul>
     
+    <a href="http://bit.ly/1n9YlQT" target="_blank">
+      <img src="http://bit.ly/1ttg6CE" width="125" height="125" alt="I'm Speaking at ApacheCon Europe 2014! Join me!" title="I'm Speaking at ApacheCon Europe 2014! Join me!" border="0">
+    </a>
     
-    <h5>Support</h5>
+    <h5>ApacheDS 2.0</h5>
     <ul>
-        <li><a href="./../../mailing-lists-and-irc.html">Mailing Lists &amp; IRC</a></li>
-        <li><a href="./../../sources.html">Sources</a></li>
-        <li><a href="./../../issue-tracking.html">Issue Tracking</a></li>
-        <li><a href="./../../commercial-support.html">Commercial Support</a></li>
+        <li><a href="./../../apacheds/">Home</a></li>
+        <li><a href="./../../apacheds/news.html">News</a></li>
+        <li><a href="./../../apacheds/features.html">Features</a></li>
     </ul>
-    <h5>Community</h5>
+    <h5>Downloads</h5>
     <ul>
-        <li><a href="./../../contribute.html">How to Contribute</a></li>
-        <li><a href="./../../team.html">Team</a></li>
-        <li><a href="./../../original-project-proposal.html">Original Project Proposal</a></li>
-        <li><a href="./../../special-thanks.html" class="external-link" rel="nofollow">Special Thanks</a></li>
+        <li><a href="./../../apacheds/downloads.html">ApacheDS 2.0.0-M17</a>&nbsp;&nbsp;<img src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+        <li><a href="./../../apacheds/download-old-versions.html">Older versions</a></li>
     </ul>
-    <h5>About Apache</h5>
+    <h5>Documentation</h5>
     <ul>
-        <li><a href="http://www.apache.org/">Apache</a></li>
-        <li><a href="http://www.apache.org/licenses/">License</a></li>
-        <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-        <li><a href="http://www.apache.org/security/">Security</a></li>
+        <li><a href="./../../apacheds/basic-user-guide.html">Basic User Guide </a></li>
+        <li><a href="./../../apacheds/advanced-user-guide.html">Advanced User Guide</a></li>
+        <li><a href="./../../apacheds/developer-guide.html">Developer Guide</a></li>
+        <li><a href="./../../apacheds/kerberos-user-guide.html">Kerberos User Guide</a></li>
+        <li><a href="./../../apacheds/configuration/ads-2.0-configuration.html">Configuration</a></li>
+        <li><a href="./../../apacheds/gen-docs/latest/apidocs">JavaDocs</a></li>
     </ul>
     
-    
-</div><!-- navigation -->
-
                 </div><!-- leftColumn -->
                 <div id="rightColumn">
 

Modified: websites/staging/directory/trunk/content/apacheds/advanced-ug/6-implementing-interceptor.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/advanced-ug/6-implementing-interceptor.html (original)
+++ websites/staging/directory/trunk/content/apacheds/advanced-ug/6-implementing-interceptor.html Thu Oct 16 14:57:59 2014
@@ -105,33 +105,31 @@
         <li><a href="./../../apacheds/gen-docs/latest/apidocs">JavaDocs</a></li>
     </ul>
     
+    <a href="http://bit.ly/1n9YlQT" target="_blank">
+      <img src="http://bit.ly/1ttg6CE" width="125" height="125" alt="I'm Speaking at ApacheCon Europe 2014! Join me!" title="I'm Speaking at ApacheCon Europe 2014! Join me!" border="0">
+    </a>
     
-    <h5>Support</h5>
+    <h5>ApacheDS 2.0</h5>
     <ul>
-        <li><a href="./../../mailing-lists-and-irc.html">Mailing Lists &amp; IRC</a></li>
-        <li><a href="./../../sources.html">Sources</a></li>
-        <li><a href="./../../issue-tracking.html">Issue Tracking</a></li>
-        <li><a href="./../../commercial-support.html">Commercial Support</a></li>
+        <li><a href="./../../apacheds/">Home</a></li>
+        <li><a href="./../../apacheds/news.html">News</a></li>
+        <li><a href="./../../apacheds/features.html">Features</a></li>
     </ul>
-    <h5>Community</h5>
+    <h5>Downloads</h5>
     <ul>
-        <li><a href="./../../contribute.html">How to Contribute</a></li>
-        <li><a href="./../../team.html">Team</a></li>
-        <li><a href="./../../original-project-proposal.html">Original Project Proposal</a></li>
-        <li><a href="./../../special-thanks.html" class="external-link" rel="nofollow">Special Thanks</a></li>
+        <li><a href="./../../apacheds/downloads.html">ApacheDS 2.0.0-M17</a>&nbsp;&nbsp;<img src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+        <li><a href="./../../apacheds/download-old-versions.html">Older versions</a></li>
     </ul>
-    <h5>About Apache</h5>
+    <h5>Documentation</h5>
     <ul>
-        <li><a href="http://www.apache.org/">Apache</a></li>
-        <li><a href="http://www.apache.org/licenses/">License</a></li>
-        <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-        <li><a href="http://www.apache.org/security/">Security</a></li>
+        <li><a href="./../../apacheds/basic-user-guide.html">Basic User Guide </a></li>
+        <li><a href="./../../apacheds/advanced-user-guide.html">Advanced User Guide</a></li>
+        <li><a href="./../../apacheds/developer-guide.html">Developer Guide</a></li>
+        <li><a href="./../../apacheds/kerberos-user-guide.html">Kerberos User Guide</a></li>
+        <li><a href="./../../apacheds/configuration/ads-2.0-configuration.html">Configuration</a></li>
+        <li><a href="./../../apacheds/gen-docs/latest/apidocs">JavaDocs</a></li>
     </ul>
     
-    
-</div><!-- navigation -->
-
                 </div><!-- leftColumn -->
                 <div id="rightColumn">
 

Modified: websites/staging/directory/trunk/content/apacheds/advanced-user-guide.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/advanced-user-guide.html (original)
+++ websites/staging/directory/trunk/content/apacheds/advanced-user-guide.html Thu Oct 16 14:57:59 2014
@@ -105,33 +105,31 @@
         <li><a href="./../apacheds/gen-docs/latest/apidocs">JavaDocs</a></li>
     </ul>
     
+    <a href="http://bit.ly/1n9YlQT" target="_blank">
+      <img src="http://bit.ly/1ttg6CE" width="125" height="125" alt="I'm Speaking at ApacheCon Europe 2014! Join me!" title="I'm Speaking at ApacheCon Europe 2014! Join me!" border="0">
+    </a>
     
-    <h5>Support</h5>
+    <h5>ApacheDS 2.0</h5>
     <ul>
-        <li><a href="./../mailing-lists-and-irc.html">Mailing Lists &amp; IRC</a></li>
-        <li><a href="./../sources.html">Sources</a></li>
-        <li><a href="./../issue-tracking.html">Issue Tracking</a></li>
-        <li><a href="./../commercial-support.html">Commercial Support</a></li>
+        <li><a href="./../apacheds/">Home</a></li>
+        <li><a href="./../apacheds/news.html">News</a></li>
+        <li><a href="./../apacheds/features.html">Features</a></li>
     </ul>
-    <h5>Community</h5>
+    <h5>Downloads</h5>
     <ul>
-        <li><a href="./../contribute.html">How to Contribute</a></li>
-        <li><a href="./../team.html">Team</a></li>
-        <li><a href="./../original-project-proposal.html">Original Project Proposal</a></li>
-        <li><a href="./../special-thanks.html" class="external-link" rel="nofollow">Special Thanks</a></li>
+        <li><a href="./../apacheds/downloads.html">ApacheDS 2.0.0-M17</a>&nbsp;&nbsp;<img src="./../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+        <li><a href="./../apacheds/download-old-versions.html">Older versions</a></li>
     </ul>
-    <h5>About Apache</h5>
+    <h5>Documentation</h5>
     <ul>
-        <li><a href="http://www.apache.org/">Apache</a></li>
-        <li><a href="http://www.apache.org/licenses/">License</a></li>
-        <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-        <li><a href="http://www.apache.org/security/">Security</a></li>
+        <li><a href="./../apacheds/basic-user-guide.html">Basic User Guide </a></li>
+        <li><a href="./../apacheds/advanced-user-guide.html">Advanced User Guide</a></li>
+        <li><a href="./../apacheds/developer-guide.html">Developer Guide</a></li>
+        <li><a href="./../apacheds/kerberos-user-guide.html">Kerberos User Guide</a></li>
+        <li><a href="./../apacheds/configuration/ads-2.0-configuration.html">Configuration</a></li>
+        <li><a href="./../apacheds/gen-docs/latest/apidocs">JavaDocs</a></li>
     </ul>
     
-    
-</div><!-- navigation -->
-
                 </div><!-- leftColumn -->
                 <div id="rightColumn">
 

Modified: websites/staging/directory/trunk/content/apacheds/basic-ug/1-how-to-begin.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/basic-ug/1-how-to-begin.html (original)
+++ websites/staging/directory/trunk/content/apacheds/basic-ug/1-how-to-begin.html Thu Oct 16 14:57:59 2014
@@ -105,33 +105,31 @@
         <li><a href="./../../apacheds/gen-docs/latest/apidocs">JavaDocs</a></li>
     </ul>
     
+    <a href="http://bit.ly/1n9YlQT" target="_blank">
+      <img src="http://bit.ly/1ttg6CE" width="125" height="125" alt="I'm Speaking at ApacheCon Europe 2014! Join me!" title="I'm Speaking at ApacheCon Europe 2014! Join me!" border="0">
+    </a>
     
-    <h5>Support</h5>
+    <h5>ApacheDS 2.0</h5>
     <ul>
-        <li><a href="./../../mailing-lists-and-irc.html">Mailing Lists &amp; IRC</a></li>
-        <li><a href="./../../sources.html">Sources</a></li>
-        <li><a href="./../../issue-tracking.html">Issue Tracking</a></li>
-        <li><a href="./../../commercial-support.html">Commercial Support</a></li>
+        <li><a href="./../../apacheds/">Home</a></li>
+        <li><a href="./../../apacheds/news.html">News</a></li>
+        <li><a href="./../../apacheds/features.html">Features</a></li>
     </ul>
-    <h5>Community</h5>
+    <h5>Downloads</h5>
     <ul>
-        <li><a href="./../../contribute.html">How to Contribute</a></li>
-        <li><a href="./../../team.html">Team</a></li>
-        <li><a href="./../../original-project-proposal.html">Original Project Proposal</a></li>
-        <li><a href="./../../special-thanks.html" class="external-link" rel="nofollow">Special Thanks</a></li>
+        <li><a href="./../../apacheds/downloads.html">ApacheDS 2.0.0-M17</a>&nbsp;&nbsp;<img src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+        <li><a href="./../../apacheds/download-old-versions.html">Older versions</a></li>
     </ul>
-    <h5>About Apache</h5>
+    <h5>Documentation</h5>
     <ul>
-        <li><a href="http://www.apache.org/">Apache</a></li>
-        <li><a href="http://www.apache.org/licenses/">License</a></li>
-        <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-        <li><a href="http://www.apache.org/security/">Security</a></li>
+        <li><a href="./../../apacheds/basic-user-guide.html">Basic User Guide </a></li>
+        <li><a href="./../../apacheds/advanced-user-guide.html">Advanced User Guide</a></li>
+        <li><a href="./../../apacheds/developer-guide.html">Developer Guide</a></li>
+        <li><a href="./../../apacheds/kerberos-user-guide.html">Kerberos User Guide</a></li>
+        <li><a href="./../../apacheds/configuration/ads-2.0-configuration.html">Configuration</a></li>
+        <li><a href="./../../apacheds/gen-docs/latest/apidocs">JavaDocs</a></li>
     </ul>
     
-    
-</div><!-- navigation -->
-
                 </div><!-- leftColumn -->
                 <div id="rightColumn">
 

Modified: websites/staging/directory/trunk/content/apacheds/basic-ug/1.1-what-apacheds-is.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/basic-ug/1.1-what-apacheds-is.html (original)
+++ websites/staging/directory/trunk/content/apacheds/basic-ug/1.1-what-apacheds-is.html Thu Oct 16 14:57:59 2014
@@ -105,33 +105,31 @@
         <li><a href="./../../apacheds/gen-docs/latest/apidocs">JavaDocs</a></li>
     </ul>
     
+    <a href="http://bit.ly/1n9YlQT" target="_blank">
+      <img src="http://bit.ly/1ttg6CE" width="125" height="125" alt="I'm Speaking at ApacheCon Europe 2014! Join me!" title="I'm Speaking at ApacheCon Europe 2014! Join me!" border="0">
+    </a>
     
-    <h5>Support</h5>
+    <h5>ApacheDS 2.0</h5>
     <ul>
-        <li><a href="./../../mailing-lists-and-irc.html">Mailing Lists &amp; IRC</a></li>
-        <li><a href="./../../sources.html">Sources</a></li>
-        <li><a href="./../../issue-tracking.html">Issue Tracking</a></li>
-        <li><a href="./../../commercial-support.html">Commercial Support</a></li>
+        <li><a href="./../../apacheds/">Home</a></li>
+        <li><a href="./../../apacheds/news.html">News</a></li>
+        <li><a href="./../../apacheds/features.html">Features</a></li>
     </ul>
-    <h5>Community</h5>
+    <h5>Downloads</h5>
     <ul>
-        <li><a href="./../../contribute.html">How to Contribute</a></li>
-        <li><a href="./../../team.html">Team</a></li>
-        <li><a href="./../../original-project-proposal.html">Original Project Proposal</a></li>
-        <li><a href="./../../special-thanks.html" class="external-link" rel="nofollow">Special Thanks</a></li>
+        <li><a href="./../../apacheds/downloads.html">ApacheDS 2.0.0-M17</a>&nbsp;&nbsp;<img src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+        <li><a href="./../../apacheds/download-old-versions.html">Older versions</a></li>
     </ul>
-    <h5>About Apache</h5>
+    <h5>Documentation</h5>
     <ul>
-        <li><a href="http://www.apache.org/">Apache</a></li>
-        <li><a href="http://www.apache.org/licenses/">License</a></li>
-        <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-        <li><a href="http://www.apache.org/security/">Security</a></li>
+        <li><a href="./../../apacheds/basic-user-guide.html">Basic User Guide </a></li>
+        <li><a href="./../../apacheds/advanced-user-guide.html">Advanced User Guide</a></li>
+        <li><a href="./../../apacheds/developer-guide.html">Developer Guide</a></li>
+        <li><a href="./../../apacheds/kerberos-user-guide.html">Kerberos User Guide</a></li>
+        <li><a href="./../../apacheds/configuration/ads-2.0-configuration.html">Configuration</a></li>
+        <li><a href="./../../apacheds/gen-docs/latest/apidocs">JavaDocs</a></li>
     </ul>
     
-    
-</div><!-- navigation -->
-
                 </div><!-- leftColumn -->
                 <div id="rightColumn">
 

Modified: websites/staging/directory/trunk/content/apacheds/basic-ug/1.2-some-background.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/basic-ug/1.2-some-background.html (original)
+++ websites/staging/directory/trunk/content/apacheds/basic-ug/1.2-some-background.html Thu Oct 16 14:57:59 2014
@@ -105,33 +105,31 @@
         <li><a href="./../../apacheds/gen-docs/latest/apidocs">JavaDocs</a></li>
     </ul>
     
+    <a href="http://bit.ly/1n9YlQT" target="_blank">
+      <img src="http://bit.ly/1ttg6CE" width="125" height="125" alt="I'm Speaking at ApacheCon Europe 2014! Join me!" title="I'm Speaking at ApacheCon Europe 2014! Join me!" border="0">
+    </a>
     
-    <h5>Support</h5>
+    <h5>ApacheDS 2.0</h5>
     <ul>
-        <li><a href="./../../mailing-lists-and-irc.html">Mailing Lists &amp; IRC</a></li>
-        <li><a href="./../../sources.html">Sources</a></li>
-        <li><a href="./../../issue-tracking.html">Issue Tracking</a></li>
-        <li><a href="./../../commercial-support.html">Commercial Support</a></li>
+        <li><a href="./../../apacheds/">Home</a></li>
+        <li><a href="./../../apacheds/news.html">News</a></li>
+        <li><a href="./../../apacheds/features.html">Features</a></li>
     </ul>
-    <h5>Community</h5>
+    <h5>Downloads</h5>
     <ul>
-        <li><a href="./../../contribute.html">How to Contribute</a></li>
-        <li><a href="./../../team.html">Team</a></li>
-        <li><a href="./../../original-project-proposal.html">Original Project Proposal</a></li>
-        <li><a href="./../../special-thanks.html" class="external-link" rel="nofollow">Special Thanks</a></li>
+        <li><a href="./../../apacheds/downloads.html">ApacheDS 2.0.0-M17</a>&nbsp;&nbsp;<img src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+        <li><a href="./../../apacheds/download-old-versions.html">Older versions</a></li>
     </ul>
-    <h5>About Apache</h5>
+    <h5>Documentation</h5>
     <ul>
-        <li><a href="http://www.apache.org/">Apache</a></li>
-        <li><a href="http://www.apache.org/licenses/">License</a></li>
-        <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-        <li><a href="http://www.apache.org/security/">Security</a></li>
+        <li><a href="./../../apacheds/basic-user-guide.html">Basic User Guide </a></li>
+        <li><a href="./../../apacheds/advanced-user-guide.html">Advanced User Guide</a></li>
+        <li><a href="./../../apacheds/developer-guide.html">Developer Guide</a></li>
+        <li><a href="./../../apacheds/kerberos-user-guide.html">Kerberos User Guide</a></li>
+        <li><a href="./../../apacheds/configuration/ads-2.0-configuration.html">Configuration</a></li>
+        <li><a href="./../../apacheds/gen-docs/latest/apidocs">JavaDocs</a></li>
     </ul>
     
-    
-</div><!-- navigation -->
-
                 </div><!-- leftColumn -->
                 <div id="rightColumn">
 

Modified: websites/staging/directory/trunk/content/apacheds/basic-ug/1.3-installing-and-starting.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/basic-ug/1.3-installing-and-starting.html (original)
+++ websites/staging/directory/trunk/content/apacheds/basic-ug/1.3-installing-and-starting.html Thu Oct 16 14:57:59 2014
@@ -105,33 +105,31 @@
         <li><a href="./../../apacheds/gen-docs/latest/apidocs">JavaDocs</a></li>
     </ul>
     
+    <a href="http://bit.ly/1n9YlQT" target="_blank">
+      <img src="http://bit.ly/1ttg6CE" width="125" height="125" alt="I'm Speaking at ApacheCon Europe 2014! Join me!" title="I'm Speaking at ApacheCon Europe 2014! Join me!" border="0">
+    </a>
     
-    <h5>Support</h5>
+    <h5>ApacheDS 2.0</h5>
     <ul>
-        <li><a href="./../../mailing-lists-and-irc.html">Mailing Lists &amp; IRC</a></li>
-        <li><a href="./../../sources.html">Sources</a></li>
-        <li><a href="./../../issue-tracking.html">Issue Tracking</a></li>
-        <li><a href="./../../commercial-support.html">Commercial Support</a></li>
+        <li><a href="./../../apacheds/">Home</a></li>
+        <li><a href="./../../apacheds/news.html">News</a></li>
+        <li><a href="./../../apacheds/features.html">Features</a></li>
     </ul>
-    <h5>Community</h5>
+    <h5>Downloads</h5>
     <ul>
-        <li><a href="./../../contribute.html">How to Contribute</a></li>
-        <li><a href="./../../team.html">Team</a></li>
-        <li><a href="./../../original-project-proposal.html">Original Project Proposal</a></li>
-        <li><a href="./../../special-thanks.html" class="external-link" rel="nofollow">Special Thanks</a></li>
+        <li><a href="./../../apacheds/downloads.html">ApacheDS 2.0.0-M17</a>&nbsp;&nbsp;<img src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+        <li><a href="./../../apacheds/download-old-versions.html">Older versions</a></li>
     </ul>
-    <h5>About Apache</h5>
+    <h5>Documentation</h5>
     <ul>
-        <li><a href="http://www.apache.org/">Apache</a></li>
-        <li><a href="http://www.apache.org/licenses/">License</a></li>
-        <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-        <li><a href="http://www.apache.org/security/">Security</a></li>
+        <li><a href="./../../apacheds/basic-user-guide.html">Basic User Guide </a></li>
+        <li><a href="./../../apacheds/advanced-user-guide.html">Advanced User Guide</a></li>
+        <li><a href="./../../apacheds/developer-guide.html">Developer Guide</a></li>
+        <li><a href="./../../apacheds/kerberos-user-guide.html">Kerberos User Guide</a></li>
+        <li><a href="./../../apacheds/configuration/ads-2.0-configuration.html">Configuration</a></li>
+        <li><a href="./../../apacheds/gen-docs/latest/apidocs">JavaDocs</a></li>
     </ul>
     
-    
-</div><!-- navigation -->
-
                 </div><!-- leftColumn -->
                 <div id="rightColumn">
 

Modified: websites/staging/directory/trunk/content/apacheds/basic-ug/1.4-basic-configuration-tasks.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/basic-ug/1.4-basic-configuration-tasks.html (original)
+++ websites/staging/directory/trunk/content/apacheds/basic-ug/1.4-basic-configuration-tasks.html Thu Oct 16 14:57:59 2014
@@ -105,33 +105,31 @@
         <li><a href="./../../apacheds/gen-docs/latest/apidocs">JavaDocs</a></li>
     </ul>
     
+    <a href="http://bit.ly/1n9YlQT" target="_blank">
+      <img src="http://bit.ly/1ttg6CE" width="125" height="125" alt="I'm Speaking at ApacheCon Europe 2014! Join me!" title="I'm Speaking at ApacheCon Europe 2014! Join me!" border="0">
+    </a>
     
-    <h5>Support</h5>
+    <h5>ApacheDS 2.0</h5>
     <ul>
-        <li><a href="./../../mailing-lists-and-irc.html">Mailing Lists &amp; IRC</a></li>
-        <li><a href="./../../sources.html">Sources</a></li>
-        <li><a href="./../../issue-tracking.html">Issue Tracking</a></li>
-        <li><a href="./../../commercial-support.html">Commercial Support</a></li>
+        <li><a href="./../../apacheds/">Home</a></li>
+        <li><a href="./../../apacheds/news.html">News</a></li>
+        <li><a href="./../../apacheds/features.html">Features</a></li>
     </ul>
-    <h5>Community</h5>
+    <h5>Downloads</h5>
     <ul>
-        <li><a href="./../../contribute.html">How to Contribute</a></li>
-        <li><a href="./../../team.html">Team</a></li>
-        <li><a href="./../../original-project-proposal.html">Original Project Proposal</a></li>
-        <li><a href="./../../special-thanks.html" class="external-link" rel="nofollow">Special Thanks</a></li>
+        <li><a href="./../../apacheds/downloads.html">ApacheDS 2.0.0-M17</a>&nbsp;&nbsp;<img src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+        <li><a href="./../../apacheds/download-old-versions.html">Older versions</a></li>
     </ul>
-    <h5>About Apache</h5>
+    <h5>Documentation</h5>
     <ul>
-        <li><a href="http://www.apache.org/">Apache</a></li>
-        <li><a href="http://www.apache.org/licenses/">License</a></li>
-        <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-        <li><a href="http://www.apache.org/security/">Security</a></li>
+        <li><a href="./../../apacheds/basic-user-guide.html">Basic User Guide </a></li>
+        <li><a href="./../../apacheds/advanced-user-guide.html">Advanced User Guide</a></li>
+        <li><a href="./../../apacheds/developer-guide.html">Developer Guide</a></li>
+        <li><a href="./../../apacheds/kerberos-user-guide.html">Kerberos User Guide</a></li>
+        <li><a href="./../../apacheds/configuration/ads-2.0-configuration.html">Configuration</a></li>
+        <li><a href="./../../apacheds/gen-docs/latest/apidocs">JavaDocs</a></li>
     </ul>
     
-    
-</div><!-- navigation -->
-
                 </div><!-- leftColumn -->
                 <div id="rightColumn">
 

Modified: websites/staging/directory/trunk/content/apacheds/basic-ug/1.4.1-changing-server-port.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/basic-ug/1.4.1-changing-server-port.html (original)
+++ websites/staging/directory/trunk/content/apacheds/basic-ug/1.4.1-changing-server-port.html Thu Oct 16 14:57:59 2014
@@ -105,33 +105,31 @@
         <li><a href="./../../apacheds/gen-docs/latest/apidocs">JavaDocs</a></li>
     </ul>
     
+    <a href="http://bit.ly/1n9YlQT" target="_blank">
+      <img src="http://bit.ly/1ttg6CE" width="125" height="125" alt="I'm Speaking at ApacheCon Europe 2014! Join me!" title="I'm Speaking at ApacheCon Europe 2014! Join me!" border="0">
+    </a>
     
-    <h5>Support</h5>
+    <h5>ApacheDS 2.0</h5>
     <ul>
-        <li><a href="./../../mailing-lists-and-irc.html">Mailing Lists &amp; IRC</a></li>
-        <li><a href="./../../sources.html">Sources</a></li>
-        <li><a href="./../../issue-tracking.html">Issue Tracking</a></li>
-        <li><a href="./../../commercial-support.html">Commercial Support</a></li>
+        <li><a href="./../../apacheds/">Home</a></li>
+        <li><a href="./../../apacheds/news.html">News</a></li>
+        <li><a href="./../../apacheds/features.html">Features</a></li>
     </ul>
-    <h5>Community</h5>
+    <h5>Downloads</h5>
     <ul>
-        <li><a href="./../../contribute.html">How to Contribute</a></li>
-        <li><a href="./../../team.html">Team</a></li>
-        <li><a href="./../../original-project-proposal.html">Original Project Proposal</a></li>
-        <li><a href="./../../special-thanks.html" class="external-link" rel="nofollow">Special Thanks</a></li>
+        <li><a href="./../../apacheds/downloads.html">ApacheDS 2.0.0-M17</a>&nbsp;&nbsp;<img src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+        <li><a href="./../../apacheds/download-old-versions.html">Older versions</a></li>
     </ul>
-    <h5>About Apache</h5>
+    <h5>Documentation</h5>
     <ul>
-        <li><a href="http://www.apache.org/">Apache</a></li>
-        <li><a href="http://www.apache.org/licenses/">License</a></li>
-        <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-        <li><a href="http://www.apache.org/security/">Security</a></li>
+        <li><a href="./../../apacheds/basic-user-guide.html">Basic User Guide </a></li>
+        <li><a href="./../../apacheds/advanced-user-guide.html">Advanced User Guide</a></li>
+        <li><a href="./../../apacheds/developer-guide.html">Developer Guide</a></li>
+        <li><a href="./../../apacheds/kerberos-user-guide.html">Kerberos User Guide</a></li>
+        <li><a href="./../../apacheds/configuration/ads-2.0-configuration.html">Configuration</a></li>
+        <li><a href="./../../apacheds/gen-docs/latest/apidocs">JavaDocs</a></li>
     </ul>
     
-    
-</div><!-- navigation -->
-
                 </div><!-- leftColumn -->
                 <div id="rightColumn">
 

Modified: websites/staging/directory/trunk/content/apacheds/basic-ug/1.4.2-changing-admin-password.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/basic-ug/1.4.2-changing-admin-password.html (original)
+++ websites/staging/directory/trunk/content/apacheds/basic-ug/1.4.2-changing-admin-password.html Thu Oct 16 14:57:59 2014
@@ -105,33 +105,31 @@
         <li><a href="./../../apacheds/gen-docs/latest/apidocs">JavaDocs</a></li>
     </ul>
     
+    <a href="http://bit.ly/1n9YlQT" target="_blank">
+      <img src="http://bit.ly/1ttg6CE" width="125" height="125" alt="I'm Speaking at ApacheCon Europe 2014! Join me!" title="I'm Speaking at ApacheCon Europe 2014! Join me!" border="0">
+    </a>
     
-    <h5>Support</h5>
+    <h5>ApacheDS 2.0</h5>
     <ul>
-        <li><a href="./../../mailing-lists-and-irc.html">Mailing Lists &amp; IRC</a></li>
-        <li><a href="./../../sources.html">Sources</a></li>
-        <li><a href="./../../issue-tracking.html">Issue Tracking</a></li>
-        <li><a href="./../../commercial-support.html">Commercial Support</a></li>
+        <li><a href="./../../apacheds/">Home</a></li>
+        <li><a href="./../../apacheds/news.html">News</a></li>
+        <li><a href="./../../apacheds/features.html">Features</a></li>
     </ul>
-    <h5>Community</h5>
+    <h5>Downloads</h5>
     <ul>
-        <li><a href="./../../contribute.html">How to Contribute</a></li>
-        <li><a href="./../../team.html">Team</a></li>
-        <li><a href="./../../original-project-proposal.html">Original Project Proposal</a></li>
-        <li><a href="./../../special-thanks.html" class="external-link" rel="nofollow">Special Thanks</a></li>
+        <li><a href="./../../apacheds/downloads.html">ApacheDS 2.0.0-M17</a>&nbsp;&nbsp;<img src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+        <li><a href="./../../apacheds/download-old-versions.html">Older versions</a></li>
     </ul>
-    <h5>About Apache</h5>
+    <h5>Documentation</h5>
     <ul>
-        <li><a href="http://www.apache.org/">Apache</a></li>
-        <li><a href="http://www.apache.org/licenses/">License</a></li>
-        <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-        <li><a href="http://www.apache.org/security/">Security</a></li>
+        <li><a href="./../../apacheds/basic-user-guide.html">Basic User Guide </a></li>
+        <li><a href="./../../apacheds/advanced-user-guide.html">Advanced User Guide</a></li>
+        <li><a href="./../../apacheds/developer-guide.html">Developer Guide</a></li>
+        <li><a href="./../../apacheds/kerberos-user-guide.html">Kerberos User Guide</a></li>
+        <li><a href="./../../apacheds/configuration/ads-2.0-configuration.html">Configuration</a></li>
+        <li><a href="./../../apacheds/gen-docs/latest/apidocs">JavaDocs</a></li>
     </ul>
     
-    
-</div><!-- navigation -->
-
                 </div><!-- leftColumn -->
                 <div id="rightColumn">
 

Modified: websites/staging/directory/trunk/content/apacheds/basic-ug/1.4.3-adding-partition.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/basic-ug/1.4.3-adding-partition.html (original)
+++ websites/staging/directory/trunk/content/apacheds/basic-ug/1.4.3-adding-partition.html Thu Oct 16 14:57:59 2014
@@ -105,33 +105,31 @@
         <li><a href="./../../apacheds/gen-docs/latest/apidocs">JavaDocs</a></li>
     </ul>
     
+    <a href="http://bit.ly/1n9YlQT" target="_blank">
+      <img src="http://bit.ly/1ttg6CE" width="125" height="125" alt="I'm Speaking at ApacheCon Europe 2014! Join me!" title="I'm Speaking at ApacheCon Europe 2014! Join me!" border="0">
+    </a>
     
-    <h5>Support</h5>
+    <h5>ApacheDS 2.0</h5>
     <ul>
-        <li><a href="./../../mailing-lists-and-irc.html">Mailing Lists &amp; IRC</a></li>
-        <li><a href="./../../sources.html">Sources</a></li>
-        <li><a href="./../../issue-tracking.html">Issue Tracking</a></li>
-        <li><a href="./../../commercial-support.html">Commercial Support</a></li>
+        <li><a href="./../../apacheds/">Home</a></li>
+        <li><a href="./../../apacheds/news.html">News</a></li>
+        <li><a href="./../../apacheds/features.html">Features</a></li>
     </ul>
-    <h5>Community</h5>
+    <h5>Downloads</h5>
     <ul>
-        <li><a href="./../../contribute.html">How to Contribute</a></li>
-        <li><a href="./../../team.html">Team</a></li>
-        <li><a href="./../../original-project-proposal.html">Original Project Proposal</a></li>
-        <li><a href="./../../special-thanks.html" class="external-link" rel="nofollow">Special Thanks</a></li>
+        <li><a href="./../../apacheds/downloads.html">ApacheDS 2.0.0-M17</a>&nbsp;&nbsp;<img src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+        <li><a href="./../../apacheds/download-old-versions.html">Older versions</a></li>
     </ul>
-    <h5>About Apache</h5>
+    <h5>Documentation</h5>
     <ul>
-        <li><a href="http://www.apache.org/">Apache</a></li>
-        <li><a href="http://www.apache.org/licenses/">License</a></li>
-        <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-        <li><a href="http://www.apache.org/security/">Security</a></li>
+        <li><a href="./../../apacheds/basic-user-guide.html">Basic User Guide </a></li>
+        <li><a href="./../../apacheds/advanced-user-guide.html">Advanced User Guide</a></li>
+        <li><a href="./../../apacheds/developer-guide.html">Developer Guide</a></li>
+        <li><a href="./../../apacheds/kerberos-user-guide.html">Kerberos User Guide</a></li>
+        <li><a href="./../../apacheds/configuration/ads-2.0-configuration.html">Configuration</a></li>
+        <li><a href="./../../apacheds/gen-docs/latest/apidocs">JavaDocs</a></li>
     </ul>
     
-    
-</div><!-- navigation -->
-
                 </div><!-- leftColumn -->
                 <div id="rightColumn">
 

Modified: websites/staging/directory/trunk/content/apacheds/basic-ug/1.4.4-configure-logging.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/basic-ug/1.4.4-configure-logging.html (original)
+++ websites/staging/directory/trunk/content/apacheds/basic-ug/1.4.4-configure-logging.html Thu Oct 16 14:57:59 2014
@@ -105,33 +105,31 @@
         <li><a href="./../../apacheds/gen-docs/latest/apidocs">JavaDocs</a></li>
     </ul>
     
+    <a href="http://bit.ly/1n9YlQT" target="_blank">
+      <img src="http://bit.ly/1ttg6CE" width="125" height="125" alt="I'm Speaking at ApacheCon Europe 2014! Join me!" title="I'm Speaking at ApacheCon Europe 2014! Join me!" border="0">
+    </a>
     
-    <h5>Support</h5>
+    <h5>ApacheDS 2.0</h5>
     <ul>
-        <li><a href="./../../mailing-lists-and-irc.html">Mailing Lists &amp; IRC</a></li>
-        <li><a href="./../../sources.html">Sources</a></li>
-        <li><a href="./../../issue-tracking.html">Issue Tracking</a></li>
-        <li><a href="./../../commercial-support.html">Commercial Support</a></li>
+        <li><a href="./../../apacheds/">Home</a></li>
+        <li><a href="./../../apacheds/news.html">News</a></li>
+        <li><a href="./../../apacheds/features.html">Features</a></li>
     </ul>
-    <h5>Community</h5>
+    <h5>Downloads</h5>
     <ul>
-        <li><a href="./../../contribute.html">How to Contribute</a></li>
-        <li><a href="./../../team.html">Team</a></li>
-        <li><a href="./../../original-project-proposal.html">Original Project Proposal</a></li>
-        <li><a href="./../../special-thanks.html" class="external-link" rel="nofollow">Special Thanks</a></li>
+        <li><a href="./../../apacheds/downloads.html">ApacheDS 2.0.0-M17</a>&nbsp;&nbsp;<img src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+        <li><a href="./../../apacheds/download-old-versions.html">Older versions</a></li>
     </ul>
-    <h5>About Apache</h5>
+    <h5>Documentation</h5>
     <ul>
-        <li><a href="http://www.apache.org/">Apache</a></li>
-        <li><a href="http://www.apache.org/licenses/">License</a></li>
-        <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-        <li><a href="http://www.apache.org/security/">Security</a></li>
+        <li><a href="./../../apacheds/basic-user-guide.html">Basic User Guide </a></li>
+        <li><a href="./../../apacheds/advanced-user-guide.html">Advanced User Guide</a></li>
+        <li><a href="./../../apacheds/developer-guide.html">Developer Guide</a></li>
+        <li><a href="./../../apacheds/kerberos-user-guide.html">Kerberos User Guide</a></li>
+        <li><a href="./../../apacheds/configuration/ads-2.0-configuration.html">Configuration</a></li>
+        <li><a href="./../../apacheds/gen-docs/latest/apidocs">JavaDocs</a></li>
     </ul>
     
-    
-</div><!-- navigation -->
-
                 </div><!-- leftColumn -->
                 <div id="rightColumn">
 

Modified: websites/staging/directory/trunk/content/apacheds/basic-ug/1.4.5-anonymous-access.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/basic-ug/1.4.5-anonymous-access.html (original)
+++ websites/staging/directory/trunk/content/apacheds/basic-ug/1.4.5-anonymous-access.html Thu Oct 16 14:57:59 2014
@@ -105,33 +105,31 @@
         <li><a href="./../../apacheds/gen-docs/latest/apidocs">JavaDocs</a></li>
     </ul>
     
+    <a href="http://bit.ly/1n9YlQT" target="_blank">
+      <img src="http://bit.ly/1ttg6CE" width="125" height="125" alt="I'm Speaking at ApacheCon Europe 2014! Join me!" title="I'm Speaking at ApacheCon Europe 2014! Join me!" border="0">
+    </a>
     
-    <h5>Support</h5>
+    <h5>ApacheDS 2.0</h5>
     <ul>
-        <li><a href="./../../mailing-lists-and-irc.html">Mailing Lists &amp; IRC</a></li>
-        <li><a href="./../../sources.html">Sources</a></li>
-        <li><a href="./../../issue-tracking.html">Issue Tracking</a></li>
-        <li><a href="./../../commercial-support.html">Commercial Support</a></li>
+        <li><a href="./../../apacheds/">Home</a></li>
+        <li><a href="./../../apacheds/news.html">News</a></li>
+        <li><a href="./../../apacheds/features.html">Features</a></li>
     </ul>
-    <h5>Community</h5>
+    <h5>Downloads</h5>
     <ul>
-        <li><a href="./../../contribute.html">How to Contribute</a></li>
-        <li><a href="./../../team.html">Team</a></li>
-        <li><a href="./../../original-project-proposal.html">Original Project Proposal</a></li>
-        <li><a href="./../../special-thanks.html" class="external-link" rel="nofollow">Special Thanks</a></li>
+        <li><a href="./../../apacheds/downloads.html">ApacheDS 2.0.0-M17</a>&nbsp;&nbsp;<img src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+        <li><a href="./../../apacheds/download-old-versions.html">Older versions</a></li>
     </ul>
-    <h5>About Apache</h5>
+    <h5>Documentation</h5>
     <ul>
-        <li><a href="http://www.apache.org/">Apache</a></li>
-        <li><a href="http://www.apache.org/licenses/">License</a></li>
-        <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-        <li><a href="http://www.apache.org/security/">Security</a></li>
+        <li><a href="./../../apacheds/basic-user-guide.html">Basic User Guide </a></li>
+        <li><a href="./../../apacheds/advanced-user-guide.html">Advanced User Guide</a></li>
+        <li><a href="./../../apacheds/developer-guide.html">Developer Guide</a></li>
+        <li><a href="./../../apacheds/kerberos-user-guide.html">Kerberos User Guide</a></li>
+        <li><a href="./../../apacheds/configuration/ads-2.0-configuration.html">Configuration</a></li>
+        <li><a href="./../../apacheds/gen-docs/latest/apidocs">JavaDocs</a></li>
     </ul>
     
-    
-</div><!-- navigation -->
-
                 </div><!-- leftColumn -->
                 <div id="rightColumn">
 

Modified: websites/staging/directory/trunk/content/apacheds/basic-ug/1.5-sample-configuration.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/basic-ug/1.5-sample-configuration.html (original)
+++ websites/staging/directory/trunk/content/apacheds/basic-ug/1.5-sample-configuration.html Thu Oct 16 14:57:59 2014
@@ -105,33 +105,31 @@
         <li><a href="./../../apacheds/gen-docs/latest/apidocs">JavaDocs</a></li>
     </ul>
     
+    <a href="http://bit.ly/1n9YlQT" target="_blank">
+      <img src="http://bit.ly/1ttg6CE" width="125" height="125" alt="I'm Speaking at ApacheCon Europe 2014! Join me!" title="I'm Speaking at ApacheCon Europe 2014! Join me!" border="0">
+    </a>
     
-    <h5>Support</h5>
+    <h5>ApacheDS 2.0</h5>
     <ul>
-        <li><a href="./../../mailing-lists-and-irc.html">Mailing Lists &amp; IRC</a></li>
-        <li><a href="./../../sources.html">Sources</a></li>
-        <li><a href="./../../issue-tracking.html">Issue Tracking</a></li>
-        <li><a href="./../../commercial-support.html">Commercial Support</a></li>
+        <li><a href="./../../apacheds/">Home</a></li>
+        <li><a href="./../../apacheds/news.html">News</a></li>
+        <li><a href="./../../apacheds/features.html">Features</a></li>
     </ul>
-    <h5>Community</h5>
+    <h5>Downloads</h5>
     <ul>
-        <li><a href="./../../contribute.html">How to Contribute</a></li>
-        <li><a href="./../../team.html">Team</a></li>
-        <li><a href="./../../original-project-proposal.html">Original Project Proposal</a></li>
-        <li><a href="./../../special-thanks.html" class="external-link" rel="nofollow">Special Thanks</a></li>
+        <li><a href="./../../apacheds/downloads.html">ApacheDS 2.0.0-M17</a>&nbsp;&nbsp;<img src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+        <li><a href="./../../apacheds/download-old-versions.html">Older versions</a></li>
     </ul>
-    <h5>About Apache</h5>
+    <h5>Documentation</h5>
     <ul>
-        <li><a href="http://www.apache.org/">Apache</a></li>
-        <li><a href="http://www.apache.org/licenses/">License</a></li>
-        <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-        <li><a href="http://www.apache.org/security/">Security</a></li>
+        <li><a href="./../../apacheds/basic-user-guide.html">Basic User Guide </a></li>
+        <li><a href="./../../apacheds/advanced-user-guide.html">Advanced User Guide</a></li>
+        <li><a href="./../../apacheds/developer-guide.html">Developer Guide</a></li>
+        <li><a href="./../../apacheds/kerberos-user-guide.html">Kerberos User Guide</a></li>
+        <li><a href="./../../apacheds/configuration/ads-2.0-configuration.html">Configuration</a></li>
+        <li><a href="./../../apacheds/gen-docs/latest/apidocs">JavaDocs</a></li>
     </ul>
     
-    
-</div><!-- navigation -->
-
                 </div><!-- leftColumn -->
                 <div id="rightColumn">
 

Modified: websites/staging/directory/trunk/content/apacheds/basic-ug/2-handling-data.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/basic-ug/2-handling-data.html (original)
+++ websites/staging/directory/trunk/content/apacheds/basic-ug/2-handling-data.html Thu Oct 16 14:57:59 2014
@@ -105,33 +105,31 @@
         <li><a href="./../../apacheds/gen-docs/latest/apidocs">JavaDocs</a></li>
     </ul>
     
+    <a href="http://bit.ly/1n9YlQT" target="_blank">
+      <img src="http://bit.ly/1ttg6CE" width="125" height="125" alt="I'm Speaking at ApacheCon Europe 2014! Join me!" title="I'm Speaking at ApacheCon Europe 2014! Join me!" border="0">
+    </a>
     
-    <h5>Support</h5>
+    <h5>ApacheDS 2.0</h5>
     <ul>
-        <li><a href="./../../mailing-lists-and-irc.html">Mailing Lists &amp; IRC</a></li>
-        <li><a href="./../../sources.html">Sources</a></li>
-        <li><a href="./../../issue-tracking.html">Issue Tracking</a></li>
-        <li><a href="./../../commercial-support.html">Commercial Support</a></li>
+        <li><a href="./../../apacheds/">Home</a></li>
+        <li><a href="./../../apacheds/news.html">News</a></li>
+        <li><a href="./../../apacheds/features.html">Features</a></li>
     </ul>
-    <h5>Community</h5>
+    <h5>Downloads</h5>
     <ul>
-        <li><a href="./../../contribute.html">How to Contribute</a></li>
-        <li><a href="./../../team.html">Team</a></li>
-        <li><a href="./../../original-project-proposal.html">Original Project Proposal</a></li>
-        <li><a href="./../../special-thanks.html" class="external-link" rel="nofollow">Special Thanks</a></li>
+        <li><a href="./../../apacheds/downloads.html">ApacheDS 2.0.0-M17</a>&nbsp;&nbsp;<img src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+        <li><a href="./../../apacheds/download-old-versions.html">Older versions</a></li>
     </ul>
-    <h5>About Apache</h5>
+    <h5>Documentation</h5>
     <ul>
-        <li><a href="http://www.apache.org/">Apache</a></li>
-        <li><a href="http://www.apache.org/licenses/">License</a></li>
-        <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-        <li><a href="http://www.apache.org/security/">Security</a></li>
+        <li><a href="./../../apacheds/basic-user-guide.html">Basic User Guide </a></li>
+        <li><a href="./../../apacheds/advanced-user-guide.html">Advanced User Guide</a></li>
+        <li><a href="./../../apacheds/developer-guide.html">Developer Guide</a></li>
+        <li><a href="./../../apacheds/kerberos-user-guide.html">Kerberos User Guide</a></li>
+        <li><a href="./../../apacheds/configuration/ads-2.0-configuration.html">Configuration</a></li>
+        <li><a href="./../../apacheds/gen-docs/latest/apidocs">JavaDocs</a></li>
     </ul>
     
-    
-</div><!-- navigation -->
-
                 </div><!-- leftColumn -->
                 <div id="rightColumn">