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/27 16:53:48 UTC

svn commit: r1033162 [4/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/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 Fri Jul 27 16:53:46 2018
@@ -105,24 +105,23 @@
     <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/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/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/latest2/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/latest2/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 Fri Jul 27 16:53:46 2018
@@ -105,24 +105,23 @@
     <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/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/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/latest2/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/latest2/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 Fri Jul 27 16:53:46 2018
@@ -105,24 +105,23 @@
     <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/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/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/latest2/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/latest2/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 Fri Jul 27 16:53:46 2018
@@ -105,24 +105,23 @@
     <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/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/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/latest2/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/latest2/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 Fri Jul 27 16:53:46 2018
@@ -105,24 +105,23 @@
     <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/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/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/latest2/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/latest2/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 Fri Jul 27 16:53:46 2018
@@ -105,24 +105,23 @@
     <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/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/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/latest2/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/latest2/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.9-dn.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/6.9-dn.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/6.9-dn.html Fri Jul 27 16:53:46 2018
@@ -105,24 +105,23 @@
     <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/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/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/latest2/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/latest2/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/7-requests-responses.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/7-requests-responses.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/7-requests-responses.html Fri Jul 27 16:53:46 2018
@@ -105,24 +105,23 @@
     <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/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/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/latest2/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/latest2/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/7.1-abandon-request.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/7.1-abandon-request.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/7.1-abandon-request.html Fri Jul 27 16:53:46 2018
@@ -105,24 +105,23 @@
     <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/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/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/latest2/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/latest2/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/7.10-extended-request.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/7.10-extended-request.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/7.10-extended-request.html Fri Jul 27 16:53:46 2018
@@ -105,24 +105,23 @@
     <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/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/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/latest2/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/latest2/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/7.11-extended-response.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/7.11-extended-response.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/7.11-extended-response.html Fri Jul 27 16:53:46 2018
@@ -105,24 +105,23 @@
     <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/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/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/latest2/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/latest2/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/7.12-intermediate-response.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/7.12-intermediate-response.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/7.12-intermediate-response.html Fri Jul 27 16:53:46 2018
@@ -105,24 +105,23 @@
     <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/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/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/latest2/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/latest2/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/7.13-mod-dn-request.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/7.13-mod-dn-request.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/7.13-mod-dn-request.html Fri Jul 27 16:53:46 2018
@@ -105,24 +105,23 @@
     <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/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/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/latest2/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/latest2/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/7.14-mod-dn-response.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/7.14-mod-dn-response.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/7.14-mod-dn-response.html Fri Jul 27 16:53:46 2018
@@ -105,24 +105,23 @@
     <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/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/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/latest2/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/latest2/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/7.15-modify-request.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/7.15-modify-request.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/7.15-modify-request.html Fri Jul 27 16:53:46 2018
@@ -105,24 +105,23 @@
     <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/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/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/latest2/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/latest2/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/7.16-modify-response.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/7.16-modify-response.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/7.16-modify-response.html Fri Jul 27 16:53:46 2018
@@ -105,24 +105,23 @@
     <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/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/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/latest2/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/latest2/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/7.17-search-request.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/7.17-search-request.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/7.17-search-request.html Fri Jul 27 16:53:46 2018
@@ -105,24 +105,23 @@
     <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/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/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/latest2/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/latest2/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/7.18-search-result-done.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/7.18-search-result-done.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/7.18-search-result-done.html Fri Jul 27 16:53:46 2018
@@ -105,24 +105,23 @@
     <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/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/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/latest2/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/latest2/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/7.19-search-result-entry.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/7.19-search-result-entry.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/7.19-search-result-entry.html Fri Jul 27 16:53:46 2018
@@ -105,24 +105,23 @@
     <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/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/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/latest2/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/latest2/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/7.2-add-request.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/7.2-add-request.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/7.2-add-request.html Fri Jul 27 16:53:46 2018
@@ -105,24 +105,23 @@
     <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/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/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/latest2/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/latest2/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/7.20-search-result-reference.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/7.20-search-result-reference.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/7.20-search-result-reference.html Fri Jul 27 16:53:46 2018
@@ -105,24 +105,23 @@
     <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/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/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/latest2/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/latest2/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/7.21-unbind-request.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/7.21-unbind-request.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/7.21-unbind-request.html Fri Jul 27 16:53:46 2018
@@ -105,24 +105,23 @@
     <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/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/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/latest2/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/latest2/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/7.3-add-response.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/7.3-add-response.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/7.3-add-response.html Fri Jul 27 16:53:46 2018
@@ -105,24 +105,23 @@
     <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/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/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/latest2/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/latest2/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/7.4-bind-request.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/7.4-bind-request.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/7.4-bind-request.html Fri Jul 27 16:53:46 2018
@@ -105,24 +105,23 @@
     <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/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/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/latest2/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/latest2/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/7.5-bind-response.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/7.5-bind-response.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/7.5-bind-response.html Fri Jul 27 16:53:46 2018
@@ -105,24 +105,23 @@
     <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/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/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/latest2/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/latest2/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/7.6-compare-request.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/7.6-compare-request.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/7.6-compare-request.html Fri Jul 27 16:53:46 2018
@@ -105,24 +105,23 @@
     <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/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/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/latest2/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/latest2/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/7.7-compare-response.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/7.7-compare-response.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/7.7-compare-response.html Fri Jul 27 16:53:46 2018
@@ -105,24 +105,23 @@
     <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/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/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/latest2/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/latest2/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/7.8-del-request.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/7.8-del-request.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/7.8-del-request.html Fri Jul 27 16:53:46 2018
@@ -105,24 +105,23 @@
     <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/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/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/latest2/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/latest2/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/7.9-del-response.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/7.9-del-response.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/7.9-del-response.html Fri Jul 27 16:53:46 2018
@@ -105,24 +105,23 @@
     <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/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/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/latest2/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/latest2/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/8-ldap-rfcs.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/8-ldap-rfcs.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/8-ldap-rfcs.html Fri Jul 27 16:53:46 2018
@@ -105,24 +105,23 @@
     <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/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/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/latest2/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/latest2/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/vision.html
==============================================================================
--- websites/staging/directory/trunk/content/api/vision.html (original)
+++ websites/staging/directory/trunk/content/api/vision.html Fri Jul 27 16:53:46 2018
@@ -105,24 +105,23 @@
     <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/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/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/latest2/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/latest2/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>