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 [3/4] - in /websites/staging/directory/trunk/content: ./ api/ api/download/ api/internal-design-guide/ api/user-guide/

Modified: websites/staging/directory/trunk/content/api/user-guide/5.2-start-tls.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/5.2-start-tls.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/5.2-start-tls.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/5.3-sasl-bind.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/5.3-sasl-bind.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/5.3-sasl-bind.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/5.4-password-handling.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/5.4-password-handling.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/5.4-password-handling.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/5.5-certificates.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/5.5-certificates.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/5.5-certificates.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/5.6-aci-and-acls.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/5.6-aci-and-acls.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/5.6-aci-and-acls.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/6-ldap-data-structures.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/6-ldap-data-structures.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/6-ldap-data-structures.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/6.1-administrative-point.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/6.1-administrative-point.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/6.1-administrative-point.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/6.10-dit-content-rule.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/6.10-dit-content-rule.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/6.10-dit-content-rule.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/6.11-dit-structure-rule.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/6.11-dit-structure-rule.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/6.11-dit-structure-rule.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/6.12-entry.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/6.12-entry.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/6.12-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/user-guide/6.13-expr-node.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/6.13-expr-node.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/6.13-expr-node.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/6.14-ldap-comparator.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/6.14-ldap-comparator.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/6.14-ldap-comparator.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/6.15-ldap-result.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/6.15-ldap-result.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/6.15-ldap-result.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/6.16-ldap-syntax.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/6.16-ldap-syntax.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/6.16-ldap-syntax.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/6.17-ldap-url.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/6.17-ldap-url.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/6.17-ldap-url.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/6.18-ldif-control.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/6.18-ldif-control.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/6.18-ldif-control.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/6.19-ldif-entry.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/6.19-ldif-entry.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/6.19-ldif-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/user-guide/6.2-administrative-role.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/6.2-administrative-role.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/6.2-administrative-role.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/6.20-matching-rule.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/6.20-matching-rule.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/6.20-matching-rule.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/6.21-matching-rule-use.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/6.21-matching-rule-use.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/6.21-matching-rule-use.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/6.22-message.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/6.22-message.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/6.22-message.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/6.23-modification.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/6.23-modification.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/6.23-modification.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/6.24-name-form.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/6.24-name-form.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/6.24-name-form.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/6.25-normalizer.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/6.25-normalizer.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/6.25-normalizer.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/6.26-object-class.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/6.26-object-class.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/6.26-object-class.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/6.27-oid.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/6.27-oid.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/6.27-oid.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/6.28-rdn.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/6.28-rdn.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/6.28-rdn.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/6.29-referral.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/6.29-referral.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/6.29-referral.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/6.3-attribute.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/6.3-attribute.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/6.3-attribute.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/6.30-refinment.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/6.30-refinment.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/6.30-refinment.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/6.31-schema-manager.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/6.31-schema-manager.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/6.31-schema-manager.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/6.32-subentry.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/6.32-subentry.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/6.32-subentry.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/6.33-subtree-specification.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/6.33-subtree-specification.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/6.33-subtree-specification.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/6.34-syntax-checker.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/6.34-syntax-checker.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/6.34-syntax-checker.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/6.35-value.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/6.35-value.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/6.35-value.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/6.4-attribute-type.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/6.4-attribute-type.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/6.4-attribute-type.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/6.5-ava.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/6.5-ava.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/6.5-ava.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/6.6-csn.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/6.6-csn.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/6.6-csn.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/6.7-control.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/6.7-control.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/6.7-control.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/6.8-cursor.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/6.8-cursor.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/6.8-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>