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 2018/07/26 01:02:03 UTC

svn commit: r1033067 [1/4] - in /websites/staging/directory/trunk/content: ./ api/ api/download/ api/internal-design-guide/ api/user-guide/

Author: buildbot
Date: Thu Jul 26 01:02:02 2018
New Revision: 1033067

Log:
Staging update by buildbot for directory

Modified:
    websites/staging/directory/trunk/content/   (props changed)
    websites/staging/directory/trunk/content/api/coding-standards.html
    websites/staging/directory/trunk/content/api/developer-guide.html
    websites/staging/directory/trunk/content/api/download-old-versions.html
    websites/staging/directory/trunk/content/api/download/download-archive.html
    websites/staging/directory/trunk/content/api/download/download-sources.html
    websites/staging/directory/trunk/content/api/downloads.html
    websites/staging/directory/trunk/content/api/five-minutes-tutorial.html
    websites/staging/directory/trunk/content/api/index.html
    websites/staging/directory/trunk/content/api/internal-design-guide.html
    websites/staging/directory/trunk/content/api/internal-design-guide/1-introduction.html
    websites/staging/directory/trunk/content/api/internal-design-guide/10-entry.html
    websites/staging/directory/trunk/content/api/internal-design-guide/11-filter.html
    websites/staging/directory/trunk/content/api/internal-design-guide/12-cursor.html
    websites/staging/directory/trunk/content/api/internal-design-guide/13-controls.html
    websites/staging/directory/trunk/content/api/internal-design-guide/14-extended-operations.html
    websites/staging/directory/trunk/content/api/internal-design-guide/15-ldif.html
    websites/staging/directory/trunk/content/api/internal-design-guide/16-dsml.html
    websites/staging/directory/trunk/content/api/internal-design-guide/17-osgi.html
    websites/staging/directory/trunk/content/api/internal-design-guide/2-general-structure.html
    websites/staging/directory/trunk/content/api/internal-design-guide/3-building.html
    websites/staging/directory/trunk/content/api/internal-design-guide/4-asn1.html
    websites/staging/directory/trunk/content/api/internal-design-guide/4.1-asn1-tlv.html
    websites/staging/directory/trunk/content/api/internal-design-guide/5-network.html
    websites/staging/directory/trunk/content/api/internal-design-guide/6-codec.html
    websites/staging/directory/trunk/content/api/internal-design-guide/7-ldap-messages.html
    websites/staging/directory/trunk/content/api/internal-design-guide/8-schema.html
    websites/staging/directory/trunk/content/api/internal-design-guide/9-dn.html
    websites/staging/directory/trunk/content/api/java-api.html
    websites/staging/directory/trunk/content/api/news.html
    websites/staging/directory/trunk/content/api/user-guide.html
    websites/staging/directory/trunk/content/api/user-guide/1-introduction.html
    websites/staging/directory/trunk/content/api/user-guide/1.1-java-and-ldap.html
    websites/staging/directory/trunk/content/api/user-guide/1.2-ldap-in-a-few-words.html
    websites/staging/directory/trunk/content/api/user-guide/1.3-apache-ldap-api-rational.html
    websites/staging/directory/trunk/content/api/user-guide/1.4-preparation-to-code.html
    websites/staging/directory/trunk/content/api/user-guide/2-basic-ldap-api-usage.html
    websites/staging/directory/trunk/content/api/user-guide/2.1-connection-disconnection.html
    websites/staging/directory/trunk/content/api/user-guide/2.10-ldap-connection-template.html
    websites/staging/directory/trunk/content/api/user-guide/2.11-filter-builder.html
    websites/staging/directory/trunk/content/api/user-guide/2.2-binding-unbinding.html
    websites/staging/directory/trunk/content/api/user-guide/2.3-searching.html
    websites/staging/directory/trunk/content/api/user-guide/2.4-adding.html
    websites/staging/directory/trunk/content/api/user-guide/2.5-deleting.html
    websites/staging/directory/trunk/content/api/user-guide/2.6-modifying.html
    websites/staging/directory/trunk/content/api/user-guide/2.7-moving-renaming.html
    websites/staging/directory/trunk/content/api/user-guide/2.8-comparing.html
    websites/staging/directory/trunk/content/api/user-guide/2.9-exception-management.html
    websites/staging/directory/trunk/content/api/user-guide/3-advanced-ldap-api-usage.html
    websites/staging/directory/trunk/content/api/user-guide/3.1-controls.html
    websites/staging/directory/trunk/content/api/user-guide/3.2-extended-operations.html
    websites/staging/directory/trunk/content/api/user-guide/3.3-referrals.html
    websites/staging/directory/trunk/content/api/user-guide/3.4-aliases.html
    websites/staging/directory/trunk/content/api/user-guide/3.5-ldif-dsml.html
    websites/staging/directory/trunk/content/api/user-guide/3.6-abandonning.html
    websites/staging/directory/trunk/content/api/user-guide/3.7-server-informations.html
    websites/staging/directory/trunk/content/api/user-guide/4-schema-management.html
    websites/staging/directory/trunk/content/api/user-guide/4.1-schema.html
    websites/staging/directory/trunk/content/api/user-guide/4.2-schema-manager.html
    websites/staging/directory/trunk/content/api/user-guide/4.2.1-schema-objects.html
    websites/staging/directory/trunk/content/api/user-guide/4.2.1.1-attribute-types.html
    websites/staging/directory/trunk/content/api/user-guide/4.2.1.2-object-classes.html
    websites/staging/directory/trunk/content/api/user-guide/4.2.1.3-syntaxes.html
    websites/staging/directory/trunk/content/api/user-guide/4.2.1.4-matching-rules.html
    websites/staging/directory/trunk/content/api/user-guide/4.2.1.5-dit-content-rules.html
    websites/staging/directory/trunk/content/api/user-guide/4.2.1.6-dit-structure-rules.html
    websites/staging/directory/trunk/content/api/user-guide/4.2.1.7-matching-rule-uses.html
    websites/staging/directory/trunk/content/api/user-guide/4.2.1.8-name-forms.html
    websites/staging/directory/trunk/content/api/user-guide/4.2.1.9-apacheds-schema-elements.html
    websites/staging/directory/trunk/content/api/user-guide/4.2.2-registries.html
    websites/staging/directory/trunk/content/api/user-guide/4.2.3-schema-loader.html
    websites/staging/directory/trunk/content/api/user-guide/5-ldap-security.html
    websites/staging/directory/trunk/content/api/user-guide/5.1-ldaps.html
    websites/staging/directory/trunk/content/api/user-guide/5.2-start-tls.html
    websites/staging/directory/trunk/content/api/user-guide/5.3-sasl-bind.html
    websites/staging/directory/trunk/content/api/user-guide/5.4-password-handling.html
    websites/staging/directory/trunk/content/api/user-guide/5.5-certificates.html
    websites/staging/directory/trunk/content/api/user-guide/5.6-aci-and-acls.html
    websites/staging/directory/trunk/content/api/user-guide/6-ldap-data-structures.html
    websites/staging/directory/trunk/content/api/user-guide/6.1-administrative-point.html
    websites/staging/directory/trunk/content/api/user-guide/6.10-dit-content-rule.html
    websites/staging/directory/trunk/content/api/user-guide/6.11-dit-structure-rule.html
    websites/staging/directory/trunk/content/api/user-guide/6.12-entry.html
    websites/staging/directory/trunk/content/api/user-guide/6.13-expr-node.html
    websites/staging/directory/trunk/content/api/user-guide/6.14-ldap-comparator.html
    websites/staging/directory/trunk/content/api/user-guide/6.15-ldap-result.html
    websites/staging/directory/trunk/content/api/user-guide/6.16-ldap-syntax.html
    websites/staging/directory/trunk/content/api/user-guide/6.17-ldap-url.html
    websites/staging/directory/trunk/content/api/user-guide/6.18-ldif-control.html
    websites/staging/directory/trunk/content/api/user-guide/6.19-ldif-entry.html
    websites/staging/directory/trunk/content/api/user-guide/6.2-administrative-role.html
    websites/staging/directory/trunk/content/api/user-guide/6.20-matching-rule.html
    websites/staging/directory/trunk/content/api/user-guide/6.21-matching-rule-use.html
    websites/staging/directory/trunk/content/api/user-guide/6.22-message.html
    websites/staging/directory/trunk/content/api/user-guide/6.23-modification.html
    websites/staging/directory/trunk/content/api/user-guide/6.24-name-form.html
    websites/staging/directory/trunk/content/api/user-guide/6.25-normalizer.html
    websites/staging/directory/trunk/content/api/user-guide/6.26-object-class.html
    websites/staging/directory/trunk/content/api/user-guide/6.27-oid.html
    websites/staging/directory/trunk/content/api/user-guide/6.28-rdn.html
    websites/staging/directory/trunk/content/api/user-guide/6.29-referral.html
    websites/staging/directory/trunk/content/api/user-guide/6.3-attribute.html
    websites/staging/directory/trunk/content/api/user-guide/6.30-refinment.html
    websites/staging/directory/trunk/content/api/user-guide/6.31-schema-manager.html
    websites/staging/directory/trunk/content/api/user-guide/6.32-subentry.html
    websites/staging/directory/trunk/content/api/user-guide/6.33-subtree-specification.html
    websites/staging/directory/trunk/content/api/user-guide/6.34-syntax-checker.html
    websites/staging/directory/trunk/content/api/user-guide/6.35-value.html
    websites/staging/directory/trunk/content/api/user-guide/6.4-attribute-type.html
    websites/staging/directory/trunk/content/api/user-guide/6.5-ava.html
    websites/staging/directory/trunk/content/api/user-guide/6.6-csn.html
    websites/staging/directory/trunk/content/api/user-guide/6.7-control.html
    websites/staging/directory/trunk/content/api/user-guide/6.8-cursor.html
    websites/staging/directory/trunk/content/api/user-guide/6.9-dn.html
    websites/staging/directory/trunk/content/api/user-guide/7-requests-responses.html
    websites/staging/directory/trunk/content/api/user-guide/7.1-abandon-request.html
    websites/staging/directory/trunk/content/api/user-guide/7.10-extended-request.html
    websites/staging/directory/trunk/content/api/user-guide/7.11-extended-response.html
    websites/staging/directory/trunk/content/api/user-guide/7.12-intermediate-response.html
    websites/staging/directory/trunk/content/api/user-guide/7.13-mod-dn-request.html
    websites/staging/directory/trunk/content/api/user-guide/7.14-mod-dn-response.html
    websites/staging/directory/trunk/content/api/user-guide/7.15-modify-request.html
    websites/staging/directory/trunk/content/api/user-guide/7.16-modify-response.html
    websites/staging/directory/trunk/content/api/user-guide/7.17-search-request.html
    websites/staging/directory/trunk/content/api/user-guide/7.18-search-result-done.html
    websites/staging/directory/trunk/content/api/user-guide/7.19-search-result-entry.html
    websites/staging/directory/trunk/content/api/user-guide/7.2-add-request.html
    websites/staging/directory/trunk/content/api/user-guide/7.20-search-result-reference.html
    websites/staging/directory/trunk/content/api/user-guide/7.21-unbind-request.html
    websites/staging/directory/trunk/content/api/user-guide/7.3-add-response.html
    websites/staging/directory/trunk/content/api/user-guide/7.4-bind-request.html
    websites/staging/directory/trunk/content/api/user-guide/7.5-bind-response.html
    websites/staging/directory/trunk/content/api/user-guide/7.6-compare-request.html
    websites/staging/directory/trunk/content/api/user-guide/7.7-compare-response.html
    websites/staging/directory/trunk/content/api/user-guide/7.8-del-request.html
    websites/staging/directory/trunk/content/api/user-guide/7.9-del-response.html
    websites/staging/directory/trunk/content/api/user-guide/8-ldap-rfcs.html
    websites/staging/directory/trunk/content/api/vision.html
    websites/staging/directory/trunk/content/articles.html
    websites/staging/directory/trunk/content/commercial-support.html
    websites/staging/directory/trunk/content/conference-materials.html
    websites/staging/directory/trunk/content/contribute.html
    websites/staging/directory/trunk/content/index.html
    websites/staging/directory/trunk/content/issue-tracking.html
    websites/staging/directory/trunk/content/mailing-lists-and-irc.html
    websites/staging/directory/trunk/content/original-project-proposal.html
    websites/staging/directory/trunk/content/privacy-policy.html
    websites/staging/directory/trunk/content/references.html
    websites/staging/directory/trunk/content/sources.html
    websites/staging/directory/trunk/content/special-thanks.html
    websites/staging/directory/trunk/content/team.html
    websites/staging/directory/trunk/content/testimonies.html
    websites/staging/directory/trunk/content/vision.html

Propchange: websites/staging/directory/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Thu Jul 26 01:02:02 2018
@@ -1 +1 @@
-1836685
+1836686

Modified: websites/staging/directory/trunk/content/api/coding-standards.html
==============================================================================
--- websites/staging/directory/trunk/content/api/coding-standards.html (original)
+++ websites/staging/directory/trunk/content/api/coding-standards.html Thu Jul 26 01:02:02 2018
@@ -97,7 +97,7 @@
         </a>
       </li>
     </ul-->
-    <h5>LDAP API 1.0</h5>
+    <h5>LDAP API </h5>
     <ul>
         <li><a href="./../api/">Home</a></li>
         <li><a href="./../api/news.html">News</a></li>
@@ -105,19 +105,24 @@
     <h5>Downloads</h5>
     <ul>
 	    <li><a href="./../api/downloads.html">Version 1.0.2</a>&nbsp;&nbsp;<IMG src="./../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+        <li><a href="./../api2/downloads.html">Version 2.0.0-AM1</a>&nbsp;&nbsp;<IMG src="./../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
         <li><a href="./../api/download-old-versions.html">Older versions</a></li>
     </ul>
     <h5>Getting Started</h5>
     <ul>
         <li><a href="./../api/vision.html">Vision</a></li>
         <li><a href="./../api/java-api.html">Java API</a></li>
+        <li><a href="./../api2/java-api2.html">Java API v2</a></li>
     </ul>
     <h5>Documentation</h5>
     <ul>
 	    <li><a href="./../api/five-minutes-tutorial.html">Five minutes tutorial</a></li>
 	    <li><a href="./../api/user-guide.html">User Guide</a></li>
+        <li><a href="./../api2/migration-guide.html">API 1 to 2 migration</a></li>
         <li><a href="./../api/gen-docs/latest/apidocs/">JavaDocs</a></li>
+        <li><a href="./../api2/gen-docs/latest/apidocs/">JavaDocs 2</a></li>
         <li><a href="./../api/gen-docs/latest/xref/">Cross-Reference</a></li>
+        <li><a href="./../api2/gen-docs/latest/xref/">Cross-Reference 2</a></li>
         <!--li><a href="./../api/gen-docs/latest/">Generated Reports</a></li-->
         <li><a href="./../api/developer-guide.html">Developer Guide</a></li>
         <li><a href="./../api/internal-design-guide.html">Internal Guide</a></li>

Modified: websites/staging/directory/trunk/content/api/developer-guide.html
==============================================================================
--- websites/staging/directory/trunk/content/api/developer-guide.html (original)
+++ websites/staging/directory/trunk/content/api/developer-guide.html Thu Jul 26 01:02:02 2018
@@ -97,7 +97,7 @@
         </a>
       </li>
     </ul-->
-    <h5>LDAP API 1.0</h5>
+    <h5>LDAP API </h5>
     <ul>
         <li><a href="./../api/">Home</a></li>
         <li><a href="./../api/news.html">News</a></li>
@@ -105,19 +105,24 @@
     <h5>Downloads</h5>
     <ul>
 	    <li><a href="./../api/downloads.html">Version 1.0.2</a>&nbsp;&nbsp;<IMG src="./../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+        <li><a href="./../api2/downloads.html">Version 2.0.0-AM1</a>&nbsp;&nbsp;<IMG src="./../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
         <li><a href="./../api/download-old-versions.html">Older versions</a></li>
     </ul>
     <h5>Getting Started</h5>
     <ul>
         <li><a href="./../api/vision.html">Vision</a></li>
         <li><a href="./../api/java-api.html">Java API</a></li>
+        <li><a href="./../api2/java-api2.html">Java API v2</a></li>
     </ul>
     <h5>Documentation</h5>
     <ul>
 	    <li><a href="./../api/five-minutes-tutorial.html">Five minutes tutorial</a></li>
 	    <li><a href="./../api/user-guide.html">User Guide</a></li>
+        <li><a href="./../api2/migration-guide.html">API 1 to 2 migration</a></li>
         <li><a href="./../api/gen-docs/latest/apidocs/">JavaDocs</a></li>
+        <li><a href="./../api2/gen-docs/latest/apidocs/">JavaDocs 2</a></li>
         <li><a href="./../api/gen-docs/latest/xref/">Cross-Reference</a></li>
+        <li><a href="./../api2/gen-docs/latest/xref/">Cross-Reference 2</a></li>
         <!--li><a href="./../api/gen-docs/latest/">Generated Reports</a></li-->
         <li><a href="./../api/developer-guide.html">Developer Guide</a></li>
         <li><a href="./../api/internal-design-guide.html">Internal Guide</a></li>

Modified: websites/staging/directory/trunk/content/api/download-old-versions.html
==============================================================================
--- websites/staging/directory/trunk/content/api/download-old-versions.html (original)
+++ websites/staging/directory/trunk/content/api/download-old-versions.html Thu Jul 26 01:02:02 2018
@@ -97,7 +97,7 @@
         </a>
       </li>
     </ul-->
-    <h5>LDAP API 1.0</h5>
+    <h5>LDAP API </h5>
     <ul>
         <li><a href="./../api/">Home</a></li>
         <li><a href="./../api/news.html">News</a></li>
@@ -105,19 +105,24 @@
     <h5>Downloads</h5>
     <ul>
 	    <li><a href="./../api/downloads.html">Version 1.0.2</a>&nbsp;&nbsp;<IMG src="./../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+        <li><a href="./../api2/downloads.html">Version 2.0.0-AM1</a>&nbsp;&nbsp;<IMG src="./../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
         <li><a href="./../api/download-old-versions.html">Older versions</a></li>
     </ul>
     <h5>Getting Started</h5>
     <ul>
         <li><a href="./../api/vision.html">Vision</a></li>
         <li><a href="./../api/java-api.html">Java API</a></li>
+        <li><a href="./../api2/java-api2.html">Java API v2</a></li>
     </ul>
     <h5>Documentation</h5>
     <ul>
 	    <li><a href="./../api/five-minutes-tutorial.html">Five minutes tutorial</a></li>
 	    <li><a href="./../api/user-guide.html">User Guide</a></li>
+        <li><a href="./../api2/migration-guide.html">API 1 to 2 migration</a></li>
         <li><a href="./../api/gen-docs/latest/apidocs/">JavaDocs</a></li>
+        <li><a href="./../api2/gen-docs/latest/apidocs/">JavaDocs 2</a></li>
         <li><a href="./../api/gen-docs/latest/xref/">Cross-Reference</a></li>
+        <li><a href="./../api2/gen-docs/latest/xref/">Cross-Reference 2</a></li>
         <!--li><a href="./../api/gen-docs/latest/">Generated Reports</a></li-->
         <li><a href="./../api/developer-guide.html">Developer Guide</a></li>
         <li><a href="./../api/internal-design-guide.html">Internal Guide</a></li>

Modified: websites/staging/directory/trunk/content/api/download/download-archive.html
==============================================================================
--- websites/staging/directory/trunk/content/api/download/download-archive.html (original)
+++ websites/staging/directory/trunk/content/api/download/download-archive.html Thu Jul 26 01:02:02 2018
@@ -97,7 +97,7 @@
         </a>
       </li>
     </ul-->
-    <h5>LDAP API 1.0</h5>
+    <h5>LDAP API </h5>
     <ul>
         <li><a href="./../../api/">Home</a></li>
         <li><a href="./../../api/news.html">News</a></li>
@@ -105,19 +105,24 @@
     <h5>Downloads</h5>
     <ul>
 	    <li><a href="./../../api/downloads.html">Version 1.0.2</a>&nbsp;&nbsp;<IMG src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+        <li><a href="./../../api2/downloads.html">Version 2.0.0-AM1</a>&nbsp;&nbsp;<IMG src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
         <li><a href="./../../api/download-old-versions.html">Older versions</a></li>
     </ul>
     <h5>Getting Started</h5>
     <ul>
         <li><a href="./../../api/vision.html">Vision</a></li>
         <li><a href="./../../api/java-api.html">Java API</a></li>
+        <li><a href="./../../api2/java-api2.html">Java API v2</a></li>
     </ul>
     <h5>Documentation</h5>
     <ul>
 	    <li><a href="./../../api/five-minutes-tutorial.html">Five minutes tutorial</a></li>
 	    <li><a href="./../../api/user-guide.html">User Guide</a></li>
+        <li><a href="./../../api2/migration-guide.html">API 1 to 2 migration</a></li>
         <li><a href="./../../api/gen-docs/latest/apidocs/">JavaDocs</a></li>
+        <li><a href="./../../api2/gen-docs/latest/apidocs/">JavaDocs 2</a></li>
         <li><a href="./../../api/gen-docs/latest/xref/">Cross-Reference</a></li>
+        <li><a href="./../../api2/gen-docs/latest/xref/">Cross-Reference 2</a></li>
         <!--li><a href="./../../api/gen-docs/latest/">Generated Reports</a></li-->
         <li><a href="./../../api/developer-guide.html">Developer Guide</a></li>
         <li><a href="./../../api/internal-design-guide.html">Internal Guide</a></li>
@@ -164,7 +169,9 @@
     We suggest the following mirror site for your download:
 </p>
 
-<h2>ZIP Archive</h2>
+<h2>LDAP API 1.0</h2>
+
+<h3>ZIP Archive</h3>
 
 <p>
     <div class="download">
@@ -191,7 +198,7 @@
     </div>
 </p>
 
-<h2>TAR.GZ Archive</h2>
+<h3>TAR.GZ Archive</h3>
 
 <p>
     <div class="download">
@@ -215,6 +222,62 @@
                 </td>
             </tr>
         </table>
+    </div>
+</p>
+
+<h2>LDAP API 2.0</h2>
+
+<h3>ZIP Archive</h3>
+
+<p>
+    <div class="download">
+        <table width="100%" class="noBorder">
+            <tr>
+                <td>
+                    <a href="[preferred]/directory/api/dist/2.0.0-AM1/apache-ldap-api-2.0.0-AM1-bin.zip">
+                        <img src="./../../images/download.png" width="32" height="32" border="0"/>
+                    </a>
+                </td>
+                <td>&nbsp;</td>
+                <td>
+                    <a href="[preferred]/directory/api/dist/2.0.0-AM1/apache-ldap-api-2.0.0-AM1-bin.zip">
+                        <strong>
+                            [preferred]/&#91;...&#93;/apache-ldap-api-2.0.0-AM1-bin.zip
+                        </strong>
+                    </a>
+                </td>
+                <td align="right">
+                    [<a href="https://www.apache.org/dist/directory/api/dist/2.0.0-AM1/apache-ldap-api-2.0.0-AM1-bin.zip.asc">ASC</a>-<a href="https://www.apache.org/dist/directory/api/dist/2.0.0-AM1/apache-ldap-api-2.0.0-AM1-bin.zip.sha1">SHA1</a>-<a href="https://www.apache.org/dist/directory/api/dist/2.0.0-AM1/apache-ldap-api-2.0.0-AM1-bin.zip.sha256">SHA256</a>-<a href="https://www.apache.org/dist/directory/api/dist/2.0.0-AM1/apache-ldap-api-2.0.0-AM1-bin.zip.sha512">SHA512</a>]
+                </td>
+            </tr>
+        </table>
+    </div>
+</p>
+
+<h3>TAR.GZ Archive</h3>
+
+<p>
+    <div class="download">
+        <table width="100%" class="noBorder">
+            <tr>
+                <td>
+                    <a href="[preferred]/directory/api/dist/2.0.0-AM1/apache-ldap-api-2.0.0-AM1-bin.tar.gz">
+                        <img src="./../../images/download.png" width="32" height="32" border="0"/>
+                    </a>
+                </td>
+                <td>&nbsp;</td>
+                <td>
+                    <a href="[preferred]/directory/api/dist/2.0.0-AM1/apache-ldap-api-2.0.0-AM1-bin.tar.gz">
+                        <strong>
+                            [preferred]/&#91;...&#93;/apache-ldap-api-2.0.0-AM1-bin.tar.gz
+                        </strong>
+                    </a>
+                </td>
+                <td align="right">
+                    [<a href="https://www.apache.org/dist/directory/api/dist/2.0.0-AM1/apache-ldap-api-2.0.0-AM1-bin.tar.gz.asc">ASC</a>-<a href="https://www.apache.org/dist/directory/api/dist/2.0.0-AM1/apache-ldap-api-2.0.0-AM1-bin.tar.gz.sha1">SHA1</a>-<a href="https://www.apache.org/dist/directory/api/dist/2.0.0-AM1/apache-ldap-api-2.0.0-AM1-bin.tar.gz.sha256">SHA256</a>-<a href="https://www.apache.org/dist/directory/api/dist/2.0.0-AM1/apache-ldap-api-2.0.0-AM1-bin.tar.gz.sha512">SHA512</a>]
+                </td>
+            </tr>
+        </table>
     </div>
 </p>
 

Modified: websites/staging/directory/trunk/content/api/download/download-sources.html
==============================================================================
--- websites/staging/directory/trunk/content/api/download/download-sources.html (original)
+++ websites/staging/directory/trunk/content/api/download/download-sources.html Thu Jul 26 01:02:02 2018
@@ -97,7 +97,7 @@
         </a>
       </li>
     </ul-->
-    <h5>LDAP API 1.0</h5>
+    <h5>LDAP API </h5>
     <ul>
         <li><a href="./../../api/">Home</a></li>
         <li><a href="./../../api/news.html">News</a></li>
@@ -105,19 +105,24 @@
     <h5>Downloads</h5>
     <ul>
 	    <li><a href="./../../api/downloads.html">Version 1.0.2</a>&nbsp;&nbsp;<IMG src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+        <li><a href="./../../api2/downloads.html">Version 2.0.0-AM1</a>&nbsp;&nbsp;<IMG src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
         <li><a href="./../../api/download-old-versions.html">Older versions</a></li>
     </ul>
     <h5>Getting Started</h5>
     <ul>
         <li><a href="./../../api/vision.html">Vision</a></li>
         <li><a href="./../../api/java-api.html">Java API</a></li>
+        <li><a href="./../../api2/java-api2.html">Java API v2</a></li>
     </ul>
     <h5>Documentation</h5>
     <ul>
 	    <li><a href="./../../api/five-minutes-tutorial.html">Five minutes tutorial</a></li>
 	    <li><a href="./../../api/user-guide.html">User Guide</a></li>
+        <li><a href="./../../api2/migration-guide.html">API 1 to 2 migration</a></li>
         <li><a href="./../../api/gen-docs/latest/apidocs/">JavaDocs</a></li>
+        <li><a href="./../../api2/gen-docs/latest/apidocs/">JavaDocs 2</a></li>
         <li><a href="./../../api/gen-docs/latest/xref/">Cross-Reference</a></li>
+        <li><a href="./../../api2/gen-docs/latest/xref/">Cross-Reference 2</a></li>
         <!--li><a href="./../../api/gen-docs/latest/">Generated Reports</a></li-->
         <li><a href="./../../api/developer-guide.html">Developer Guide</a></li>
         <li><a href="./../../api/internal-design-guide.html">Internal Guide</a></li>
@@ -164,7 +169,9 @@
     We suggest the following mirror site for your download:
 </p>
 
-<h2>ZIP Archive</h2>
+<h2>LDAP API 1.0</h2>
+
+<h3>ZIP Archive</h3>
 
 <p>
     <div class="download">
@@ -191,7 +198,7 @@
     </div>
 </p>
 
-<h2>TAR.GZ Archive</h2>
+<h3>TAR.GZ Archive</h3>
 
 <p>
     <div class="download">
@@ -215,6 +222,62 @@
                 </td>
             </tr>
         </table>
+    </div>
+</p>
+
+<h2>LDAP API 2.0</h2>
+
+<h3>ZIP Archive</h3>
+
+<p>
+    <div class="download">
+        <table width="100%" class="noBorder">
+            <tr>
+                <td>
+                    <a href="[preferred]/directory/api/dist/2.0.0-AM1/apache-ldap-api-2.0.0-AM1-src.zip">
+                        <img src="./../../images/download.png" width="32" height="32" border="0"/>
+                    </a>
+                </td>
+                <td>&nbsp;</td>
+                <td>
+                    <a href="[preferred]/directory/api/dist/2.0.0-AM1/apache-ldap-api-2.0.0-AM1-src.zip">
+                        <strong>
+                            [preferred]/&#91;...&#93;/apache-ldap-api-1.0.2-src.zip
+                        </strong>
+                    </a>
+                </td>
+                <td align="right">
+                    [<a href="https://www.apache.org/dist/directory/api/dist/2.0.0-AM1/apache-ldap-api-2.0.0-AM1-src.zip.asc">ASC</a>-<a href="https://www.apache.org/dist/directory/api/dist/2.0.0-AM1/apache-ldap-api-2.0.0-AM1-src.zip.sha1">SHA1</a>-<a href="https://www.apache.org/dist/directory/api/dist/2.0.0-AM1/apache-ldap-api-2.0.0-AM1-src.zip.sha256">SHA256</a>-<a href="https://www.apache.org/dist/directory/api/dist/2.0.0-AM1/apache-ldap-api-2.0.0-AM1-src.zip.sha512">SHA512</a>]
+                </td>
+            </tr>
+        </table>
+    </div>
+</p>
+
+<h3>TAR.GZ Archive</h3>
+
+<p>
+    <div class="download">
+        <table width="100%" class="noBorder">
+            <tr>
+                <td>
+                    <a href="[preferred]/directory/api/dist/2.0.0-AM1/apache-ldap-api-2.0.0-AM1-src.tar.gz">
+                        <img src="./../../images/download.png" width="32" height="32" border="0"/>
+                    </a>
+                </td>
+                <td>&nbsp;</td>
+                <td>
+                    <a href="[preferred]/directory/api/dist/2.0.0-AM1/apache-ldap-api-2.0.0-AM1-src.tar.gz">
+                        <strong>
+                            [preferred]/&#91;...&#93;/apache-ldap-api-2.0.0-AM1-src.tar.gz
+                        </strong>
+                    </a>
+                </td>
+                <td align="right">
+                    [<a href="https://www.apache.org/dist/directory/api/dist/2.0.0-AM1/apache-ldap-api-2.0.0-AM1-src.tar.gz.asc">ASC</a>-<a href="https://www.apache.org/dist/directory/api/dist/2.0.0-AM1/apache-ldap-api-2.0.0-AM1-src.tar.gz.sha1">SHA1</a>-<a href="https://www.apache.org/dist/directory/api/dist/2.0.0-AM1/apache-ldap-api-2.0.0-AM1-src.tar.gz.sha256">SHA256</a>-<a href="https://www.apache.org/dist/directory/api/dist/2.0.0-AM1/apache-ldap-api-2.0.0-AM1-src.tar.gz.sha512">SHA512</a>]
+                </td>
+            </tr>
+        </table>
     </div>
 </p>
 

Modified: websites/staging/directory/trunk/content/api/downloads.html
==============================================================================
--- websites/staging/directory/trunk/content/api/downloads.html (original)
+++ websites/staging/directory/trunk/content/api/downloads.html Thu Jul 26 01:02:02 2018
@@ -97,7 +97,7 @@
         </a>
       </li>
     </ul-->
-    <h5>LDAP API 1.0</h5>
+    <h5>LDAP API </h5>
     <ul>
         <li><a href="./../api/">Home</a></li>
         <li><a href="./../api/news.html">News</a></li>
@@ -105,19 +105,24 @@
     <h5>Downloads</h5>
     <ul>
 	    <li><a href="./../api/downloads.html">Version 1.0.2</a>&nbsp;&nbsp;<IMG src="./../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+        <li><a href="./../api2/downloads.html">Version 2.0.0-AM1</a>&nbsp;&nbsp;<IMG src="./../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
         <li><a href="./../api/download-old-versions.html">Older versions</a></li>
     </ul>
     <h5>Getting Started</h5>
     <ul>
         <li><a href="./../api/vision.html">Vision</a></li>
         <li><a href="./../api/java-api.html">Java API</a></li>
+        <li><a href="./../api2/java-api2.html">Java API v2</a></li>
     </ul>
     <h5>Documentation</h5>
     <ul>
 	    <li><a href="./../api/five-minutes-tutorial.html">Five minutes tutorial</a></li>
 	    <li><a href="./../api/user-guide.html">User Guide</a></li>
+        <li><a href="./../api2/migration-guide.html">API 1 to 2 migration</a></li>
         <li><a href="./../api/gen-docs/latest/apidocs/">JavaDocs</a></li>
+        <li><a href="./../api2/gen-docs/latest/apidocs/">JavaDocs 2</a></li>
         <li><a href="./../api/gen-docs/latest/xref/">Cross-Reference</a></li>
+        <li><a href="./../api2/gen-docs/latest/xref/">Cross-Reference 2</a></li>
         <!--li><a href="./../api/gen-docs/latest/">Generated Reports</a></li-->
         <li><a href="./../api/developer-guide.html">Developer Guide</a></li>
         <li><a href="./../api/internal-design-guide.html">Internal Guide</a></li>

Modified: websites/staging/directory/trunk/content/api/five-minutes-tutorial.html
==============================================================================
--- websites/staging/directory/trunk/content/api/five-minutes-tutorial.html (original)
+++ websites/staging/directory/trunk/content/api/five-minutes-tutorial.html Thu Jul 26 01:02:02 2018
@@ -97,7 +97,7 @@
         </a>
       </li>
     </ul-->
-    <h5>LDAP API 1.0</h5>
+    <h5>LDAP API </h5>
     <ul>
         <li><a href="./../api/">Home</a></li>
         <li><a href="./../api/news.html">News</a></li>
@@ -105,19 +105,24 @@
     <h5>Downloads</h5>
     <ul>
 	    <li><a href="./../api/downloads.html">Version 1.0.2</a>&nbsp;&nbsp;<IMG src="./../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+        <li><a href="./../api2/downloads.html">Version 2.0.0-AM1</a>&nbsp;&nbsp;<IMG src="./../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
         <li><a href="./../api/download-old-versions.html">Older versions</a></li>
     </ul>
     <h5>Getting Started</h5>
     <ul>
         <li><a href="./../api/vision.html">Vision</a></li>
         <li><a href="./../api/java-api.html">Java API</a></li>
+        <li><a href="./../api2/java-api2.html">Java API v2</a></li>
     </ul>
     <h5>Documentation</h5>
     <ul>
 	    <li><a href="./../api/five-minutes-tutorial.html">Five minutes tutorial</a></li>
 	    <li><a href="./../api/user-guide.html">User Guide</a></li>
+        <li><a href="./../api2/migration-guide.html">API 1 to 2 migration</a></li>
         <li><a href="./../api/gen-docs/latest/apidocs/">JavaDocs</a></li>
+        <li><a href="./../api2/gen-docs/latest/apidocs/">JavaDocs 2</a></li>
         <li><a href="./../api/gen-docs/latest/xref/">Cross-Reference</a></li>
+        <li><a href="./../api2/gen-docs/latest/xref/">Cross-Reference 2</a></li>
         <!--li><a href="./../api/gen-docs/latest/">Generated Reports</a></li-->
         <li><a href="./../api/developer-guide.html">Developer Guide</a></li>
         <li><a href="./../api/internal-design-guide.html">Internal Guide</a></li>

Modified: websites/staging/directory/trunk/content/api/index.html
==============================================================================
--- websites/staging/directory/trunk/content/api/index.html (original)
+++ websites/staging/directory/trunk/content/api/index.html Thu Jul 26 01:02:02 2018
@@ -97,7 +97,7 @@
         </a>
       </li>
     </ul-->
-    <h5>LDAP API 1.0</h5>
+    <h5>LDAP API </h5>
     <ul>
         <li><a href="./../api/">Home</a></li>
         <li><a href="./../api/news.html">News</a></li>
@@ -105,19 +105,24 @@
     <h5>Downloads</h5>
     <ul>
 	    <li><a href="./../api/downloads.html">Version 1.0.2</a>&nbsp;&nbsp;<IMG src="./../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+        <li><a href="./../api2/downloads.html">Version 2.0.0-AM1</a>&nbsp;&nbsp;<IMG src="./../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
         <li><a href="./../api/download-old-versions.html">Older versions</a></li>
     </ul>
     <h5>Getting Started</h5>
     <ul>
         <li><a href="./../api/vision.html">Vision</a></li>
         <li><a href="./../api/java-api.html">Java API</a></li>
+        <li><a href="./../api2/java-api2.html">Java API v2</a></li>
     </ul>
     <h5>Documentation</h5>
     <ul>
 	    <li><a href="./../api/five-minutes-tutorial.html">Five minutes tutorial</a></li>
 	    <li><a href="./../api/user-guide.html">User Guide</a></li>
+        <li><a href="./../api2/migration-guide.html">API 1 to 2 migration</a></li>
         <li><a href="./../api/gen-docs/latest/apidocs/">JavaDocs</a></li>
+        <li><a href="./../api2/gen-docs/latest/apidocs/">JavaDocs 2</a></li>
         <li><a href="./../api/gen-docs/latest/xref/">Cross-Reference</a></li>
+        <li><a href="./../api2/gen-docs/latest/xref/">Cross-Reference 2</a></li>
         <!--li><a href="./../api/gen-docs/latest/">Generated Reports</a></li-->
         <li><a href="./../api/developer-guide.html">Developer Guide</a></li>
         <li><a href="./../api/internal-design-guide.html">Internal Guide</a></li>

Modified: websites/staging/directory/trunk/content/api/internal-design-guide.html
==============================================================================
--- websites/staging/directory/trunk/content/api/internal-design-guide.html (original)
+++ websites/staging/directory/trunk/content/api/internal-design-guide.html Thu Jul 26 01:02:02 2018
@@ -97,7 +97,7 @@
         </a>
       </li>
     </ul-->
-    <h5>LDAP API 1.0</h5>
+    <h5>LDAP API </h5>
     <ul>
         <li><a href="./../api/">Home</a></li>
         <li><a href="./../api/news.html">News</a></li>
@@ -105,19 +105,24 @@
     <h5>Downloads</h5>
     <ul>
 	    <li><a href="./../api/downloads.html">Version 1.0.2</a>&nbsp;&nbsp;<IMG src="./../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+        <li><a href="./../api2/downloads.html">Version 2.0.0-AM1</a>&nbsp;&nbsp;<IMG src="./../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
         <li><a href="./../api/download-old-versions.html">Older versions</a></li>
     </ul>
     <h5>Getting Started</h5>
     <ul>
         <li><a href="./../api/vision.html">Vision</a></li>
         <li><a href="./../api/java-api.html">Java API</a></li>
+        <li><a href="./../api2/java-api2.html">Java API v2</a></li>
     </ul>
     <h5>Documentation</h5>
     <ul>
 	    <li><a href="./../api/five-minutes-tutorial.html">Five minutes tutorial</a></li>
 	    <li><a href="./../api/user-guide.html">User Guide</a></li>
+        <li><a href="./../api2/migration-guide.html">API 1 to 2 migration</a></li>
         <li><a href="./../api/gen-docs/latest/apidocs/">JavaDocs</a></li>
+        <li><a href="./../api2/gen-docs/latest/apidocs/">JavaDocs 2</a></li>
         <li><a href="./../api/gen-docs/latest/xref/">Cross-Reference</a></li>
+        <li><a href="./../api2/gen-docs/latest/xref/">Cross-Reference 2</a></li>
         <!--li><a href="./../api/gen-docs/latest/">Generated Reports</a></li-->
         <li><a href="./../api/developer-guide.html">Developer Guide</a></li>
         <li><a href="./../api/internal-design-guide.html">Internal Guide</a></li>

Modified: websites/staging/directory/trunk/content/api/internal-design-guide/1-introduction.html
==============================================================================
--- websites/staging/directory/trunk/content/api/internal-design-guide/1-introduction.html (original)
+++ websites/staging/directory/trunk/content/api/internal-design-guide/1-introduction.html Thu Jul 26 01:02:02 2018
@@ -97,7 +97,7 @@
         </a>
       </li>
     </ul-->
-    <h5>LDAP API 1.0</h5>
+    <h5>LDAP API </h5>
     <ul>
         <li><a href="./../../api/">Home</a></li>
         <li><a href="./../../api/news.html">News</a></li>
@@ -105,19 +105,24 @@
     <h5>Downloads</h5>
     <ul>
 	    <li><a href="./../../api/downloads.html">Version 1.0.2</a>&nbsp;&nbsp;<IMG src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+        <li><a href="./../../api2/downloads.html">Version 2.0.0-AM1</a>&nbsp;&nbsp;<IMG src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
         <li><a href="./../../api/download-old-versions.html">Older versions</a></li>
     </ul>
     <h5>Getting Started</h5>
     <ul>
         <li><a href="./../../api/vision.html">Vision</a></li>
         <li><a href="./../../api/java-api.html">Java API</a></li>
+        <li><a href="./../../api2/java-api2.html">Java API v2</a></li>
     </ul>
     <h5>Documentation</h5>
     <ul>
 	    <li><a href="./../../api/five-minutes-tutorial.html">Five minutes tutorial</a></li>
 	    <li><a href="./../../api/user-guide.html">User Guide</a></li>
+        <li><a href="./../../api2/migration-guide.html">API 1 to 2 migration</a></li>
         <li><a href="./../../api/gen-docs/latest/apidocs/">JavaDocs</a></li>
+        <li><a href="./../../api2/gen-docs/latest/apidocs/">JavaDocs 2</a></li>
         <li><a href="./../../api/gen-docs/latest/xref/">Cross-Reference</a></li>
+        <li><a href="./../../api2/gen-docs/latest/xref/">Cross-Reference 2</a></li>
         <!--li><a href="./../../api/gen-docs/latest/">Generated Reports</a></li-->
         <li><a href="./../../api/developer-guide.html">Developer Guide</a></li>
         <li><a href="./../../api/internal-design-guide.html">Internal Guide</a></li>

Modified: websites/staging/directory/trunk/content/api/internal-design-guide/10-entry.html
==============================================================================
--- websites/staging/directory/trunk/content/api/internal-design-guide/10-entry.html (original)
+++ websites/staging/directory/trunk/content/api/internal-design-guide/10-entry.html Thu Jul 26 01:02:02 2018
@@ -97,7 +97,7 @@
         </a>
       </li>
     </ul-->
-    <h5>LDAP API 1.0</h5>
+    <h5>LDAP API </h5>
     <ul>
         <li><a href="./../../api/">Home</a></li>
         <li><a href="./../../api/news.html">News</a></li>
@@ -105,19 +105,24 @@
     <h5>Downloads</h5>
     <ul>
 	    <li><a href="./../../api/downloads.html">Version 1.0.2</a>&nbsp;&nbsp;<IMG src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+        <li><a href="./../../api2/downloads.html">Version 2.0.0-AM1</a>&nbsp;&nbsp;<IMG src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
         <li><a href="./../../api/download-old-versions.html">Older versions</a></li>
     </ul>
     <h5>Getting Started</h5>
     <ul>
         <li><a href="./../../api/vision.html">Vision</a></li>
         <li><a href="./../../api/java-api.html">Java API</a></li>
+        <li><a href="./../../api2/java-api2.html">Java API v2</a></li>
     </ul>
     <h5>Documentation</h5>
     <ul>
 	    <li><a href="./../../api/five-minutes-tutorial.html">Five minutes tutorial</a></li>
 	    <li><a href="./../../api/user-guide.html">User Guide</a></li>
+        <li><a href="./../../api2/migration-guide.html">API 1 to 2 migration</a></li>
         <li><a href="./../../api/gen-docs/latest/apidocs/">JavaDocs</a></li>
+        <li><a href="./../../api2/gen-docs/latest/apidocs/">JavaDocs 2</a></li>
         <li><a href="./../../api/gen-docs/latest/xref/">Cross-Reference</a></li>
+        <li><a href="./../../api2/gen-docs/latest/xref/">Cross-Reference 2</a></li>
         <!--li><a href="./../../api/gen-docs/latest/">Generated Reports</a></li-->
         <li><a href="./../../api/developer-guide.html">Developer Guide</a></li>
         <li><a href="./../../api/internal-design-guide.html">Internal Guide</a></li>

Modified: websites/staging/directory/trunk/content/api/internal-design-guide/11-filter.html
==============================================================================
--- websites/staging/directory/trunk/content/api/internal-design-guide/11-filter.html (original)
+++ websites/staging/directory/trunk/content/api/internal-design-guide/11-filter.html Thu Jul 26 01:02:02 2018
@@ -97,7 +97,7 @@
         </a>
       </li>
     </ul-->
-    <h5>LDAP API 1.0</h5>
+    <h5>LDAP API </h5>
     <ul>
         <li><a href="./../../api/">Home</a></li>
         <li><a href="./../../api/news.html">News</a></li>
@@ -105,19 +105,24 @@
     <h5>Downloads</h5>
     <ul>
 	    <li><a href="./../../api/downloads.html">Version 1.0.2</a>&nbsp;&nbsp;<IMG src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+        <li><a href="./../../api2/downloads.html">Version 2.0.0-AM1</a>&nbsp;&nbsp;<IMG src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
         <li><a href="./../../api/download-old-versions.html">Older versions</a></li>
     </ul>
     <h5>Getting Started</h5>
     <ul>
         <li><a href="./../../api/vision.html">Vision</a></li>
         <li><a href="./../../api/java-api.html">Java API</a></li>
+        <li><a href="./../../api2/java-api2.html">Java API v2</a></li>
     </ul>
     <h5>Documentation</h5>
     <ul>
 	    <li><a href="./../../api/five-minutes-tutorial.html">Five minutes tutorial</a></li>
 	    <li><a href="./../../api/user-guide.html">User Guide</a></li>
+        <li><a href="./../../api2/migration-guide.html">API 1 to 2 migration</a></li>
         <li><a href="./../../api/gen-docs/latest/apidocs/">JavaDocs</a></li>
+        <li><a href="./../../api2/gen-docs/latest/apidocs/">JavaDocs 2</a></li>
         <li><a href="./../../api/gen-docs/latest/xref/">Cross-Reference</a></li>
+        <li><a href="./../../api2/gen-docs/latest/xref/">Cross-Reference 2</a></li>
         <!--li><a href="./../../api/gen-docs/latest/">Generated Reports</a></li-->
         <li><a href="./../../api/developer-guide.html">Developer Guide</a></li>
         <li><a href="./../../api/internal-design-guide.html">Internal Guide</a></li>

Modified: websites/staging/directory/trunk/content/api/internal-design-guide/12-cursor.html
==============================================================================
--- websites/staging/directory/trunk/content/api/internal-design-guide/12-cursor.html (original)
+++ websites/staging/directory/trunk/content/api/internal-design-guide/12-cursor.html Thu Jul 26 01:02:02 2018
@@ -97,7 +97,7 @@
         </a>
       </li>
     </ul-->
-    <h5>LDAP API 1.0</h5>
+    <h5>LDAP API </h5>
     <ul>
         <li><a href="./../../api/">Home</a></li>
         <li><a href="./../../api/news.html">News</a></li>
@@ -105,19 +105,24 @@
     <h5>Downloads</h5>
     <ul>
 	    <li><a href="./../../api/downloads.html">Version 1.0.2</a>&nbsp;&nbsp;<IMG src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+        <li><a href="./../../api2/downloads.html">Version 2.0.0-AM1</a>&nbsp;&nbsp;<IMG src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
         <li><a href="./../../api/download-old-versions.html">Older versions</a></li>
     </ul>
     <h5>Getting Started</h5>
     <ul>
         <li><a href="./../../api/vision.html">Vision</a></li>
         <li><a href="./../../api/java-api.html">Java API</a></li>
+        <li><a href="./../../api2/java-api2.html">Java API v2</a></li>
     </ul>
     <h5>Documentation</h5>
     <ul>
 	    <li><a href="./../../api/five-minutes-tutorial.html">Five minutes tutorial</a></li>
 	    <li><a href="./../../api/user-guide.html">User Guide</a></li>
+        <li><a href="./../../api2/migration-guide.html">API 1 to 2 migration</a></li>
         <li><a href="./../../api/gen-docs/latest/apidocs/">JavaDocs</a></li>
+        <li><a href="./../../api2/gen-docs/latest/apidocs/">JavaDocs 2</a></li>
         <li><a href="./../../api/gen-docs/latest/xref/">Cross-Reference</a></li>
+        <li><a href="./../../api2/gen-docs/latest/xref/">Cross-Reference 2</a></li>
         <!--li><a href="./../../api/gen-docs/latest/">Generated Reports</a></li-->
         <li><a href="./../../api/developer-guide.html">Developer Guide</a></li>
         <li><a href="./../../api/internal-design-guide.html">Internal Guide</a></li>

Modified: websites/staging/directory/trunk/content/api/internal-design-guide/13-controls.html
==============================================================================
--- websites/staging/directory/trunk/content/api/internal-design-guide/13-controls.html (original)
+++ websites/staging/directory/trunk/content/api/internal-design-guide/13-controls.html Thu Jul 26 01:02:02 2018
@@ -97,7 +97,7 @@
         </a>
       </li>
     </ul-->
-    <h5>LDAP API 1.0</h5>
+    <h5>LDAP API </h5>
     <ul>
         <li><a href="./../../api/">Home</a></li>
         <li><a href="./../../api/news.html">News</a></li>
@@ -105,19 +105,24 @@
     <h5>Downloads</h5>
     <ul>
 	    <li><a href="./../../api/downloads.html">Version 1.0.2</a>&nbsp;&nbsp;<IMG src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+        <li><a href="./../../api2/downloads.html">Version 2.0.0-AM1</a>&nbsp;&nbsp;<IMG src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
         <li><a href="./../../api/download-old-versions.html">Older versions</a></li>
     </ul>
     <h5>Getting Started</h5>
     <ul>
         <li><a href="./../../api/vision.html">Vision</a></li>
         <li><a href="./../../api/java-api.html">Java API</a></li>
+        <li><a href="./../../api2/java-api2.html">Java API v2</a></li>
     </ul>
     <h5>Documentation</h5>
     <ul>
 	    <li><a href="./../../api/five-minutes-tutorial.html">Five minutes tutorial</a></li>
 	    <li><a href="./../../api/user-guide.html">User Guide</a></li>
+        <li><a href="./../../api2/migration-guide.html">API 1 to 2 migration</a></li>
         <li><a href="./../../api/gen-docs/latest/apidocs/">JavaDocs</a></li>
+        <li><a href="./../../api2/gen-docs/latest/apidocs/">JavaDocs 2</a></li>
         <li><a href="./../../api/gen-docs/latest/xref/">Cross-Reference</a></li>
+        <li><a href="./../../api2/gen-docs/latest/xref/">Cross-Reference 2</a></li>
         <!--li><a href="./../../api/gen-docs/latest/">Generated Reports</a></li-->
         <li><a href="./../../api/developer-guide.html">Developer Guide</a></li>
         <li><a href="./../../api/internal-design-guide.html">Internal Guide</a></li>

Modified: websites/staging/directory/trunk/content/api/internal-design-guide/14-extended-operations.html
==============================================================================
--- websites/staging/directory/trunk/content/api/internal-design-guide/14-extended-operations.html (original)
+++ websites/staging/directory/trunk/content/api/internal-design-guide/14-extended-operations.html Thu Jul 26 01:02:02 2018
@@ -97,7 +97,7 @@
         </a>
       </li>
     </ul-->
-    <h5>LDAP API 1.0</h5>
+    <h5>LDAP API </h5>
     <ul>
         <li><a href="./../../api/">Home</a></li>
         <li><a href="./../../api/news.html">News</a></li>
@@ -105,19 +105,24 @@
     <h5>Downloads</h5>
     <ul>
 	    <li><a href="./../../api/downloads.html">Version 1.0.2</a>&nbsp;&nbsp;<IMG src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+        <li><a href="./../../api2/downloads.html">Version 2.0.0-AM1</a>&nbsp;&nbsp;<IMG src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
         <li><a href="./../../api/download-old-versions.html">Older versions</a></li>
     </ul>
     <h5>Getting Started</h5>
     <ul>
         <li><a href="./../../api/vision.html">Vision</a></li>
         <li><a href="./../../api/java-api.html">Java API</a></li>
+        <li><a href="./../../api2/java-api2.html">Java API v2</a></li>
     </ul>
     <h5>Documentation</h5>
     <ul>
 	    <li><a href="./../../api/five-minutes-tutorial.html">Five minutes tutorial</a></li>
 	    <li><a href="./../../api/user-guide.html">User Guide</a></li>
+        <li><a href="./../../api2/migration-guide.html">API 1 to 2 migration</a></li>
         <li><a href="./../../api/gen-docs/latest/apidocs/">JavaDocs</a></li>
+        <li><a href="./../../api2/gen-docs/latest/apidocs/">JavaDocs 2</a></li>
         <li><a href="./../../api/gen-docs/latest/xref/">Cross-Reference</a></li>
+        <li><a href="./../../api2/gen-docs/latest/xref/">Cross-Reference 2</a></li>
         <!--li><a href="./../../api/gen-docs/latest/">Generated Reports</a></li-->
         <li><a href="./../../api/developer-guide.html">Developer Guide</a></li>
         <li><a href="./../../api/internal-design-guide.html">Internal Guide</a></li>

Modified: websites/staging/directory/trunk/content/api/internal-design-guide/15-ldif.html
==============================================================================
--- websites/staging/directory/trunk/content/api/internal-design-guide/15-ldif.html (original)
+++ websites/staging/directory/trunk/content/api/internal-design-guide/15-ldif.html Thu Jul 26 01:02:02 2018
@@ -97,7 +97,7 @@
         </a>
       </li>
     </ul-->
-    <h5>LDAP API 1.0</h5>
+    <h5>LDAP API </h5>
     <ul>
         <li><a href="./../../api/">Home</a></li>
         <li><a href="./../../api/news.html">News</a></li>
@@ -105,19 +105,24 @@
     <h5>Downloads</h5>
     <ul>
 	    <li><a href="./../../api/downloads.html">Version 1.0.2</a>&nbsp;&nbsp;<IMG src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+        <li><a href="./../../api2/downloads.html">Version 2.0.0-AM1</a>&nbsp;&nbsp;<IMG src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
         <li><a href="./../../api/download-old-versions.html">Older versions</a></li>
     </ul>
     <h5>Getting Started</h5>
     <ul>
         <li><a href="./../../api/vision.html">Vision</a></li>
         <li><a href="./../../api/java-api.html">Java API</a></li>
+        <li><a href="./../../api2/java-api2.html">Java API v2</a></li>
     </ul>
     <h5>Documentation</h5>
     <ul>
 	    <li><a href="./../../api/five-minutes-tutorial.html">Five minutes tutorial</a></li>
 	    <li><a href="./../../api/user-guide.html">User Guide</a></li>
+        <li><a href="./../../api2/migration-guide.html">API 1 to 2 migration</a></li>
         <li><a href="./../../api/gen-docs/latest/apidocs/">JavaDocs</a></li>
+        <li><a href="./../../api2/gen-docs/latest/apidocs/">JavaDocs 2</a></li>
         <li><a href="./../../api/gen-docs/latest/xref/">Cross-Reference</a></li>
+        <li><a href="./../../api2/gen-docs/latest/xref/">Cross-Reference 2</a></li>
         <!--li><a href="./../../api/gen-docs/latest/">Generated Reports</a></li-->
         <li><a href="./../../api/developer-guide.html">Developer Guide</a></li>
         <li><a href="./../../api/internal-design-guide.html">Internal Guide</a></li>

Modified: websites/staging/directory/trunk/content/api/internal-design-guide/16-dsml.html
==============================================================================
--- websites/staging/directory/trunk/content/api/internal-design-guide/16-dsml.html (original)
+++ websites/staging/directory/trunk/content/api/internal-design-guide/16-dsml.html Thu Jul 26 01:02:02 2018
@@ -97,7 +97,7 @@
         </a>
       </li>
     </ul-->
-    <h5>LDAP API 1.0</h5>
+    <h5>LDAP API </h5>
     <ul>
         <li><a href="./../../api/">Home</a></li>
         <li><a href="./../../api/news.html">News</a></li>
@@ -105,19 +105,24 @@
     <h5>Downloads</h5>
     <ul>
 	    <li><a href="./../../api/downloads.html">Version 1.0.2</a>&nbsp;&nbsp;<IMG src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+        <li><a href="./../../api2/downloads.html">Version 2.0.0-AM1</a>&nbsp;&nbsp;<IMG src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
         <li><a href="./../../api/download-old-versions.html">Older versions</a></li>
     </ul>
     <h5>Getting Started</h5>
     <ul>
         <li><a href="./../../api/vision.html">Vision</a></li>
         <li><a href="./../../api/java-api.html">Java API</a></li>
+        <li><a href="./../../api2/java-api2.html">Java API v2</a></li>
     </ul>
     <h5>Documentation</h5>
     <ul>
 	    <li><a href="./../../api/five-minutes-tutorial.html">Five minutes tutorial</a></li>
 	    <li><a href="./../../api/user-guide.html">User Guide</a></li>
+        <li><a href="./../../api2/migration-guide.html">API 1 to 2 migration</a></li>
         <li><a href="./../../api/gen-docs/latest/apidocs/">JavaDocs</a></li>
+        <li><a href="./../../api2/gen-docs/latest/apidocs/">JavaDocs 2</a></li>
         <li><a href="./../../api/gen-docs/latest/xref/">Cross-Reference</a></li>
+        <li><a href="./../../api2/gen-docs/latest/xref/">Cross-Reference 2</a></li>
         <!--li><a href="./../../api/gen-docs/latest/">Generated Reports</a></li-->
         <li><a href="./../../api/developer-guide.html">Developer Guide</a></li>
         <li><a href="./../../api/internal-design-guide.html">Internal Guide</a></li>

Modified: websites/staging/directory/trunk/content/api/internal-design-guide/17-osgi.html
==============================================================================
--- websites/staging/directory/trunk/content/api/internal-design-guide/17-osgi.html (original)
+++ websites/staging/directory/trunk/content/api/internal-design-guide/17-osgi.html Thu Jul 26 01:02:02 2018
@@ -97,7 +97,7 @@
         </a>
       </li>
     </ul-->
-    <h5>LDAP API 1.0</h5>
+    <h5>LDAP API </h5>
     <ul>
         <li><a href="./../../api/">Home</a></li>
         <li><a href="./../../api/news.html">News</a></li>
@@ -105,19 +105,24 @@
     <h5>Downloads</h5>
     <ul>
 	    <li><a href="./../../api/downloads.html">Version 1.0.2</a>&nbsp;&nbsp;<IMG src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+        <li><a href="./../../api2/downloads.html">Version 2.0.0-AM1</a>&nbsp;&nbsp;<IMG src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
         <li><a href="./../../api/download-old-versions.html">Older versions</a></li>
     </ul>
     <h5>Getting Started</h5>
     <ul>
         <li><a href="./../../api/vision.html">Vision</a></li>
         <li><a href="./../../api/java-api.html">Java API</a></li>
+        <li><a href="./../../api2/java-api2.html">Java API v2</a></li>
     </ul>
     <h5>Documentation</h5>
     <ul>
 	    <li><a href="./../../api/five-minutes-tutorial.html">Five minutes tutorial</a></li>
 	    <li><a href="./../../api/user-guide.html">User Guide</a></li>
+        <li><a href="./../../api2/migration-guide.html">API 1 to 2 migration</a></li>
         <li><a href="./../../api/gen-docs/latest/apidocs/">JavaDocs</a></li>
+        <li><a href="./../../api2/gen-docs/latest/apidocs/">JavaDocs 2</a></li>
         <li><a href="./../../api/gen-docs/latest/xref/">Cross-Reference</a></li>
+        <li><a href="./../../api2/gen-docs/latest/xref/">Cross-Reference 2</a></li>
         <!--li><a href="./../../api/gen-docs/latest/">Generated Reports</a></li-->
         <li><a href="./../../api/developer-guide.html">Developer Guide</a></li>
         <li><a href="./../../api/internal-design-guide.html">Internal Guide</a></li>

Modified: websites/staging/directory/trunk/content/api/internal-design-guide/2-general-structure.html
==============================================================================
--- websites/staging/directory/trunk/content/api/internal-design-guide/2-general-structure.html (original)
+++ websites/staging/directory/trunk/content/api/internal-design-guide/2-general-structure.html Thu Jul 26 01:02:02 2018
@@ -97,7 +97,7 @@
         </a>
       </li>
     </ul-->
-    <h5>LDAP API 1.0</h5>
+    <h5>LDAP API </h5>
     <ul>
         <li><a href="./../../api/">Home</a></li>
         <li><a href="./../../api/news.html">News</a></li>
@@ -105,19 +105,24 @@
     <h5>Downloads</h5>
     <ul>
 	    <li><a href="./../../api/downloads.html">Version 1.0.2</a>&nbsp;&nbsp;<IMG src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+        <li><a href="./../../api2/downloads.html">Version 2.0.0-AM1</a>&nbsp;&nbsp;<IMG src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
         <li><a href="./../../api/download-old-versions.html">Older versions</a></li>
     </ul>
     <h5>Getting Started</h5>
     <ul>
         <li><a href="./../../api/vision.html">Vision</a></li>
         <li><a href="./../../api/java-api.html">Java API</a></li>
+        <li><a href="./../../api2/java-api2.html">Java API v2</a></li>
     </ul>
     <h5>Documentation</h5>
     <ul>
 	    <li><a href="./../../api/five-minutes-tutorial.html">Five minutes tutorial</a></li>
 	    <li><a href="./../../api/user-guide.html">User Guide</a></li>
+        <li><a href="./../../api2/migration-guide.html">API 1 to 2 migration</a></li>
         <li><a href="./../../api/gen-docs/latest/apidocs/">JavaDocs</a></li>
+        <li><a href="./../../api2/gen-docs/latest/apidocs/">JavaDocs 2</a></li>
         <li><a href="./../../api/gen-docs/latest/xref/">Cross-Reference</a></li>
+        <li><a href="./../../api2/gen-docs/latest/xref/">Cross-Reference 2</a></li>
         <!--li><a href="./../../api/gen-docs/latest/">Generated Reports</a></li-->
         <li><a href="./../../api/developer-guide.html">Developer Guide</a></li>
         <li><a href="./../../api/internal-design-guide.html">Internal Guide</a></li>

Modified: websites/staging/directory/trunk/content/api/internal-design-guide/3-building.html
==============================================================================
--- websites/staging/directory/trunk/content/api/internal-design-guide/3-building.html (original)
+++ websites/staging/directory/trunk/content/api/internal-design-guide/3-building.html Thu Jul 26 01:02:02 2018
@@ -97,7 +97,7 @@
         </a>
       </li>
     </ul-->
-    <h5>LDAP API 1.0</h5>
+    <h5>LDAP API </h5>
     <ul>
         <li><a href="./../../api/">Home</a></li>
         <li><a href="./../../api/news.html">News</a></li>
@@ -105,19 +105,24 @@
     <h5>Downloads</h5>
     <ul>
 	    <li><a href="./../../api/downloads.html">Version 1.0.2</a>&nbsp;&nbsp;<IMG src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+        <li><a href="./../../api2/downloads.html">Version 2.0.0-AM1</a>&nbsp;&nbsp;<IMG src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
         <li><a href="./../../api/download-old-versions.html">Older versions</a></li>
     </ul>
     <h5>Getting Started</h5>
     <ul>
         <li><a href="./../../api/vision.html">Vision</a></li>
         <li><a href="./../../api/java-api.html">Java API</a></li>
+        <li><a href="./../../api2/java-api2.html">Java API v2</a></li>
     </ul>
     <h5>Documentation</h5>
     <ul>
 	    <li><a href="./../../api/five-minutes-tutorial.html">Five minutes tutorial</a></li>
 	    <li><a href="./../../api/user-guide.html">User Guide</a></li>
+        <li><a href="./../../api2/migration-guide.html">API 1 to 2 migration</a></li>
         <li><a href="./../../api/gen-docs/latest/apidocs/">JavaDocs</a></li>
+        <li><a href="./../../api2/gen-docs/latest/apidocs/">JavaDocs 2</a></li>
         <li><a href="./../../api/gen-docs/latest/xref/">Cross-Reference</a></li>
+        <li><a href="./../../api2/gen-docs/latest/xref/">Cross-Reference 2</a></li>
         <!--li><a href="./../../api/gen-docs/latest/">Generated Reports</a></li-->
         <li><a href="./../../api/developer-guide.html">Developer Guide</a></li>
         <li><a href="./../../api/internal-design-guide.html">Internal Guide</a></li>

Modified: websites/staging/directory/trunk/content/api/internal-design-guide/4-asn1.html
==============================================================================
--- websites/staging/directory/trunk/content/api/internal-design-guide/4-asn1.html (original)
+++ websites/staging/directory/trunk/content/api/internal-design-guide/4-asn1.html Thu Jul 26 01:02:02 2018
@@ -97,7 +97,7 @@
         </a>
       </li>
     </ul-->
-    <h5>LDAP API 1.0</h5>
+    <h5>LDAP API </h5>
     <ul>
         <li><a href="./../../api/">Home</a></li>
         <li><a href="./../../api/news.html">News</a></li>
@@ -105,19 +105,24 @@
     <h5>Downloads</h5>
     <ul>
 	    <li><a href="./../../api/downloads.html">Version 1.0.2</a>&nbsp;&nbsp;<IMG src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+        <li><a href="./../../api2/downloads.html">Version 2.0.0-AM1</a>&nbsp;&nbsp;<IMG src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
         <li><a href="./../../api/download-old-versions.html">Older versions</a></li>
     </ul>
     <h5>Getting Started</h5>
     <ul>
         <li><a href="./../../api/vision.html">Vision</a></li>
         <li><a href="./../../api/java-api.html">Java API</a></li>
+        <li><a href="./../../api2/java-api2.html">Java API v2</a></li>
     </ul>
     <h5>Documentation</h5>
     <ul>
 	    <li><a href="./../../api/five-minutes-tutorial.html">Five minutes tutorial</a></li>
 	    <li><a href="./../../api/user-guide.html">User Guide</a></li>
+        <li><a href="./../../api2/migration-guide.html">API 1 to 2 migration</a></li>
         <li><a href="./../../api/gen-docs/latest/apidocs/">JavaDocs</a></li>
+        <li><a href="./../../api2/gen-docs/latest/apidocs/">JavaDocs 2</a></li>
         <li><a href="./../../api/gen-docs/latest/xref/">Cross-Reference</a></li>
+        <li><a href="./../../api2/gen-docs/latest/xref/">Cross-Reference 2</a></li>
         <!--li><a href="./../../api/gen-docs/latest/">Generated Reports</a></li-->
         <li><a href="./../../api/developer-guide.html">Developer Guide</a></li>
         <li><a href="./../../api/internal-design-guide.html">Internal Guide</a></li>

Modified: websites/staging/directory/trunk/content/api/internal-design-guide/4.1-asn1-tlv.html
==============================================================================
--- websites/staging/directory/trunk/content/api/internal-design-guide/4.1-asn1-tlv.html (original)
+++ websites/staging/directory/trunk/content/api/internal-design-guide/4.1-asn1-tlv.html Thu Jul 26 01:02:02 2018
@@ -97,7 +97,7 @@
         </a>
       </li>
     </ul-->
-    <h5>LDAP API 1.0</h5>
+    <h5>LDAP API </h5>
     <ul>
         <li><a href="./../../api/">Home</a></li>
         <li><a href="./../../api/news.html">News</a></li>
@@ -105,19 +105,24 @@
     <h5>Downloads</h5>
     <ul>
 	    <li><a href="./../../api/downloads.html">Version 1.0.2</a>&nbsp;&nbsp;<IMG src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+        <li><a href="./../../api2/downloads.html">Version 2.0.0-AM1</a>&nbsp;&nbsp;<IMG src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
         <li><a href="./../../api/download-old-versions.html">Older versions</a></li>
     </ul>
     <h5>Getting Started</h5>
     <ul>
         <li><a href="./../../api/vision.html">Vision</a></li>
         <li><a href="./../../api/java-api.html">Java API</a></li>
+        <li><a href="./../../api2/java-api2.html">Java API v2</a></li>
     </ul>
     <h5>Documentation</h5>
     <ul>
 	    <li><a href="./../../api/five-minutes-tutorial.html">Five minutes tutorial</a></li>
 	    <li><a href="./../../api/user-guide.html">User Guide</a></li>
+        <li><a href="./../../api2/migration-guide.html">API 1 to 2 migration</a></li>
         <li><a href="./../../api/gen-docs/latest/apidocs/">JavaDocs</a></li>
+        <li><a href="./../../api2/gen-docs/latest/apidocs/">JavaDocs 2</a></li>
         <li><a href="./../../api/gen-docs/latest/xref/">Cross-Reference</a></li>
+        <li><a href="./../../api2/gen-docs/latest/xref/">Cross-Reference 2</a></li>
         <!--li><a href="./../../api/gen-docs/latest/">Generated Reports</a></li-->
         <li><a href="./../../api/developer-guide.html">Developer Guide</a></li>
         <li><a href="./../../api/internal-design-guide.html">Internal Guide</a></li>

Modified: websites/staging/directory/trunk/content/api/internal-design-guide/5-network.html
==============================================================================
--- websites/staging/directory/trunk/content/api/internal-design-guide/5-network.html (original)
+++ websites/staging/directory/trunk/content/api/internal-design-guide/5-network.html Thu Jul 26 01:02:02 2018
@@ -97,7 +97,7 @@
         </a>
       </li>
     </ul-->
-    <h5>LDAP API 1.0</h5>
+    <h5>LDAP API </h5>
     <ul>
         <li><a href="./../../api/">Home</a></li>
         <li><a href="./../../api/news.html">News</a></li>
@@ -105,19 +105,24 @@
     <h5>Downloads</h5>
     <ul>
 	    <li><a href="./../../api/downloads.html">Version 1.0.2</a>&nbsp;&nbsp;<IMG src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+        <li><a href="./../../api2/downloads.html">Version 2.0.0-AM1</a>&nbsp;&nbsp;<IMG src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
         <li><a href="./../../api/download-old-versions.html">Older versions</a></li>
     </ul>
     <h5>Getting Started</h5>
     <ul>
         <li><a href="./../../api/vision.html">Vision</a></li>
         <li><a href="./../../api/java-api.html">Java API</a></li>
+        <li><a href="./../../api2/java-api2.html">Java API v2</a></li>
     </ul>
     <h5>Documentation</h5>
     <ul>
 	    <li><a href="./../../api/five-minutes-tutorial.html">Five minutes tutorial</a></li>
 	    <li><a href="./../../api/user-guide.html">User Guide</a></li>
+        <li><a href="./../../api2/migration-guide.html">API 1 to 2 migration</a></li>
         <li><a href="./../../api/gen-docs/latest/apidocs/">JavaDocs</a></li>
+        <li><a href="./../../api2/gen-docs/latest/apidocs/">JavaDocs 2</a></li>
         <li><a href="./../../api/gen-docs/latest/xref/">Cross-Reference</a></li>
+        <li><a href="./../../api2/gen-docs/latest/xref/">Cross-Reference 2</a></li>
         <!--li><a href="./../../api/gen-docs/latest/">Generated Reports</a></li-->
         <li><a href="./../../api/developer-guide.html">Developer Guide</a></li>
         <li><a href="./../../api/internal-design-guide.html">Internal Guide</a></li>

Modified: websites/staging/directory/trunk/content/api/internal-design-guide/6-codec.html
==============================================================================
--- websites/staging/directory/trunk/content/api/internal-design-guide/6-codec.html (original)
+++ websites/staging/directory/trunk/content/api/internal-design-guide/6-codec.html Thu Jul 26 01:02:02 2018
@@ -97,7 +97,7 @@
         </a>
       </li>
     </ul-->
-    <h5>LDAP API 1.0</h5>
+    <h5>LDAP API </h5>
     <ul>
         <li><a href="./../../api/">Home</a></li>
         <li><a href="./../../api/news.html">News</a></li>
@@ -105,19 +105,24 @@
     <h5>Downloads</h5>
     <ul>
 	    <li><a href="./../../api/downloads.html">Version 1.0.2</a>&nbsp;&nbsp;<IMG src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+        <li><a href="./../../api2/downloads.html">Version 2.0.0-AM1</a>&nbsp;&nbsp;<IMG src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
         <li><a href="./../../api/download-old-versions.html">Older versions</a></li>
     </ul>
     <h5>Getting Started</h5>
     <ul>
         <li><a href="./../../api/vision.html">Vision</a></li>
         <li><a href="./../../api/java-api.html">Java API</a></li>
+        <li><a href="./../../api2/java-api2.html">Java API v2</a></li>
     </ul>
     <h5>Documentation</h5>
     <ul>
 	    <li><a href="./../../api/five-minutes-tutorial.html">Five minutes tutorial</a></li>
 	    <li><a href="./../../api/user-guide.html">User Guide</a></li>
+        <li><a href="./../../api2/migration-guide.html">API 1 to 2 migration</a></li>
         <li><a href="./../../api/gen-docs/latest/apidocs/">JavaDocs</a></li>
+        <li><a href="./../../api2/gen-docs/latest/apidocs/">JavaDocs 2</a></li>
         <li><a href="./../../api/gen-docs/latest/xref/">Cross-Reference</a></li>
+        <li><a href="./../../api2/gen-docs/latest/xref/">Cross-Reference 2</a></li>
         <!--li><a href="./../../api/gen-docs/latest/">Generated Reports</a></li-->
         <li><a href="./../../api/developer-guide.html">Developer Guide</a></li>
         <li><a href="./../../api/internal-design-guide.html">Internal Guide</a></li>

Modified: websites/staging/directory/trunk/content/api/internal-design-guide/7-ldap-messages.html
==============================================================================
--- websites/staging/directory/trunk/content/api/internal-design-guide/7-ldap-messages.html (original)
+++ websites/staging/directory/trunk/content/api/internal-design-guide/7-ldap-messages.html Thu Jul 26 01:02:02 2018
@@ -97,7 +97,7 @@
         </a>
       </li>
     </ul-->
-    <h5>LDAP API 1.0</h5>
+    <h5>LDAP API </h5>
     <ul>
         <li><a href="./../../api/">Home</a></li>
         <li><a href="./../../api/news.html">News</a></li>
@@ -105,19 +105,24 @@
     <h5>Downloads</h5>
     <ul>
 	    <li><a href="./../../api/downloads.html">Version 1.0.2</a>&nbsp;&nbsp;<IMG src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+        <li><a href="./../../api2/downloads.html">Version 2.0.0-AM1</a>&nbsp;&nbsp;<IMG src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
         <li><a href="./../../api/download-old-versions.html">Older versions</a></li>
     </ul>
     <h5>Getting Started</h5>
     <ul>
         <li><a href="./../../api/vision.html">Vision</a></li>
         <li><a href="./../../api/java-api.html">Java API</a></li>
+        <li><a href="./../../api2/java-api2.html">Java API v2</a></li>
     </ul>
     <h5>Documentation</h5>
     <ul>
 	    <li><a href="./../../api/five-minutes-tutorial.html">Five minutes tutorial</a></li>
 	    <li><a href="./../../api/user-guide.html">User Guide</a></li>
+        <li><a href="./../../api2/migration-guide.html">API 1 to 2 migration</a></li>
         <li><a href="./../../api/gen-docs/latest/apidocs/">JavaDocs</a></li>
+        <li><a href="./../../api2/gen-docs/latest/apidocs/">JavaDocs 2</a></li>
         <li><a href="./../../api/gen-docs/latest/xref/">Cross-Reference</a></li>
+        <li><a href="./../../api2/gen-docs/latest/xref/">Cross-Reference 2</a></li>
         <!--li><a href="./../../api/gen-docs/latest/">Generated Reports</a></li-->
         <li><a href="./../../api/developer-guide.html">Developer Guide</a></li>
         <li><a href="./../../api/internal-design-guide.html">Internal Guide</a></li>

Modified: websites/staging/directory/trunk/content/api/internal-design-guide/8-schema.html
==============================================================================
--- websites/staging/directory/trunk/content/api/internal-design-guide/8-schema.html (original)
+++ websites/staging/directory/trunk/content/api/internal-design-guide/8-schema.html Thu Jul 26 01:02:02 2018
@@ -97,7 +97,7 @@
         </a>
       </li>
     </ul-->
-    <h5>LDAP API 1.0</h5>
+    <h5>LDAP API </h5>
     <ul>
         <li><a href="./../../api/">Home</a></li>
         <li><a href="./../../api/news.html">News</a></li>
@@ -105,19 +105,24 @@
     <h5>Downloads</h5>
     <ul>
 	    <li><a href="./../../api/downloads.html">Version 1.0.2</a>&nbsp;&nbsp;<IMG src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+        <li><a href="./../../api2/downloads.html">Version 2.0.0-AM1</a>&nbsp;&nbsp;<IMG src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
         <li><a href="./../../api/download-old-versions.html">Older versions</a></li>
     </ul>
     <h5>Getting Started</h5>
     <ul>
         <li><a href="./../../api/vision.html">Vision</a></li>
         <li><a href="./../../api/java-api.html">Java API</a></li>
+        <li><a href="./../../api2/java-api2.html">Java API v2</a></li>
     </ul>
     <h5>Documentation</h5>
     <ul>
 	    <li><a href="./../../api/five-minutes-tutorial.html">Five minutes tutorial</a></li>
 	    <li><a href="./../../api/user-guide.html">User Guide</a></li>
+        <li><a href="./../../api2/migration-guide.html">API 1 to 2 migration</a></li>
         <li><a href="./../../api/gen-docs/latest/apidocs/">JavaDocs</a></li>
+        <li><a href="./../../api2/gen-docs/latest/apidocs/">JavaDocs 2</a></li>
         <li><a href="./../../api/gen-docs/latest/xref/">Cross-Reference</a></li>
+        <li><a href="./../../api2/gen-docs/latest/xref/">Cross-Reference 2</a></li>
         <!--li><a href="./../../api/gen-docs/latest/">Generated Reports</a></li-->
         <li><a href="./../../api/developer-guide.html">Developer Guide</a></li>
         <li><a href="./../../api/internal-design-guide.html">Internal Guide</a></li>

Modified: websites/staging/directory/trunk/content/api/internal-design-guide/9-dn.html
==============================================================================
--- websites/staging/directory/trunk/content/api/internal-design-guide/9-dn.html (original)
+++ websites/staging/directory/trunk/content/api/internal-design-guide/9-dn.html Thu Jul 26 01:02:02 2018
@@ -97,7 +97,7 @@
         </a>
       </li>
     </ul-->
-    <h5>LDAP API 1.0</h5>
+    <h5>LDAP API </h5>
     <ul>
         <li><a href="./../../api/">Home</a></li>
         <li><a href="./../../api/news.html">News</a></li>
@@ -105,19 +105,24 @@
     <h5>Downloads</h5>
     <ul>
 	    <li><a href="./../../api/downloads.html">Version 1.0.2</a>&nbsp;&nbsp;<IMG src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+        <li><a href="./../../api2/downloads.html">Version 2.0.0-AM1</a>&nbsp;&nbsp;<IMG src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
         <li><a href="./../../api/download-old-versions.html">Older versions</a></li>
     </ul>
     <h5>Getting Started</h5>
     <ul>
         <li><a href="./../../api/vision.html">Vision</a></li>
         <li><a href="./../../api/java-api.html">Java API</a></li>
+        <li><a href="./../../api2/java-api2.html">Java API v2</a></li>
     </ul>
     <h5>Documentation</h5>
     <ul>
 	    <li><a href="./../../api/five-minutes-tutorial.html">Five minutes tutorial</a></li>
 	    <li><a href="./../../api/user-guide.html">User Guide</a></li>
+        <li><a href="./../../api2/migration-guide.html">API 1 to 2 migration</a></li>
         <li><a href="./../../api/gen-docs/latest/apidocs/">JavaDocs</a></li>
+        <li><a href="./../../api2/gen-docs/latest/apidocs/">JavaDocs 2</a></li>
         <li><a href="./../../api/gen-docs/latest/xref/">Cross-Reference</a></li>
+        <li><a href="./../../api2/gen-docs/latest/xref/">Cross-Reference 2</a></li>
         <!--li><a href="./../../api/gen-docs/latest/">Generated Reports</a></li-->
         <li><a href="./../../api/developer-guide.html">Developer Guide</a></li>
         <li><a href="./../../api/internal-design-guide.html">Internal Guide</a></li>

Modified: websites/staging/directory/trunk/content/api/java-api.html
==============================================================================
--- websites/staging/directory/trunk/content/api/java-api.html (original)
+++ websites/staging/directory/trunk/content/api/java-api.html Thu Jul 26 01:02:02 2018
@@ -97,7 +97,7 @@
         </a>
       </li>
     </ul-->
-    <h5>LDAP API 1.0</h5>
+    <h5>LDAP API </h5>
     <ul>
         <li><a href="./../api/">Home</a></li>
         <li><a href="./../api/news.html">News</a></li>
@@ -105,19 +105,24 @@
     <h5>Downloads</h5>
     <ul>
 	    <li><a href="./../api/downloads.html">Version 1.0.2</a>&nbsp;&nbsp;<IMG src="./../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+        <li><a href="./../api2/downloads.html">Version 2.0.0-AM1</a>&nbsp;&nbsp;<IMG src="./../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
         <li><a href="./../api/download-old-versions.html">Older versions</a></li>
     </ul>
     <h5>Getting Started</h5>
     <ul>
         <li><a href="./../api/vision.html">Vision</a></li>
         <li><a href="./../api/java-api.html">Java API</a></li>
+        <li><a href="./../api2/java-api2.html">Java API v2</a></li>
     </ul>
     <h5>Documentation</h5>
     <ul>
 	    <li><a href="./../api/five-minutes-tutorial.html">Five minutes tutorial</a></li>
 	    <li><a href="./../api/user-guide.html">User Guide</a></li>
+        <li><a href="./../api2/migration-guide.html">API 1 to 2 migration</a></li>
         <li><a href="./../api/gen-docs/latest/apidocs/">JavaDocs</a></li>
+        <li><a href="./../api2/gen-docs/latest/apidocs/">JavaDocs 2</a></li>
         <li><a href="./../api/gen-docs/latest/xref/">Cross-Reference</a></li>
+        <li><a href="./../api2/gen-docs/latest/xref/">Cross-Reference 2</a></li>
         <!--li><a href="./../api/gen-docs/latest/">Generated Reports</a></li-->
         <li><a href="./../api/developer-guide.html">Developer Guide</a></li>
         <li><a href="./../api/internal-design-guide.html">Internal Guide</a></li>

Modified: websites/staging/directory/trunk/content/api/news.html
==============================================================================
--- websites/staging/directory/trunk/content/api/news.html (original)
+++ websites/staging/directory/trunk/content/api/news.html Thu Jul 26 01:02:02 2018
@@ -97,7 +97,7 @@
         </a>
       </li>
     </ul-->
-    <h5>LDAP API 1.0</h5>
+    <h5>LDAP API </h5>
     <ul>
         <li><a href="./../api/">Home</a></li>
         <li><a href="./../api/news.html">News</a></li>
@@ -105,19 +105,24 @@
     <h5>Downloads</h5>
     <ul>
 	    <li><a href="./../api/downloads.html">Version 1.0.2</a>&nbsp;&nbsp;<IMG src="./../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+        <li><a href="./../api2/downloads.html">Version 2.0.0-AM1</a>&nbsp;&nbsp;<IMG src="./../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
         <li><a href="./../api/download-old-versions.html">Older versions</a></li>
     </ul>
     <h5>Getting Started</h5>
     <ul>
         <li><a href="./../api/vision.html">Vision</a></li>
         <li><a href="./../api/java-api.html">Java API</a></li>
+        <li><a href="./../api2/java-api2.html">Java API v2</a></li>
     </ul>
     <h5>Documentation</h5>
     <ul>
 	    <li><a href="./../api/five-minutes-tutorial.html">Five minutes tutorial</a></li>
 	    <li><a href="./../api/user-guide.html">User Guide</a></li>
+        <li><a href="./../api2/migration-guide.html">API 1 to 2 migration</a></li>
         <li><a href="./../api/gen-docs/latest/apidocs/">JavaDocs</a></li>
+        <li><a href="./../api2/gen-docs/latest/apidocs/">JavaDocs 2</a></li>
         <li><a href="./../api/gen-docs/latest/xref/">Cross-Reference</a></li>
+        <li><a href="./../api2/gen-docs/latest/xref/">Cross-Reference 2</a></li>
         <!--li><a href="./../api/gen-docs/latest/">Generated Reports</a></li-->
         <li><a href="./../api/developer-guide.html">Developer Guide</a></li>
         <li><a href="./../api/internal-design-guide.html">Internal Guide</a></li>

Modified: websites/staging/directory/trunk/content/api/user-guide.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide.html Thu Jul 26 01:02:02 2018
@@ -97,7 +97,7 @@
         </a>
       </li>
     </ul-->
-    <h5>LDAP API 1.0</h5>
+    <h5>LDAP API </h5>
     <ul>
         <li><a href="./../api/">Home</a></li>
         <li><a href="./../api/news.html">News</a></li>
@@ -105,19 +105,24 @@
     <h5>Downloads</h5>
     <ul>
 	    <li><a href="./../api/downloads.html">Version 1.0.2</a>&nbsp;&nbsp;<IMG src="./../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+        <li><a href="./../api2/downloads.html">Version 2.0.0-AM1</a>&nbsp;&nbsp;<IMG src="./../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
         <li><a href="./../api/download-old-versions.html">Older versions</a></li>
     </ul>
     <h5>Getting Started</h5>
     <ul>
         <li><a href="./../api/vision.html">Vision</a></li>
         <li><a href="./../api/java-api.html">Java API</a></li>
+        <li><a href="./../api2/java-api2.html">Java API v2</a></li>
     </ul>
     <h5>Documentation</h5>
     <ul>
 	    <li><a href="./../api/five-minutes-tutorial.html">Five minutes tutorial</a></li>
 	    <li><a href="./../api/user-guide.html">User Guide</a></li>
+        <li><a href="./../api2/migration-guide.html">API 1 to 2 migration</a></li>
         <li><a href="./../api/gen-docs/latest/apidocs/">JavaDocs</a></li>
+        <li><a href="./../api2/gen-docs/latest/apidocs/">JavaDocs 2</a></li>
         <li><a href="./../api/gen-docs/latest/xref/">Cross-Reference</a></li>
+        <li><a href="./../api2/gen-docs/latest/xref/">Cross-Reference 2</a></li>
         <!--li><a href="./../api/gen-docs/latest/">Generated Reports</a></li-->
         <li><a href="./../api/developer-guide.html">Developer Guide</a></li>
         <li><a href="./../api/internal-design-guide.html">Internal Guide</a></li>

Modified: websites/staging/directory/trunk/content/api/user-guide/1-introduction.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/1-introduction.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/1-introduction.html Thu Jul 26 01:02:02 2018
@@ -97,7 +97,7 @@
         </a>
       </li>
     </ul-->
-    <h5>LDAP API 1.0</h5>
+    <h5>LDAP API </h5>
     <ul>
         <li><a href="./../../api/">Home</a></li>
         <li><a href="./../../api/news.html">News</a></li>
@@ -105,19 +105,24 @@
     <h5>Downloads</h5>
     <ul>
 	    <li><a href="./../../api/downloads.html">Version 1.0.2</a>&nbsp;&nbsp;<IMG src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+        <li><a href="./../../api2/downloads.html">Version 2.0.0-AM1</a>&nbsp;&nbsp;<IMG src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
         <li><a href="./../../api/download-old-versions.html">Older versions</a></li>
     </ul>
     <h5>Getting Started</h5>
     <ul>
         <li><a href="./../../api/vision.html">Vision</a></li>
         <li><a href="./../../api/java-api.html">Java API</a></li>
+        <li><a href="./../../api2/java-api2.html">Java API v2</a></li>
     </ul>
     <h5>Documentation</h5>
     <ul>
 	    <li><a href="./../../api/five-minutes-tutorial.html">Five minutes tutorial</a></li>
 	    <li><a href="./../../api/user-guide.html">User Guide</a></li>
+        <li><a href="./../../api2/migration-guide.html">API 1 to 2 migration</a></li>
         <li><a href="./../../api/gen-docs/latest/apidocs/">JavaDocs</a></li>
+        <li><a href="./../../api2/gen-docs/latest/apidocs/">JavaDocs 2</a></li>
         <li><a href="./../../api/gen-docs/latest/xref/">Cross-Reference</a></li>
+        <li><a href="./../../api2/gen-docs/latest/xref/">Cross-Reference 2</a></li>
         <!--li><a href="./../../api/gen-docs/latest/">Generated Reports</a></li-->
         <li><a href="./../../api/developer-guide.html">Developer Guide</a></li>
         <li><a href="./../../api/internal-design-guide.html">Internal Guide</a></li>

Modified: websites/staging/directory/trunk/content/api/user-guide/1.1-java-and-ldap.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/1.1-java-and-ldap.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/1.1-java-and-ldap.html Thu Jul 26 01:02:02 2018
@@ -97,7 +97,7 @@
         </a>
       </li>
     </ul-->
-    <h5>LDAP API 1.0</h5>
+    <h5>LDAP API </h5>
     <ul>
         <li><a href="./../../api/">Home</a></li>
         <li><a href="./../../api/news.html">News</a></li>
@@ -105,19 +105,24 @@
     <h5>Downloads</h5>
     <ul>
 	    <li><a href="./../../api/downloads.html">Version 1.0.2</a>&nbsp;&nbsp;<IMG src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+        <li><a href="./../../api2/downloads.html">Version 2.0.0-AM1</a>&nbsp;&nbsp;<IMG src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
         <li><a href="./../../api/download-old-versions.html">Older versions</a></li>
     </ul>
     <h5>Getting Started</h5>
     <ul>
         <li><a href="./../../api/vision.html">Vision</a></li>
         <li><a href="./../../api/java-api.html">Java API</a></li>
+        <li><a href="./../../api2/java-api2.html">Java API v2</a></li>
     </ul>
     <h5>Documentation</h5>
     <ul>
 	    <li><a href="./../../api/five-minutes-tutorial.html">Five minutes tutorial</a></li>
 	    <li><a href="./../../api/user-guide.html">User Guide</a></li>
+        <li><a href="./../../api2/migration-guide.html">API 1 to 2 migration</a></li>
         <li><a href="./../../api/gen-docs/latest/apidocs/">JavaDocs</a></li>
+        <li><a href="./../../api2/gen-docs/latest/apidocs/">JavaDocs 2</a></li>
         <li><a href="./../../api/gen-docs/latest/xref/">Cross-Reference</a></li>
+        <li><a href="./../../api2/gen-docs/latest/xref/">Cross-Reference 2</a></li>
         <!--li><a href="./../../api/gen-docs/latest/">Generated Reports</a></li-->
         <li><a href="./../../api/developer-guide.html">Developer Guide</a></li>
         <li><a href="./../../api/internal-design-guide.html">Internal Guide</a></li>