[TRAFODION-1905] PR 419 New SPJ Guide + various docs fixes

Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion-site/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-trafodion-site/commit/2fb69022
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-trafodion-site/tree/2fb69022
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-trafodion-site/diff/2fb69022

Branch: refs/heads/asf-site
Commit: 2fb69022b42b0261ee206ba9b7b3ddbd65fc8ef4
Parents: b0613b9
Author: Dave Birdsall <[email protected]>
Authored: Fri Apr 8 20:13:55 2016 +0000
Committer: Dave Birdsall <[email protected]>
Committed: Fri Apr 8 20:13:55 2016 +0000

----------------------------------------------------------------------
 architecture-overview.html       |  34 ++++-------
 contributing-redirect.html       |  34 ++++-------
 documentation.html               | 106 +++++++++++++++++-----------------
 download.html                    |  34 ++++-------
 enable-secure-trafodion.html     |  34 ++++-------
 faq.html                         |  34 ++++-------
 images/logo-carousel/slide-1.png | Bin 0 -> 58887 bytes
 images/logo-carousel/slide-2.png | Bin 0 -> 57783 bytes
 index.html                       |  74 ++++++++++++++----------
 integration.html                 |  34 ++++-------
 issue-tracking.html              |  34 ++++-------
 ldapcheck.html                   |  34 ++++-------
 ldapconfigcheck.html             |  34 ++++-------
 license.html                     |  34 ++++-------
 logo.html                        |  34 ++++-------
 mail-lists.html                  |  34 ++++-------
 management.html                  |  34 ++++-------
 new-features.html                |  34 ++++-------
 passwordless-ssh.html            |  34 ++++-------
 performance.html                 |  34 ++++-------
 presentations.html               |  34 ++++-------
 project-info.html                |  34 ++++-------
 project-summary.html             |  34 ++++-------
 quickstart.html                  |  34 ++++-------
 release-notes-0-8-0.html         |  34 ++++-------
 release-notes-0-9-0.html         |  34 ++++-------
 release-notes-1-0-0.html         |  34 ++++-------
 release-notes-1-0-1.html         |  34 ++++-------
 release-notes-1-1-0.html         |  34 ++++-------
 release-notes-1-3-0.html         |  34 ++++-------
 release-notes.html               |  34 ++++-------
 roadmap.html                     |  34 ++++-------
 source-repository.html           |  34 ++++-------
 team-list.html                   |  34 ++++-------
 team-redirect.html               |  34 ++++-------
 traf_authentication_config.html  |  34 ++++-------
 36 files changed, 450 insertions(+), 818 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion-site/blob/2fb69022/architecture-overview.html
----------------------------------------------------------------------
diff --git a/architecture-overview.html b/architecture-overview.html
index 076a2ab..25c1878 100644
--- a/architecture-overview.html
+++ b/architecture-overview.html
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2016-03-15
+ Generated by Apache Maven Doxia at 2016-04-08
  Rendered using Reflow Maven Skin 1.1.1 
(http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -92,26 +92,23 @@
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/security-ansi-schemas"; 
title="ANSI Schema Support" class="externalLink">ANSI Schema Support</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/ustat-automation"; 
title="Automated Update Statistics" class="externalLink">Automated Update 
Statistics</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/bulkunload"; title="Bulk 
Unload" class="externalLink">Bulk Unload</a></li>
-                                                                       <li ><a 
href="https://wiki.trafodion.org/wiki/index.php/Trafodion_Manageability#Logging_Events";
 title="Event Handling" class="externalLink">Event Handling</a></li>
+                                                                       <li ><a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Trafodion+Manageability#TrafodionManageability-LoggingEvents";
 title="Event Handling" class="externalLink">Event Handling</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/hybrid-query-cache"; 
title="Hybrid Query Cache" class="externalLink">Hybrid Query Cache</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/identity-column"; 
title="Identity Column" class="externalLink">Identity Column</a></li>
-                                                                       <li ><a 
href="https://wiki.trafodion.org/wiki/index.php/Creating_Statistics_During_Bulk_Load";
 title="Immediate Update Statistics" class="externalLink">Immediate Update 
Statistics</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/lob-support"; 
title="Large Object (LOB)" class="externalLink">Large Object (LOB)</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/ddl-query-invalidation"; 
title="Metadata Query Invalidation" class="externalLink">Metadata Query 
Invalidation</a></li>
                                                                        <li ><a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Cmp-divisioning"; 
title="Multi-Temperature Data" class="externalLink">Multi-Temperature 
Data</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/access-external-hbase-tables";
 title="Native HBase Tables" class="externalLink">Native HBase Tables</a></li>
-                                                                       <li ><a 
href="docs/odb_user/index.html" title="ODB">ODB</a></li>
+                                                                       <li ><a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Tutorial:+The+object-oriented+UDF+interface";
 title="Object-Oriented UDF Tutorial" class="externalLink">Object-Oriented UDF 
Tutorial</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/sql-query-cancel"; 
title="Query Cancel" class="externalLink">Query Cancel</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/security-privilege-updates";
 title="Privilege Checking" class="externalLink">Privilege Checking</a></li>
-                                                                       <li ><a 
href="https://wiki.trafodion.org/wiki/index.php/Trafodion_Manageability"; 
title="Repository" class="externalLink">Repository</a></li>
+                                                                       <li ><a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Trafodion+Manageability";
 title="Repository" class="externalLink">Repository</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/enable-get-statistics-thru-rms";
 title="Runtime Management System" class="externalLink">Runtime Management 
System</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/sequence-numbers"; 
title="Sequence Numbers" class="externalLink">Sequence Numbers</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/skew-buster"; title="Skew 
Buster" class="externalLink">Skew Buster</a></li>
-                                                                       <li ><a 
href="https://wiki.trafodion.org/wiki/index.php/Tutorial:_The_object-oriented_UDF_interface";
 title="Table-Oriented UDF" class="externalLink">Table-Oriented UDF</a></li>
-                                                                       <li ><a 
href="https://wiki.trafodion.org/wiki/index.php/Data_Loading#Trickle_Loading_Data_Into_Trafodion_Tables";
 title="Trickle Load" class="externalLink">Trickle Load</a></li>
                                                                        <li ><a 
href="http:divider" title=""></a></li>
-                                                                       <li ><a 
href="https://wiki.trafodion.org/wiki/index.php/Backup_and_Restore"; 
title="Backup/Restore Utility" class="externalLink">Backup/Restore 
Utility</a></li>
-                                                                       <li ><a 
href="https://wiki.trafodion.org/wiki/index.php/Metadata_Cleanup"; 
title="Metadata Cleanup Utility" class="externalLink">Metadata Cleanup 
Utility</a></li>
+                                                                       <li ><a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Backup+and+Restore"; 
title="Backup/Restore Utility" class="externalLink">Backup/Restore 
Utility</a></li>
+                                                                       <li ><a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Metadata+Cleanup"; 
title="Metadata Cleanup Utility" class="externalLink">Metadata Cleanup 
Utility</a></li>
                                                                </ul>
                                                        </li>
                                                        <li class="dropdown">
@@ -438,7 +435,7 @@
                                                        <a 
href="https://blueprints.launchpad.net/trafodion/+spec/bulkunload"; title="Bulk 
Unload" class="externalLink">Bulk Unload</a>
                                                </li>
                                                <li >
-                                                       <a 
href="https://wiki.trafodion.org/wiki/index.php/Trafodion_Manageability#Logging_Events";
 title="Event Handling" class="externalLink">Event Handling</a>
+                                                       <a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Trafodion+Manageability#TrafodionManageability-LoggingEvents";
 title="Event Handling" class="externalLink">Event Handling</a>
                                                </li>
                                                <li >
                                                        <a 
href="https://blueprints.launchpad.net/trafodion/+spec/hybrid-query-cache"; 
title="Hybrid Query Cache" class="externalLink">Hybrid Query Cache</a>
@@ -447,9 +444,6 @@
                                                        <a 
href="https://blueprints.launchpad.net/trafodion/+spec/identity-column"; 
title="Identity Column" class="externalLink">Identity Column</a>
                                                </li>
                                                <li >
-                                                       <a 
href="https://wiki.trafodion.org/wiki/index.php/Creating_Statistics_During_Bulk_Load";
 title="Immediate Update Statistics" class="externalLink">Immediate Update 
Statistics</a>
-                                               </li>
-                                               <li >
                                                        <a 
href="https://blueprints.launchpad.net/trafodion/+spec/lob-support"; 
title="Large Object (LOB)" class="externalLink">Large Object (LOB)</a>
                                                </li>
                                                <li >
@@ -462,7 +456,7 @@
                                                        <a 
href="https://blueprints.launchpad.net/trafodion/+spec/access-external-hbase-tables";
 title="Native HBase Tables" class="externalLink">Native HBase Tables</a>
                                                </li>
                                                <li >
-                                                       <a 
href="docs/odb_user/index.html" title="ODB">ODB</a>
+                                                       <a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Tutorial:+The+object-oriented+UDF+interface";
 title="Object-Oriented UDF Tutorial" class="externalLink">Object-Oriented UDF 
Tutorial</a>
                                                </li>
                                                <li >
                                                        <a 
href="https://blueprints.launchpad.net/trafodion/+spec/sql-query-cancel"; 
title="Query Cancel" class="externalLink">Query Cancel</a>
@@ -471,7 +465,7 @@
                                                        <a 
href="https://blueprints.launchpad.net/trafodion/+spec/security-privilege-updates";
 title="Privilege Checking" class="externalLink">Privilege Checking</a>
                                                </li>
                                                <li >
-                                                       <a 
href="https://wiki.trafodion.org/wiki/index.php/Trafodion_Manageability"; 
title="Repository" class="externalLink">Repository</a>
+                                                       <a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Trafodion+Manageability";
 title="Repository" class="externalLink">Repository</a>
                                                </li>
                                                <li >
                                                        <a 
href="https://blueprints.launchpad.net/trafodion/+spec/enable-get-statistics-thru-rms";
 title="Runtime Management System" class="externalLink">Runtime Management 
System</a>
@@ -483,19 +477,13 @@
                                                        <a 
href="https://blueprints.launchpad.net/trafodion/+spec/skew-buster"; title="Skew 
Buster" class="externalLink">Skew Buster</a>
                                                </li>
                                                <li >
-                                                       <a 
href="https://wiki.trafodion.org/wiki/index.php/Tutorial:_The_object-oriented_UDF_interface";
 title="Table-Oriented UDF" class="externalLink">Table-Oriented UDF</a>
-                                               </li>
-                                               <li >
-                                                       <a 
href="https://wiki.trafodion.org/wiki/index.php/Data_Loading#Trickle_Loading_Data_Into_Trafodion_Tables";
 title="Trickle Load" class="externalLink">Trickle Load</a>
-                                               </li>
-                                               <li >
                                                        <a href="http:divider" 
title=""></a>
                                                </li>
                                                <li >
-                                                       <a 
href="https://wiki.trafodion.org/wiki/index.php/Backup_and_Restore"; 
title="Backup/Restore Utility" class="externalLink">Backup/Restore Utility</a>
+                                                       <a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Backup+and+Restore"; 
title="Backup/Restore Utility" class="externalLink">Backup/Restore Utility</a>
                                                </li>
                                                <li >
-                                                       <a 
href="https://wiki.trafodion.org/wiki/index.php/Metadata_Cleanup"; 
title="Metadata Cleanup Utility" class="externalLink">Metadata Cleanup 
Utility</a>
+                                                       <a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Metadata+Cleanup"; 
title="Metadata Cleanup Utility" class="externalLink">Metadata Cleanup 
Utility</a>
                                                </li>
                                        </ul>
                                </div>

http://git-wip-us.apache.org/repos/asf/incubator-trafodion-site/blob/2fb69022/contributing-redirect.html
----------------------------------------------------------------------
diff --git a/contributing-redirect.html b/contributing-redirect.html
index 02c2051..49202b5 100644
--- a/contributing-redirect.html
+++ b/contributing-redirect.html
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2016-03-15
+ Generated by Apache Maven Doxia at 2016-04-08
  Rendered using Reflow Maven Skin 1.1.1 
(http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -92,26 +92,23 @@
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/security-ansi-schemas"; 
title="ANSI Schema Support" class="externalLink">ANSI Schema Support</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/ustat-automation"; 
title="Automated Update Statistics" class="externalLink">Automated Update 
Statistics</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/bulkunload"; title="Bulk 
Unload" class="externalLink">Bulk Unload</a></li>
-                                                                       <li ><a 
href="https://wiki.trafodion.org/wiki/index.php/Trafodion_Manageability#Logging_Events";
 title="Event Handling" class="externalLink">Event Handling</a></li>
+                                                                       <li ><a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Trafodion+Manageability#TrafodionManageability-LoggingEvents";
 title="Event Handling" class="externalLink">Event Handling</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/hybrid-query-cache"; 
title="Hybrid Query Cache" class="externalLink">Hybrid Query Cache</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/identity-column"; 
title="Identity Column" class="externalLink">Identity Column</a></li>
-                                                                       <li ><a 
href="https://wiki.trafodion.org/wiki/index.php/Creating_Statistics_During_Bulk_Load";
 title="Immediate Update Statistics" class="externalLink">Immediate Update 
Statistics</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/lob-support"; 
title="Large Object (LOB)" class="externalLink">Large Object (LOB)</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/ddl-query-invalidation"; 
title="Metadata Query Invalidation" class="externalLink">Metadata Query 
Invalidation</a></li>
                                                                        <li ><a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Cmp-divisioning"; 
title="Multi-Temperature Data" class="externalLink">Multi-Temperature 
Data</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/access-external-hbase-tables";
 title="Native HBase Tables" class="externalLink">Native HBase Tables</a></li>
-                                                                       <li ><a 
href="docs/odb_user/index.html" title="ODB">ODB</a></li>
+                                                                       <li ><a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Tutorial:+The+object-oriented+UDF+interface";
 title="Object-Oriented UDF Tutorial" class="externalLink">Object-Oriented UDF 
Tutorial</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/sql-query-cancel"; 
title="Query Cancel" class="externalLink">Query Cancel</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/security-privilege-updates";
 title="Privilege Checking" class="externalLink">Privilege Checking</a></li>
-                                                                       <li ><a 
href="https://wiki.trafodion.org/wiki/index.php/Trafodion_Manageability"; 
title="Repository" class="externalLink">Repository</a></li>
+                                                                       <li ><a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Trafodion+Manageability";
 title="Repository" class="externalLink">Repository</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/enable-get-statistics-thru-rms";
 title="Runtime Management System" class="externalLink">Runtime Management 
System</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/sequence-numbers"; 
title="Sequence Numbers" class="externalLink">Sequence Numbers</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/skew-buster"; title="Skew 
Buster" class="externalLink">Skew Buster</a></li>
-                                                                       <li ><a 
href="https://wiki.trafodion.org/wiki/index.php/Tutorial:_The_object-oriented_UDF_interface";
 title="Table-Oriented UDF" class="externalLink">Table-Oriented UDF</a></li>
-                                                                       <li ><a 
href="https://wiki.trafodion.org/wiki/index.php/Data_Loading#Trickle_Loading_Data_Into_Trafodion_Tables";
 title="Trickle Load" class="externalLink">Trickle Load</a></li>
                                                                        <li ><a 
href="http:divider" title=""></a></li>
-                                                                       <li ><a 
href="https://wiki.trafodion.org/wiki/index.php/Backup_and_Restore"; 
title="Backup/Restore Utility" class="externalLink">Backup/Restore 
Utility</a></li>
-                                                                       <li ><a 
href="https://wiki.trafodion.org/wiki/index.php/Metadata_Cleanup"; 
title="Metadata Cleanup Utility" class="externalLink">Metadata Cleanup 
Utility</a></li>
+                                                                       <li ><a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Backup+and+Restore"; 
title="Backup/Restore Utility" class="externalLink">Backup/Restore 
Utility</a></li>
+                                                                       <li ><a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Metadata+Cleanup"; 
title="Metadata Cleanup Utility" class="externalLink">Metadata Cleanup 
Utility</a></li>
                                                                </ul>
                                                        </li>
                                                        <li class="dropdown">
@@ -267,7 +264,7 @@
                                                        <a 
href="https://blueprints.launchpad.net/trafodion/+spec/bulkunload"; title="Bulk 
Unload" class="externalLink">Bulk Unload</a>
                                                </li>
                                                <li >
-                                                       <a 
href="https://wiki.trafodion.org/wiki/index.php/Trafodion_Manageability#Logging_Events";
 title="Event Handling" class="externalLink">Event Handling</a>
+                                                       <a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Trafodion+Manageability#TrafodionManageability-LoggingEvents";
 title="Event Handling" class="externalLink">Event Handling</a>
                                                </li>
                                                <li >
                                                        <a 
href="https://blueprints.launchpad.net/trafodion/+spec/hybrid-query-cache"; 
title="Hybrid Query Cache" class="externalLink">Hybrid Query Cache</a>
@@ -276,9 +273,6 @@
                                                        <a 
href="https://blueprints.launchpad.net/trafodion/+spec/identity-column"; 
title="Identity Column" class="externalLink">Identity Column</a>
                                                </li>
                                                <li >
-                                                       <a 
href="https://wiki.trafodion.org/wiki/index.php/Creating_Statistics_During_Bulk_Load";
 title="Immediate Update Statistics" class="externalLink">Immediate Update 
Statistics</a>
-                                               </li>
-                                               <li >
                                                        <a 
href="https://blueprints.launchpad.net/trafodion/+spec/lob-support"; 
title="Large Object (LOB)" class="externalLink">Large Object (LOB)</a>
                                                </li>
                                                <li >
@@ -291,7 +285,7 @@
                                                        <a 
href="https://blueprints.launchpad.net/trafodion/+spec/access-external-hbase-tables";
 title="Native HBase Tables" class="externalLink">Native HBase Tables</a>
                                                </li>
                                                <li >
-                                                       <a 
href="docs/odb_user/index.html" title="ODB">ODB</a>
+                                                       <a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Tutorial:+The+object-oriented+UDF+interface";
 title="Object-Oriented UDF Tutorial" class="externalLink">Object-Oriented UDF 
Tutorial</a>
                                                </li>
                                                <li >
                                                        <a 
href="https://blueprints.launchpad.net/trafodion/+spec/sql-query-cancel"; 
title="Query Cancel" class="externalLink">Query Cancel</a>
@@ -300,7 +294,7 @@
                                                        <a 
href="https://blueprints.launchpad.net/trafodion/+spec/security-privilege-updates";
 title="Privilege Checking" class="externalLink">Privilege Checking</a>
                                                </li>
                                                <li >
-                                                       <a 
href="https://wiki.trafodion.org/wiki/index.php/Trafodion_Manageability"; 
title="Repository" class="externalLink">Repository</a>
+                                                       <a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Trafodion+Manageability";
 title="Repository" class="externalLink">Repository</a>
                                                </li>
                                                <li >
                                                        <a 
href="https://blueprints.launchpad.net/trafodion/+spec/enable-get-statistics-thru-rms";
 title="Runtime Management System" class="externalLink">Runtime Management 
System</a>
@@ -312,19 +306,13 @@
                                                        <a 
href="https://blueprints.launchpad.net/trafodion/+spec/skew-buster"; title="Skew 
Buster" class="externalLink">Skew Buster</a>
                                                </li>
                                                <li >
-                                                       <a 
href="https://wiki.trafodion.org/wiki/index.php/Tutorial:_The_object-oriented_UDF_interface";
 title="Table-Oriented UDF" class="externalLink">Table-Oriented UDF</a>
-                                               </li>
-                                               <li >
-                                                       <a 
href="https://wiki.trafodion.org/wiki/index.php/Data_Loading#Trickle_Loading_Data_Into_Trafodion_Tables";
 title="Trickle Load" class="externalLink">Trickle Load</a>
-                                               </li>
-                                               <li >
                                                        <a href="http:divider" 
title=""></a>
                                                </li>
                                                <li >
-                                                       <a 
href="https://wiki.trafodion.org/wiki/index.php/Backup_and_Restore"; 
title="Backup/Restore Utility" class="externalLink">Backup/Restore Utility</a>
+                                                       <a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Backup+and+Restore"; 
title="Backup/Restore Utility" class="externalLink">Backup/Restore Utility</a>
                                                </li>
                                                <li >
-                                                       <a 
href="https://wiki.trafodion.org/wiki/index.php/Metadata_Cleanup"; 
title="Metadata Cleanup Utility" class="externalLink">Metadata Cleanup 
Utility</a>
+                                                       <a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Metadata+Cleanup"; 
title="Metadata Cleanup Utility" class="externalLink">Metadata Cleanup 
Utility</a>
                                                </li>
                                        </ul>
                                </div>

http://git-wip-us.apache.org/repos/asf/incubator-trafodion-site/blob/2fb69022/documentation.html
----------------------------------------------------------------------
diff --git a/documentation.html b/documentation.html
index abfccf3..8dfdd6b 100644
--- a/documentation.html
+++ b/documentation.html
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2016-03-22
+ Generated by Apache Maven Doxia at 2016-04-08
  Rendered using Reflow Maven Skin 1.1.1 
(http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -92,26 +92,23 @@
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/security-ansi-schemas"; 
title="ANSI Schema Support" class="externalLink">ANSI Schema Support</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/ustat-automation"; 
title="Automated Update Statistics" class="externalLink">Automated Update 
Statistics</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/bulkunload"; title="Bulk 
Unload" class="externalLink">Bulk Unload</a></li>
-                                                                       <li ><a 
href="https://wiki.trafodion.org/wiki/index.php/Trafodion_Manageability#Logging_Events";
 title="Event Handling" class="externalLink">Event Handling</a></li>
+                                                                       <li ><a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Trafodion+Manageability#TrafodionManageability-LoggingEvents";
 title="Event Handling" class="externalLink">Event Handling</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/hybrid-query-cache"; 
title="Hybrid Query Cache" class="externalLink">Hybrid Query Cache</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/identity-column"; 
title="Identity Column" class="externalLink">Identity Column</a></li>
-                                                                       <li ><a 
href="https://wiki.trafodion.org/wiki/index.php/Creating_Statistics_During_Bulk_Load";
 title="Immediate Update Statistics" class="externalLink">Immediate Update 
Statistics</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/lob-support"; 
title="Large Object (LOB)" class="externalLink">Large Object (LOB)</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/ddl-query-invalidation"; 
title="Metadata Query Invalidation" class="externalLink">Metadata Query 
Invalidation</a></li>
                                                                        <li ><a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Cmp-divisioning"; 
title="Multi-Temperature Data" class="externalLink">Multi-Temperature 
Data</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/access-external-hbase-tables";
 title="Native HBase Tables" class="externalLink">Native HBase Tables</a></li>
-                                                                       <li ><a 
href="docs/odb_user/index.html" title="ODB">ODB</a></li>
+                                                                       <li ><a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Tutorial:+The+object-oriented+UDF+interface";
 title="Object-Oriented UDF Tutorial" class="externalLink">Object-Oriented UDF 
Tutorial</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/sql-query-cancel"; 
title="Query Cancel" class="externalLink">Query Cancel</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/security-privilege-updates";
 title="Privilege Checking" class="externalLink">Privilege Checking</a></li>
-                                                                       <li ><a 
href="https://wiki.trafodion.org/wiki/index.php/Trafodion_Manageability"; 
title="Repository" class="externalLink">Repository</a></li>
+                                                                       <li ><a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Trafodion+Manageability";
 title="Repository" class="externalLink">Repository</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/enable-get-statistics-thru-rms";
 title="Runtime Management System" class="externalLink">Runtime Management 
System</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/sequence-numbers"; 
title="Sequence Numbers" class="externalLink">Sequence Numbers</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/skew-buster"; title="Skew 
Buster" class="externalLink">Skew Buster</a></li>
-                                                                       <li ><a 
href="https://wiki.trafodion.org/wiki/index.php/Tutorial:_The_object-oriented_UDF_interface";
 title="Table-Oriented UDF" class="externalLink">Table-Oriented UDF</a></li>
-                                                                       <li ><a 
href="https://wiki.trafodion.org/wiki/index.php/Data_Loading#Trickle_Loading_Data_Into_Trafodion_Tables";
 title="Trickle Load" class="externalLink">Trickle Load</a></li>
                                                                        <li ><a 
href="http:divider" title=""></a></li>
-                                                                       <li ><a 
href="https://wiki.trafodion.org/wiki/index.php/Backup_and_Restore"; 
title="Backup/Restore Utility" class="externalLink">Backup/Restore 
Utility</a></li>
-                                                                       <li ><a 
href="https://wiki.trafodion.org/wiki/index.php/Metadata_Cleanup"; 
title="Metadata Cleanup Utility" class="externalLink">Metadata Cleanup 
Utility</a></li>
+                                                                       <li ><a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Backup+and+Restore"; 
title="Backup/Restore Utility" class="externalLink">Backup/Restore 
Utility</a></li>
+                                                                       <li ><a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Metadata+Cleanup"; 
title="Metadata Cleanup Utility" class="externalLink">Metadata Cleanup 
Utility</a></li>
                                                                </ul>
                                                        </li>
                                                        <li class="dropdown">
@@ -205,7 +202,7 @@
   </tr> 
   <tr class="a"> 
    <td>Trafodion Client Installation Guide </td> 
-   <td><a href="docs/client_install/index.html">Web Book</a>,<a 
href="docs/client_install/Trafodion_Client_Installation_Guide.pdf">PDF</a></td> 
+   <td><a href="docs/client_install/index.html">Web Book</a>, <a 
href="docs/client_install/Trafodion_Client_Installation_Guide.pdf">PDF</a></td> 
   </tr> 
   <tr class="b"> 
    <td>Trafodion Code Examples </td> 
@@ -213,23 +210,23 @@
   </tr> 
   <tr class="a"> 
    <td>Trafodion Command Interface Guide </td> 
-   <td><a href="docs/command_interface/index.html">Web Book</a>,<a 
href="docs/command_interface/Trafodion_Command_Interface_Guide.pdf">PDF</a></td>
 
+   <td><a href="docs/command_interface/index.html">Web Book</a>, <a 
href="docs/command_interface/Trafodion_Command_Interface_Guide.pdf">PDF</a></td>
 
   </tr> 
   <tr class="b"> 
    <td>Trafodion Control Query Default (CQD) Reference Guide </td> 
-   <td><a href="docs/cqd_reference/index.html">Web Book</a>,<a 
href="docs/cqd_interface/Trafodion_CQD_Reference_Guide.pdf">PDF</a></td> 
+   <td><a href="docs/cqd_reference/index.html">Web Book</a>, <a 
href="docs/cqd_interface/Trafodion_CQD_Reference_Guide.pdf">PDF</a></td> 
   </tr> 
   <tr class="a"> 
    <td>Trafodion Database Connectivity Services Guide </td> 
-   <td><a href="docs/dcs_reference/index.html">Web Book</a>,<a 
href="docs/dcs_reference/apidocs/index.html">API</a></td> 
+   <td><a href="docs/dcs_reference/index.html">Web Book</a>, <a 
href="docs/dcs_reference/apidocs/index.html">API</a></td> 
   </tr> 
   <tr class="b"> 
    <td>Trafodion Load and Transform Guide </td> 
-   <td><a href="docs/load_transform/index.html">Web Book</a>,<a 
href="docs/load_transform/Trafodion_Load_Transform_Guide.pdf">PDF</a></td> 
+   <td><a href="docs/load_transform/index.html">Web Book</a>, <a 
href="docs/load_transform/Trafodion_Load_Transform_Guide.pdf">PDF</a></td> 
   </tr> 
   <tr class="a"> 
    <td>Trafodion Messages Guide </td> 
-   <td><a href="docs/messages_guide/index.html">Web Book</a>,<a 
href="docs/messages_guide/Trafodion_Messages_Guide.pdf">PDF</a></td> 
+   <td><a href="docs/messages_guide/index.html">Web Book</a>, <a 
href="docs/messages_guide/Trafodion_Messages_Guide.pdf">PDF</a></td> 
   </tr> 
   <tr class="b"> 
    <td>Trafodion Manageability </td> 
@@ -237,21 +234,25 @@
   </tr> 
   <tr class="a"> 
    <td>Trafodion odb User Guide </td> 
-   <td><a href="docs/odb/index.html">Web Book</a>,<a 
href="docs/odb/Trafodion_odb_User_Guide.pdf">PDF</a></td> 
+   <td><a href="docs/odb/index.html">Web Book</a>, <a 
href="docs/odb/Trafodion_odb_User_Guide.pdf">PDF</a></td> 
   </tr> 
   <tr class="b"> 
    <td>Trafodion Provisioning Guide </td> 
-   <td><a href="docs/provisioning_guide/index.html">Web Book</a>,<a 
href="docs/provisioning_guide/Trafodion_Provisioning_Guide.pdf">PDF</a></td> 
+   <td><a href="docs/provisioning_guide/index.html">Web Book</a>, <a 
href="docs/provisioning_guide/Trafodion_Provisioning_Guide.pdf">PDF</a></td> 
   </tr> 
   <tr class="a"> 
    <td>Trafodion REST Server Reference Guide </td> 
-   <td><a href="docs/rest_reference/index.html">Web Book</a>,<a 
href="docs/rest_reference/apidocs/index.html">API</a></td> 
+   <td><a href="docs/rest_reference/index.html">Web Book</a>, <a 
href="docs/rest_reference/apidocs/index.html">API</a></td> 
   </tr> 
   <tr class="b"> 
    <td>Trafodion SQL Reference Manual </td> 
-   <td><a href="docs/sql_reference/index.html">Web Book</a>,<a 
href="docs/sql_reference/Trafodion_SQL_Reference_Manual.pdf">PDF</a></td> 
+   <td><a href="docs/sql_reference/index.html">Web Book</a>, <a 
href="docs/sql_reference/Trafodion_SQL_Reference_Manual.pdf">PDF</a></td> 
   </tr> 
   <tr class="a"> 
+   <td>Trafodion Stored Procedures in Java (SPJ) Guide </td> 
+   <td><a href="docs/spj_guide/index.html">Web Book</a>, <a 
href="docs/spj_guide/Trafodion_SPJ_Guide.pdf">PDF</a></td> 
+  </tr> 
+  <tr class="b"> 
    <td>UDF Tutorial </td> 
    <td><a class="externalLink" 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Tutorial%3A+The+object-oriented+UDF+interface";>wiki</a></td>
 
   </tr> 
@@ -268,43 +269,47 @@
  <tbody> 
   <tr class="b"> 
    <td>Trafodion Client Installation Guide </td> 
-   <td><a href="docs/2.0.0/client_install/index.html">Web Book</a>,<a 
href="docs/2.0.0/client_install/Trafodion_Client_Installation_Guide.pdf">PDF</a></td>
 
+   <td><a href="docs/2.0.0/client_install/index.html">Web Book</a>, <a 
href="docs/2.0.0/client_install/Trafodion_Client_Installation_Guide.pdf">PDF</a></td>
 
   </tr> 
   <tr class="a"> 
    <td>Trafodion Command Interface Guide </td> 
-   <td><a href="docs/2.0.0/command_interface/index.html">Web Book</a>,<a 
href="docs/2.0.0/command_interface/Trafodion_Command_Interface_Guide.pdf">PDF</a></td>
 
+   <td><a href="docs/2.0.0/command_interface/index.html">Web Book</a>, <a 
href="docs/2.0.0/command_interface/Trafodion_Command_Interface_Guide.pdf">PDF</a></td>
 
   </tr> 
   <tr class="b"> 
    <td>Trafodion Control Query Default (CQD) Reference Guide </td> 
-   <td><a href="docs/2.0.0/cqd_reference/index.html">Web Book</a>,<a 
href="docs/2.0.0/cqd_interface/Trafodion_CQD_Reference_Guide.pdf">PDF</a></td> 
+   <td><a href="docs/2.0.0/cqd_reference/index.html">Web Book</a>, <a 
href="docs/2.0.0/cqd_interface/Trafodion_CQD_Reference_Guide.pdf">PDF</a></td> 
   </tr> 
   <tr class="a"> 
    <td>Trafodion Database Connectivity Services Guide </td> 
-   <td><a href="docs/2.0.0/dcs_reference/index.html">Web Book</a>,<a 
href="docs/2.0.0/dcs_reference/apidocs/index.html">API</a></td> 
+   <td><a href="docs/2.0.0/dcs_reference/index.html">Web Book</a>, <a 
href="docs/2.0.0/dcs_reference/apidocs/index.html">API</a></td> 
   </tr> 
   <tr class="b"> 
    <td>Trafodion Load and Transform Guide </td> 
-   <td><a href="docs/2.0.0/load_transform/index.html">Web Book</a>,<a 
href="docs/2.0.0/load_transform/Trafodion_Load_Transform_Guide.pdf">PDF</a></td>
 
+   <td><a href="docs/2.0.0/load_transform/index.html">Web Book</a>, <a 
href="docs/2.0.0/load_transform/Trafodion_Load_Transform_Guide.pdf">PDF</a></td>
 
   </tr> 
   <tr class="a"> 
    <td>Trafodion Messages Guide </td> 
-   <td><a href="docs/2.0.0/messages_guide/index.html">Web Book</a>,<a 
href="docs/2.0.0/messages_guide/Trafodion_Messages_Guide.pdf">PDF</a></td> 
+   <td><a href="docs/2.0.0/messages_guide/index.html">Web Book</a>, <a 
href="docs/2.0.0/messages_guide/Trafodion_Messages_Guide.pdf">PDF</a></td> 
   </tr> 
   <tr class="b"> 
    <td>Trafodion odb User Guide </td> 
-   <td><a href="docs/2.0.0/odb/index.html">Web Book</a>,<a 
href="docs/2.0.0/odb/Trafodion_odb_User_Guide.pdf">PDF</a></td> 
+   <td><a href="docs/2.0.0/odb/index.html">Web Book</a>, <a 
href="docs/2.0.0/odb/Trafodion_odb_User_Guide.pdf">PDF</a></td> 
   </tr> 
   <tr class="a"> 
    <td>Trafodion Provisioning Guide </td> 
-   <td><a href="docs/2.0.0/provisioning_guide/index.html">Web Book</a>,<a 
href="docs/2.0.0/provisioning_guide/Trafodion_Provisioning_Guide.pdf">PDF</a></td>
 
+   <td><a href="docs/2.0.0/provisioning_guide/index.html">Web Book</a>, <a 
href="docs/2.0.0/provisioning_guide/Trafodion_Provisioning_Guide.pdf">PDF</a></td>
 
   </tr> 
   <tr class="b"> 
    <td>Trafodion REST Server Reference Guide </td> 
-   <td><a href="docs/2.0.0/rest_reference/index.html">Web Book</a>,<a 
href="docs/2.0.0/rest_reference/apidocs/index.html">API</a></td> 
+   <td><a href="docs/2.0.0/rest_reference/index.html">Web Book</a>, <a 
href="docs/2.0.0/rest_reference/apidocs/index.html">API</a></td> 
   </tr> 
   <tr class="a"> 
    <td>Trafodion SQL Reference Manual </td> 
-   <td><a href="docs/2.0.0/sql_reference/index.html">Web Book</a>,<a 
href="docs/2.0.0/sql_reference/Trafodion_SQL_Reference_Manual.pdf">PDF</a></td> 
+   <td><a href="docs/2.0.0/sql_reference/index.html">Web Book</a>, <a 
href="docs/2.0.0/sql_reference/Trafodion_SQL_Reference_Manual.pdf">PDF</a></td> 
+  </tr> 
+  <tr class="b"> 
+   <td>Trafodion Stored Procedures in Java (SPJ) Guide </td> 
+   <td><a href="docs/2.0.0/spj_guide/index.html">Web Book</a>, <a 
href="docs/2.0.0/spj_guide/Trafodion_SPJ_Guide.pdf">PDF</a></td> 
   </tr> 
  </tbody> 
 </table> 
@@ -319,43 +324,47 @@
  <tbody> 
   <tr class="b"> 
    <td>Trafodion Client Installation Guide </td> 
-   <td><a href="docs/1.3.0/client_install/index.html">Web Book</a>,<a 
href="docs/1.3.0/client_install/Trafodion_Client_Installation_Guide.pdf">PDF</a></td>
 
+   <td><a href="docs/1.3.0/client_install/index.html">Web Book</a>, <a 
href="docs/1.3.0/client_install/Trafodion_Client_Installation_Guide.pdf">PDF</a></td>
 
   </tr> 
   <tr class="a"> 
    <td>Trafodion Command Interface Guide </td> 
-   <td><a href="docs/1.3.0/command_interface/index.html">Web Book</a>,<a 
href="docs/1.3.0/command_interface/Trafodion_Command_Interface_Guide.pdf">PDF</a></td>
 
+   <td><a href="docs/1.3.0/command_interface/index.html">Web Book</a>, <a 
href="docs/1.3.0/command_interface/Trafodion_Command_Interface_Guide.pdf">PDF</a></td>
 
   </tr> 
   <tr class="b"> 
    <td>Trafodion Control Query Default (CQD) Reference Guide </td> 
-   <td><a href="docs/1.3.0/cqd_reference/index.html">Web Book</a>,<a 
href="docs/1.3.0/cqd_interface/Trafodion_CQD_Reference_Guide.pdf">PDF</a></td> 
+   <td><a href="docs/1.3.0/cqd_reference/index.html">Web Book</a>, <a 
href="docs/1.3.0/cqd_interface/Trafodion_CQD_Reference_Guide.pdf">PDF</a></td> 
   </tr> 
   <tr class="a"> 
    <td>Trafodion Database Connectivity Services Guide </td> 
-   <td><a href="docs/1.3.0/dcs_reference/index.html">Web Book</a>,<a 
href="docs/1.3.0/dcs_reference/apidocs/index.html">API</a></td> 
+   <td><a href="docs/1.3.0/dcs_reference/index.html">Web Book</a>, <a 
href="docs/1.3.0/dcs_reference/apidocs/index.html">API</a></td> 
   </tr> 
   <tr class="b"> 
    <td>Trafodion Load and Transform Guide </td> 
-   <td><a href="docs/1.3.0/load_transform/index.html">Web Book</a>,<a 
href="docs/1.3.0/load_transform/Trafodion_Load_Transform_Guide.pdf">PDF</a></td>
 
+   <td><a href="docs/1.3.0/load_transform/index.html">Web Book</a>, <a 
href="docs/1.3.0/load_transform/Trafodion_Load_Transform_Guide.pdf">PDF</a></td>
 
   </tr> 
   <tr class="a"> 
    <td>Trafodion Messages Guide </td> 
-   <td><a href="docs/1.3.0/messages_guide/index.html">Web Book</a>,<a 
href="docs/1.3.0/messages_guide/Trafodion_Messages_Guide.pdf">PDF</a></td> 
+   <td><a href="docs/1.3.0/messages_guide/index.html">Web Book</a>, <a 
href="docs/1.3.0/messages_guide/Trafodion_Messages_Guide.pdf">PDF</a></td> 
   </tr> 
   <tr class="b"> 
    <td>Trafodion odb User Guide </td> 
-   <td><a href="docs/1.3.0/odb/index.html">Web Book</a>,<a 
href="docs/1.3.0/odb/Trafodion_odb_User_Guide.pdf">PDF</a></td> 
+   <td><a href="docs/1.3.0/odb/index.html">Web Book</a>, <a 
href="docs/1.3.0/odb/Trafodion_odb_User_Guide.pdf">PDF</a></td> 
   </tr> 
   <tr class="a"> 
    <td>Trafodion Provisioning Guide </td> 
-   <td><a href="docs/1.3.0/provisioning_guide/index.html">Web Book</a>,<a 
href="docs/1.3.0/provisioning_guide/Trafodion_Provisioning_Guide.pdf">PDF</a></td>
 
+   <td><a href="docs/1.3.0/provisioning_guide/index.html">Web Book</a>, <a 
href="docs/1.3.0/provisioning_guide/Trafodion_Provisioning_Guide.pdf">PDF</a></td>
 
   </tr> 
   <tr class="b"> 
    <td>Trafodion REST Server Reference Guide </td> 
-   <td><a href="docs/1.3.0/rest_reference/index.html">Web Book</a>,<a 
href="docs/1.3.0/rest_reference/apidocs/index.html">API</a></td> 
+   <td><a href="docs/1.3.0/rest_reference/index.html">Web Book</a>, <a 
href="docs/1.3.0/rest_reference/apidocs/index.html">API</a></td> 
   </tr> 
   <tr class="a"> 
    <td>Trafodion SQL Reference Manual </td> 
-   <td><a href="docs/1.3.0/sql_reference/index.html">Web Book</a>,<a 
href="docs/1.3.0/sql_reference/Trafodion_SQL_Reference_Manual.pdf">PDF</a></td> 
+   <td><a href="docs/1.3.0/sql_reference/index.html">Web Book</a>, <a 
href="docs/1.3.0/sql_reference/Trafodion_SQL_Reference_Manual.pdf">PDF</a></td> 
+  </tr> 
+  <tr class="b"> 
+   <td>Trafodion Stored Procedures in Java (SPJ) Guide </td> 
+   <td><a href="docs/1.3.0/spj_guide/index.html">Web Book</a>, <a 
href="docs/1.3.0/spj_guide/Trafodion_SPJ_Guide.pdf">PDF</a></td> 
   </tr> 
  </tbody> 
 </table>
@@ -440,7 +449,7 @@
                                                        <a 
href="https://blueprints.launchpad.net/trafodion/+spec/bulkunload"; title="Bulk 
Unload" class="externalLink">Bulk Unload</a>
                                                </li>
                                                <li >
-                                                       <a 
href="https://wiki.trafodion.org/wiki/index.php/Trafodion_Manageability#Logging_Events";
 title="Event Handling" class="externalLink">Event Handling</a>
+                                                       <a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Trafodion+Manageability#TrafodionManageability-LoggingEvents";
 title="Event Handling" class="externalLink">Event Handling</a>
                                                </li>
                                                <li >
                                                        <a 
href="https://blueprints.launchpad.net/trafodion/+spec/hybrid-query-cache"; 
title="Hybrid Query Cache" class="externalLink">Hybrid Query Cache</a>
@@ -449,9 +458,6 @@
                                                        <a 
href="https://blueprints.launchpad.net/trafodion/+spec/identity-column"; 
title="Identity Column" class="externalLink">Identity Column</a>
                                                </li>
                                                <li >
-                                                       <a 
href="https://wiki.trafodion.org/wiki/index.php/Creating_Statistics_During_Bulk_Load";
 title="Immediate Update Statistics" class="externalLink">Immediate Update 
Statistics</a>
-                                               </li>
-                                               <li >
                                                        <a 
href="https://blueprints.launchpad.net/trafodion/+spec/lob-support"; 
title="Large Object (LOB)" class="externalLink">Large Object (LOB)</a>
                                                </li>
                                                <li >
@@ -464,7 +470,7 @@
                                                        <a 
href="https://blueprints.launchpad.net/trafodion/+spec/access-external-hbase-tables";
 title="Native HBase Tables" class="externalLink">Native HBase Tables</a>
                                                </li>
                                                <li >
-                                                       <a 
href="docs/odb_user/index.html" title="ODB">ODB</a>
+                                                       <a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Tutorial:+The+object-oriented+UDF+interface";
 title="Object-Oriented UDF Tutorial" class="externalLink">Object-Oriented UDF 
Tutorial</a>
                                                </li>
                                                <li >
                                                        <a 
href="https://blueprints.launchpad.net/trafodion/+spec/sql-query-cancel"; 
title="Query Cancel" class="externalLink">Query Cancel</a>
@@ -473,7 +479,7 @@
                                                        <a 
href="https://blueprints.launchpad.net/trafodion/+spec/security-privilege-updates";
 title="Privilege Checking" class="externalLink">Privilege Checking</a>
                                                </li>
                                                <li >
-                                                       <a 
href="https://wiki.trafodion.org/wiki/index.php/Trafodion_Manageability"; 
title="Repository" class="externalLink">Repository</a>
+                                                       <a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Trafodion+Manageability";
 title="Repository" class="externalLink">Repository</a>
                                                </li>
                                                <li >
                                                        <a 
href="https://blueprints.launchpad.net/trafodion/+spec/enable-get-statistics-thru-rms";
 title="Runtime Management System" class="externalLink">Runtime Management 
System</a>
@@ -485,19 +491,13 @@
                                                        <a 
href="https://blueprints.launchpad.net/trafodion/+spec/skew-buster"; title="Skew 
Buster" class="externalLink">Skew Buster</a>
                                                </li>
                                                <li >
-                                                       <a 
href="https://wiki.trafodion.org/wiki/index.php/Tutorial:_The_object-oriented_UDF_interface";
 title="Table-Oriented UDF" class="externalLink">Table-Oriented UDF</a>
-                                               </li>
-                                               <li >
-                                                       <a 
href="https://wiki.trafodion.org/wiki/index.php/Data_Loading#Trickle_Loading_Data_Into_Trafodion_Tables";
 title="Trickle Load" class="externalLink">Trickle Load</a>
-                                               </li>
-                                               <li >
                                                        <a href="http:divider" 
title=""></a>
                                                </li>
                                                <li >
-                                                       <a 
href="https://wiki.trafodion.org/wiki/index.php/Backup_and_Restore"; 
title="Backup/Restore Utility" class="externalLink">Backup/Restore Utility</a>
+                                                       <a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Backup+and+Restore"; 
title="Backup/Restore Utility" class="externalLink">Backup/Restore Utility</a>
                                                </li>
                                                <li >
-                                                       <a 
href="https://wiki.trafodion.org/wiki/index.php/Metadata_Cleanup"; 
title="Metadata Cleanup Utility" class="externalLink">Metadata Cleanup 
Utility</a>
+                                                       <a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Metadata+Cleanup"; 
title="Metadata Cleanup Utility" class="externalLink">Metadata Cleanup 
Utility</a>
                                                </li>
                                        </ul>
                                </div>

http://git-wip-us.apache.org/repos/asf/incubator-trafodion-site/blob/2fb69022/download.html
----------------------------------------------------------------------
diff --git a/download.html b/download.html
index dd38be6..d5a9dd4 100644
--- a/download.html
+++ b/download.html
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2016-03-22
+ Generated by Apache Maven Doxia at 2016-04-08
  Rendered using Reflow Maven Skin 1.1.1 
(http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -92,26 +92,23 @@
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/security-ansi-schemas"; 
title="ANSI Schema Support" class="externalLink">ANSI Schema Support</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/ustat-automation"; 
title="Automated Update Statistics" class="externalLink">Automated Update 
Statistics</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/bulkunload"; title="Bulk 
Unload" class="externalLink">Bulk Unload</a></li>
-                                                                       <li ><a 
href="https://wiki.trafodion.org/wiki/index.php/Trafodion_Manageability#Logging_Events";
 title="Event Handling" class="externalLink">Event Handling</a></li>
+                                                                       <li ><a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Trafodion+Manageability#TrafodionManageability-LoggingEvents";
 title="Event Handling" class="externalLink">Event Handling</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/hybrid-query-cache"; 
title="Hybrid Query Cache" class="externalLink">Hybrid Query Cache</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/identity-column"; 
title="Identity Column" class="externalLink">Identity Column</a></li>
-                                                                       <li ><a 
href="https://wiki.trafodion.org/wiki/index.php/Creating_Statistics_During_Bulk_Load";
 title="Immediate Update Statistics" class="externalLink">Immediate Update 
Statistics</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/lob-support"; 
title="Large Object (LOB)" class="externalLink">Large Object (LOB)</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/ddl-query-invalidation"; 
title="Metadata Query Invalidation" class="externalLink">Metadata Query 
Invalidation</a></li>
                                                                        <li ><a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Cmp-divisioning"; 
title="Multi-Temperature Data" class="externalLink">Multi-Temperature 
Data</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/access-external-hbase-tables";
 title="Native HBase Tables" class="externalLink">Native HBase Tables</a></li>
-                                                                       <li ><a 
href="docs/odb_user/index.html" title="ODB">ODB</a></li>
+                                                                       <li ><a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Tutorial:+The+object-oriented+UDF+interface";
 title="Object-Oriented UDF Tutorial" class="externalLink">Object-Oriented UDF 
Tutorial</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/sql-query-cancel"; 
title="Query Cancel" class="externalLink">Query Cancel</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/security-privilege-updates";
 title="Privilege Checking" class="externalLink">Privilege Checking</a></li>
-                                                                       <li ><a 
href="https://wiki.trafodion.org/wiki/index.php/Trafodion_Manageability"; 
title="Repository" class="externalLink">Repository</a></li>
+                                                                       <li ><a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Trafodion+Manageability";
 title="Repository" class="externalLink">Repository</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/enable-get-statistics-thru-rms";
 title="Runtime Management System" class="externalLink">Runtime Management 
System</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/sequence-numbers"; 
title="Sequence Numbers" class="externalLink">Sequence Numbers</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/skew-buster"; title="Skew 
Buster" class="externalLink">Skew Buster</a></li>
-                                                                       <li ><a 
href="https://wiki.trafodion.org/wiki/index.php/Tutorial:_The_object-oriented_UDF_interface";
 title="Table-Oriented UDF" class="externalLink">Table-Oriented UDF</a></li>
-                                                                       <li ><a 
href="https://wiki.trafodion.org/wiki/index.php/Data_Loading#Trickle_Loading_Data_Into_Trafodion_Tables";
 title="Trickle Load" class="externalLink">Trickle Load</a></li>
                                                                        <li ><a 
href="http:divider" title=""></a></li>
-                                                                       <li ><a 
href="https://wiki.trafodion.org/wiki/index.php/Backup_and_Restore"; 
title="Backup/Restore Utility" class="externalLink">Backup/Restore 
Utility</a></li>
-                                                                       <li ><a 
href="https://wiki.trafodion.org/wiki/index.php/Metadata_Cleanup"; 
title="Metadata Cleanup Utility" class="externalLink">Metadata Cleanup 
Utility</a></li>
+                                                                       <li ><a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Backup+and+Restore"; 
title="Backup/Restore Utility" class="externalLink">Backup/Restore 
Utility</a></li>
+                                                                       <li ><a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Metadata+Cleanup"; 
title="Metadata Cleanup Utility" class="externalLink">Metadata Cleanup 
Utility</a></li>
                                                                </ul>
                                                        </li>
                                                        <li class="dropdown">
@@ -450,7 +447,7 @@ swstatus
                                                        <a 
href="https://blueprints.launchpad.net/trafodion/+spec/bulkunload"; title="Bulk 
Unload" class="externalLink">Bulk Unload</a>
                                                </li>
                                                <li >
-                                                       <a 
href="https://wiki.trafodion.org/wiki/index.php/Trafodion_Manageability#Logging_Events";
 title="Event Handling" class="externalLink">Event Handling</a>
+                                                       <a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Trafodion+Manageability#TrafodionManageability-LoggingEvents";
 title="Event Handling" class="externalLink">Event Handling</a>
                                                </li>
                                                <li >
                                                        <a 
href="https://blueprints.launchpad.net/trafodion/+spec/hybrid-query-cache"; 
title="Hybrid Query Cache" class="externalLink">Hybrid Query Cache</a>
@@ -459,9 +456,6 @@ swstatus
                                                        <a 
href="https://blueprints.launchpad.net/trafodion/+spec/identity-column"; 
title="Identity Column" class="externalLink">Identity Column</a>
                                                </li>
                                                <li >
-                                                       <a 
href="https://wiki.trafodion.org/wiki/index.php/Creating_Statistics_During_Bulk_Load";
 title="Immediate Update Statistics" class="externalLink">Immediate Update 
Statistics</a>
-                                               </li>
-                                               <li >
                                                        <a 
href="https://blueprints.launchpad.net/trafodion/+spec/lob-support"; 
title="Large Object (LOB)" class="externalLink">Large Object (LOB)</a>
                                                </li>
                                                <li >
@@ -474,7 +468,7 @@ swstatus
                                                        <a 
href="https://blueprints.launchpad.net/trafodion/+spec/access-external-hbase-tables";
 title="Native HBase Tables" class="externalLink">Native HBase Tables</a>
                                                </li>
                                                <li >
-                                                       <a 
href="docs/odb_user/index.html" title="ODB">ODB</a>
+                                                       <a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Tutorial:+The+object-oriented+UDF+interface";
 title="Object-Oriented UDF Tutorial" class="externalLink">Object-Oriented UDF 
Tutorial</a>
                                                </li>
                                                <li >
                                                        <a 
href="https://blueprints.launchpad.net/trafodion/+spec/sql-query-cancel"; 
title="Query Cancel" class="externalLink">Query Cancel</a>
@@ -483,7 +477,7 @@ swstatus
                                                        <a 
href="https://blueprints.launchpad.net/trafodion/+spec/security-privilege-updates";
 title="Privilege Checking" class="externalLink">Privilege Checking</a>
                                                </li>
                                                <li >
-                                                       <a 
href="https://wiki.trafodion.org/wiki/index.php/Trafodion_Manageability"; 
title="Repository" class="externalLink">Repository</a>
+                                                       <a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Trafodion+Manageability";
 title="Repository" class="externalLink">Repository</a>
                                                </li>
                                                <li >
                                                        <a 
href="https://blueprints.launchpad.net/trafodion/+spec/enable-get-statistics-thru-rms";
 title="Runtime Management System" class="externalLink">Runtime Management 
System</a>
@@ -495,19 +489,13 @@ swstatus
                                                        <a 
href="https://blueprints.launchpad.net/trafodion/+spec/skew-buster"; title="Skew 
Buster" class="externalLink">Skew Buster</a>
                                                </li>
                                                <li >
-                                                       <a 
href="https://wiki.trafodion.org/wiki/index.php/Tutorial:_The_object-oriented_UDF_interface";
 title="Table-Oriented UDF" class="externalLink">Table-Oriented UDF</a>
-                                               </li>
-                                               <li >
-                                                       <a 
href="https://wiki.trafodion.org/wiki/index.php/Data_Loading#Trickle_Loading_Data_Into_Trafodion_Tables";
 title="Trickle Load" class="externalLink">Trickle Load</a>
-                                               </li>
-                                               <li >
                                                        <a href="http:divider" 
title=""></a>
                                                </li>
                                                <li >
-                                                       <a 
href="https://wiki.trafodion.org/wiki/index.php/Backup_and_Restore"; 
title="Backup/Restore Utility" class="externalLink">Backup/Restore Utility</a>
+                                                       <a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Backup+and+Restore"; 
title="Backup/Restore Utility" class="externalLink">Backup/Restore Utility</a>
                                                </li>
                                                <li >
-                                                       <a 
href="https://wiki.trafodion.org/wiki/index.php/Metadata_Cleanup"; 
title="Metadata Cleanup Utility" class="externalLink">Metadata Cleanup 
Utility</a>
+                                                       <a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Metadata+Cleanup"; 
title="Metadata Cleanup Utility" class="externalLink">Metadata Cleanup 
Utility</a>
                                                </li>
                                        </ul>
                                </div>

http://git-wip-us.apache.org/repos/asf/incubator-trafodion-site/blob/2fb69022/enable-secure-trafodion.html
----------------------------------------------------------------------
diff --git a/enable-secure-trafodion.html b/enable-secure-trafodion.html
index 622d671..b05b63a 100644
--- a/enable-secure-trafodion.html
+++ b/enable-secure-trafodion.html
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2016-03-15
+ Generated by Apache Maven Doxia at 2016-04-08
  Rendered using Reflow Maven Skin 1.1.1 
(http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -92,26 +92,23 @@
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/security-ansi-schemas"; 
title="ANSI Schema Support" class="externalLink">ANSI Schema Support</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/ustat-automation"; 
title="Automated Update Statistics" class="externalLink">Automated Update 
Statistics</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/bulkunload"; title="Bulk 
Unload" class="externalLink">Bulk Unload</a></li>
-                                                                       <li ><a 
href="https://wiki.trafodion.org/wiki/index.php/Trafodion_Manageability#Logging_Events";
 title="Event Handling" class="externalLink">Event Handling</a></li>
+                                                                       <li ><a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Trafodion+Manageability#TrafodionManageability-LoggingEvents";
 title="Event Handling" class="externalLink">Event Handling</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/hybrid-query-cache"; 
title="Hybrid Query Cache" class="externalLink">Hybrid Query Cache</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/identity-column"; 
title="Identity Column" class="externalLink">Identity Column</a></li>
-                                                                       <li ><a 
href="https://wiki.trafodion.org/wiki/index.php/Creating_Statistics_During_Bulk_Load";
 title="Immediate Update Statistics" class="externalLink">Immediate Update 
Statistics</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/lob-support"; 
title="Large Object (LOB)" class="externalLink">Large Object (LOB)</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/ddl-query-invalidation"; 
title="Metadata Query Invalidation" class="externalLink">Metadata Query 
Invalidation</a></li>
                                                                        <li ><a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Cmp-divisioning"; 
title="Multi-Temperature Data" class="externalLink">Multi-Temperature 
Data</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/access-external-hbase-tables";
 title="Native HBase Tables" class="externalLink">Native HBase Tables</a></li>
-                                                                       <li ><a 
href="docs/odb_user/index.html" title="ODB">ODB</a></li>
+                                                                       <li ><a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Tutorial:+The+object-oriented+UDF+interface";
 title="Object-Oriented UDF Tutorial" class="externalLink">Object-Oriented UDF 
Tutorial</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/sql-query-cancel"; 
title="Query Cancel" class="externalLink">Query Cancel</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/security-privilege-updates";
 title="Privilege Checking" class="externalLink">Privilege Checking</a></li>
-                                                                       <li ><a 
href="https://wiki.trafodion.org/wiki/index.php/Trafodion_Manageability"; 
title="Repository" class="externalLink">Repository</a></li>
+                                                                       <li ><a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Trafodion+Manageability";
 title="Repository" class="externalLink">Repository</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/enable-get-statistics-thru-rms";
 title="Runtime Management System" class="externalLink">Runtime Management 
System</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/sequence-numbers"; 
title="Sequence Numbers" class="externalLink">Sequence Numbers</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/skew-buster"; title="Skew 
Buster" class="externalLink">Skew Buster</a></li>
-                                                                       <li ><a 
href="https://wiki.trafodion.org/wiki/index.php/Tutorial:_The_object-oriented_UDF_interface";
 title="Table-Oriented UDF" class="externalLink">Table-Oriented UDF</a></li>
-                                                                       <li ><a 
href="https://wiki.trafodion.org/wiki/index.php/Data_Loading#Trickle_Loading_Data_Into_Trafodion_Tables";
 title="Trickle Load" class="externalLink">Trickle Load</a></li>
                                                                        <li ><a 
href="http:divider" title=""></a></li>
-                                                                       <li ><a 
href="https://wiki.trafodion.org/wiki/index.php/Backup_and_Restore"; 
title="Backup/Restore Utility" class="externalLink">Backup/Restore 
Utility</a></li>
-                                                                       <li ><a 
href="https://wiki.trafodion.org/wiki/index.php/Metadata_Cleanup"; 
title="Metadata Cleanup Utility" class="externalLink">Metadata Cleanup 
Utility</a></li>
+                                                                       <li ><a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Backup+and+Restore"; 
title="Backup/Restore Utility" class="externalLink">Backup/Restore 
Utility</a></li>
+                                                                       <li ><a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Metadata+Cleanup"; 
title="Metadata Cleanup Utility" class="externalLink">Metadata Cleanup 
Utility</a></li>
                                                                </ul>
                                                        </li>
                                                        <li class="dropdown">
@@ -266,7 +263,7 @@
                                                        <a 
href="https://blueprints.launchpad.net/trafodion/+spec/bulkunload"; title="Bulk 
Unload" class="externalLink">Bulk Unload</a>
                                                </li>
                                                <li >
-                                                       <a 
href="https://wiki.trafodion.org/wiki/index.php/Trafodion_Manageability#Logging_Events";
 title="Event Handling" class="externalLink">Event Handling</a>
+                                                       <a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Trafodion+Manageability#TrafodionManageability-LoggingEvents";
 title="Event Handling" class="externalLink">Event Handling</a>
                                                </li>
                                                <li >
                                                        <a 
href="https://blueprints.launchpad.net/trafodion/+spec/hybrid-query-cache"; 
title="Hybrid Query Cache" class="externalLink">Hybrid Query Cache</a>
@@ -275,9 +272,6 @@
                                                        <a 
href="https://blueprints.launchpad.net/trafodion/+spec/identity-column"; 
title="Identity Column" class="externalLink">Identity Column</a>
                                                </li>
                                                <li >
-                                                       <a 
href="https://wiki.trafodion.org/wiki/index.php/Creating_Statistics_During_Bulk_Load";
 title="Immediate Update Statistics" class="externalLink">Immediate Update 
Statistics</a>
-                                               </li>
-                                               <li >
                                                        <a 
href="https://blueprints.launchpad.net/trafodion/+spec/lob-support"; 
title="Large Object (LOB)" class="externalLink">Large Object (LOB)</a>
                                                </li>
                                                <li >
@@ -290,7 +284,7 @@
                                                        <a 
href="https://blueprints.launchpad.net/trafodion/+spec/access-external-hbase-tables";
 title="Native HBase Tables" class="externalLink">Native HBase Tables</a>
                                                </li>
                                                <li >
-                                                       <a 
href="docs/odb_user/index.html" title="ODB">ODB</a>
+                                                       <a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Tutorial:+The+object-oriented+UDF+interface";
 title="Object-Oriented UDF Tutorial" class="externalLink">Object-Oriented UDF 
Tutorial</a>
                                                </li>
                                                <li >
                                                        <a 
href="https://blueprints.launchpad.net/trafodion/+spec/sql-query-cancel"; 
title="Query Cancel" class="externalLink">Query Cancel</a>
@@ -299,7 +293,7 @@
                                                        <a 
href="https://blueprints.launchpad.net/trafodion/+spec/security-privilege-updates";
 title="Privilege Checking" class="externalLink">Privilege Checking</a>
                                                </li>
                                                <li >
-                                                       <a 
href="https://wiki.trafodion.org/wiki/index.php/Trafodion_Manageability"; 
title="Repository" class="externalLink">Repository</a>
+                                                       <a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Trafodion+Manageability";
 title="Repository" class="externalLink">Repository</a>
                                                </li>
                                                <li >
                                                        <a 
href="https://blueprints.launchpad.net/trafodion/+spec/enable-get-statistics-thru-rms";
 title="Runtime Management System" class="externalLink">Runtime Management 
System</a>
@@ -311,19 +305,13 @@
                                                        <a 
href="https://blueprints.launchpad.net/trafodion/+spec/skew-buster"; title="Skew 
Buster" class="externalLink">Skew Buster</a>
                                                </li>
                                                <li >
-                                                       <a 
href="https://wiki.trafodion.org/wiki/index.php/Tutorial:_The_object-oriented_UDF_interface";
 title="Table-Oriented UDF" class="externalLink">Table-Oriented UDF</a>
-                                               </li>
-                                               <li >
-                                                       <a 
href="https://wiki.trafodion.org/wiki/index.php/Data_Loading#Trickle_Loading_Data_Into_Trafodion_Tables";
 title="Trickle Load" class="externalLink">Trickle Load</a>
-                                               </li>
-                                               <li >
                                                        <a href="http:divider" 
title=""></a>
                                                </li>
                                                <li >
-                                                       <a 
href="https://wiki.trafodion.org/wiki/index.php/Backup_and_Restore"; 
title="Backup/Restore Utility" class="externalLink">Backup/Restore Utility</a>
+                                                       <a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Backup+and+Restore"; 
title="Backup/Restore Utility" class="externalLink">Backup/Restore Utility</a>
                                                </li>
                                                <li >
-                                                       <a 
href="https://wiki.trafodion.org/wiki/index.php/Metadata_Cleanup"; 
title="Metadata Cleanup Utility" class="externalLink">Metadata Cleanup 
Utility</a>
+                                                       <a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Metadata+Cleanup"; 
title="Metadata Cleanup Utility" class="externalLink">Metadata Cleanup 
Utility</a>
                                                </li>
                                        </ul>
                                </div>

http://git-wip-us.apache.org/repos/asf/incubator-trafodion-site/blob/2fb69022/faq.html
----------------------------------------------------------------------
diff --git a/faq.html b/faq.html
index 192d543..ac5415c 100644
--- a/faq.html
+++ b/faq.html
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2016-03-15
+ Generated by Apache Maven Doxia at 2016-04-08
  Rendered using Reflow Maven Skin 1.1.1 
(http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -92,26 +92,23 @@
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/security-ansi-schemas"; 
title="ANSI Schema Support" class="externalLink">ANSI Schema Support</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/ustat-automation"; 
title="Automated Update Statistics" class="externalLink">Automated Update 
Statistics</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/bulkunload"; title="Bulk 
Unload" class="externalLink">Bulk Unload</a></li>
-                                                                       <li ><a 
href="https://wiki.trafodion.org/wiki/index.php/Trafodion_Manageability#Logging_Events";
 title="Event Handling" class="externalLink">Event Handling</a></li>
+                                                                       <li ><a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Trafodion+Manageability#TrafodionManageability-LoggingEvents";
 title="Event Handling" class="externalLink">Event Handling</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/hybrid-query-cache"; 
title="Hybrid Query Cache" class="externalLink">Hybrid Query Cache</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/identity-column"; 
title="Identity Column" class="externalLink">Identity Column</a></li>
-                                                                       <li ><a 
href="https://wiki.trafodion.org/wiki/index.php/Creating_Statistics_During_Bulk_Load";
 title="Immediate Update Statistics" class="externalLink">Immediate Update 
Statistics</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/lob-support"; 
title="Large Object (LOB)" class="externalLink">Large Object (LOB)</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/ddl-query-invalidation"; 
title="Metadata Query Invalidation" class="externalLink">Metadata Query 
Invalidation</a></li>
                                                                        <li ><a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Cmp-divisioning"; 
title="Multi-Temperature Data" class="externalLink">Multi-Temperature 
Data</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/access-external-hbase-tables";
 title="Native HBase Tables" class="externalLink">Native HBase Tables</a></li>
-                                                                       <li ><a 
href="docs/odb_user/index.html" title="ODB">ODB</a></li>
+                                                                       <li ><a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Tutorial:+The+object-oriented+UDF+interface";
 title="Object-Oriented UDF Tutorial" class="externalLink">Object-Oriented UDF 
Tutorial</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/sql-query-cancel"; 
title="Query Cancel" class="externalLink">Query Cancel</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/security-privilege-updates";
 title="Privilege Checking" class="externalLink">Privilege Checking</a></li>
-                                                                       <li ><a 
href="https://wiki.trafodion.org/wiki/index.php/Trafodion_Manageability"; 
title="Repository" class="externalLink">Repository</a></li>
+                                                                       <li ><a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Trafodion+Manageability";
 title="Repository" class="externalLink">Repository</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/enable-get-statistics-thru-rms";
 title="Runtime Management System" class="externalLink">Runtime Management 
System</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/sequence-numbers"; 
title="Sequence Numbers" class="externalLink">Sequence Numbers</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/skew-buster"; title="Skew 
Buster" class="externalLink">Skew Buster</a></li>
-                                                                       <li ><a 
href="https://wiki.trafodion.org/wiki/index.php/Tutorial:_The_object-oriented_UDF_interface";
 title="Table-Oriented UDF" class="externalLink">Table-Oriented UDF</a></li>
-                                                                       <li ><a 
href="https://wiki.trafodion.org/wiki/index.php/Data_Loading#Trickle_Loading_Data_Into_Trafodion_Tables";
 title="Trickle Load" class="externalLink">Trickle Load</a></li>
                                                                        <li ><a 
href="http:divider" title=""></a></li>
-                                                                       <li ><a 
href="https://wiki.trafodion.org/wiki/index.php/Backup_and_Restore"; 
title="Backup/Restore Utility" class="externalLink">Backup/Restore 
Utility</a></li>
-                                                                       <li ><a 
href="https://wiki.trafodion.org/wiki/index.php/Metadata_Cleanup"; 
title="Metadata Cleanup Utility" class="externalLink">Metadata Cleanup 
Utility</a></li>
+                                                                       <li ><a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Backup+and+Restore"; 
title="Backup/Restore Utility" class="externalLink">Backup/Restore 
Utility</a></li>
+                                                                       <li ><a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Metadata+Cleanup"; 
title="Metadata Cleanup Utility" class="externalLink">Metadata Cleanup 
Utility</a></li>
                                                                </ul>
                                                        </li>
                                                        <li class="dropdown">
@@ -588,7 +585,7 @@ Further details on Operational DBMS can be found in 
Gartner’s [Magic Quadrant
                                                        <a 
href="https://blueprints.launchpad.net/trafodion/+spec/bulkunload"; title="Bulk 
Unload" class="externalLink">Bulk Unload</a>
                                                </li>
                                                <li >
-                                                       <a 
href="https://wiki.trafodion.org/wiki/index.php/Trafodion_Manageability#Logging_Events";
 title="Event Handling" class="externalLink">Event Handling</a>
+                                                       <a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Trafodion+Manageability#TrafodionManageability-LoggingEvents";
 title="Event Handling" class="externalLink">Event Handling</a>
                                                </li>
                                                <li >
                                                        <a 
href="https://blueprints.launchpad.net/trafodion/+spec/hybrid-query-cache"; 
title="Hybrid Query Cache" class="externalLink">Hybrid Query Cache</a>
@@ -597,9 +594,6 @@ Further details on Operational DBMS can be found in 
Gartner’s [Magic Quadrant
                                                        <a 
href="https://blueprints.launchpad.net/trafodion/+spec/identity-column"; 
title="Identity Column" class="externalLink">Identity Column</a>
                                                </li>
                                                <li >
-                                                       <a 
href="https://wiki.trafodion.org/wiki/index.php/Creating_Statistics_During_Bulk_Load";
 title="Immediate Update Statistics" class="externalLink">Immediate Update 
Statistics</a>
-                                               </li>
-                                               <li >
                                                        <a 
href="https://blueprints.launchpad.net/trafodion/+spec/lob-support"; 
title="Large Object (LOB)" class="externalLink">Large Object (LOB)</a>
                                                </li>
                                                <li >
@@ -612,7 +606,7 @@ Further details on Operational DBMS can be found in 
Gartner’s [Magic Quadrant
                                                        <a 
href="https://blueprints.launchpad.net/trafodion/+spec/access-external-hbase-tables";
 title="Native HBase Tables" class="externalLink">Native HBase Tables</a>
                                                </li>
                                                <li >
-                                                       <a 
href="docs/odb_user/index.html" title="ODB">ODB</a>
+                                                       <a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Tutorial:+The+object-oriented+UDF+interface";
 title="Object-Oriented UDF Tutorial" class="externalLink">Object-Oriented UDF 
Tutorial</a>
                                                </li>
                                                <li >
                                                        <a 
href="https://blueprints.launchpad.net/trafodion/+spec/sql-query-cancel"; 
title="Query Cancel" class="externalLink">Query Cancel</a>
@@ -621,7 +615,7 @@ Further details on Operational DBMS can be found in 
Gartner’s [Magic Quadrant
                                                        <a 
href="https://blueprints.launchpad.net/trafodion/+spec/security-privilege-updates";
 title="Privilege Checking" class="externalLink">Privilege Checking</a>
                                                </li>
                                                <li >
-                                                       <a 
href="https://wiki.trafodion.org/wiki/index.php/Trafodion_Manageability"; 
title="Repository" class="externalLink">Repository</a>
+                                                       <a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Trafodion+Manageability";
 title="Repository" class="externalLink">Repository</a>
                                                </li>
                                                <li >
                                                        <a 
href="https://blueprints.launchpad.net/trafodion/+spec/enable-get-statistics-thru-rms";
 title="Runtime Management System" class="externalLink">Runtime Management 
System</a>
@@ -633,19 +627,13 @@ Further details on Operational DBMS can be found in 
Gartner’s [Magic Quadrant
                                                        <a 
href="https://blueprints.launchpad.net/trafodion/+spec/skew-buster"; title="Skew 
Buster" class="externalLink">Skew Buster</a>
                                                </li>
                                                <li >
-                                                       <a 
href="https://wiki.trafodion.org/wiki/index.php/Tutorial:_The_object-oriented_UDF_interface";
 title="Table-Oriented UDF" class="externalLink">Table-Oriented UDF</a>
-                                               </li>
-                                               <li >
-                                                       <a 
href="https://wiki.trafodion.org/wiki/index.php/Data_Loading#Trickle_Loading_Data_Into_Trafodion_Tables";
 title="Trickle Load" class="externalLink">Trickle Load</a>
-                                               </li>
-                                               <li >
                                                        <a href="http:divider" 
title=""></a>
                                                </li>
                                                <li >
-                                                       <a 
href="https://wiki.trafodion.org/wiki/index.php/Backup_and_Restore"; 
title="Backup/Restore Utility" class="externalLink">Backup/Restore Utility</a>
+                                                       <a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Backup+and+Restore"; 
title="Backup/Restore Utility" class="externalLink">Backup/Restore Utility</a>
                                                </li>
                                                <li >
-                                                       <a 
href="https://wiki.trafodion.org/wiki/index.php/Metadata_Cleanup"; 
title="Metadata Cleanup Utility" class="externalLink">Metadata Cleanup 
Utility</a>
+                                                       <a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Metadata+Cleanup"; 
title="Metadata Cleanup Utility" class="externalLink">Metadata Cleanup 
Utility</a>
                                                </li>
                                        </ul>
                                </div>

http://git-wip-us.apache.org/repos/asf/incubator-trafodion-site/blob/2fb69022/images/logo-carousel/slide-1.png
----------------------------------------------------------------------
diff --git a/images/logo-carousel/slide-1.png b/images/logo-carousel/slide-1.png
new file mode 100644
index 0000000..ab6231d
Binary files /dev/null and b/images/logo-carousel/slide-1.png differ

http://git-wip-us.apache.org/repos/asf/incubator-trafodion-site/blob/2fb69022/images/logo-carousel/slide-2.png
----------------------------------------------------------------------
diff --git a/images/logo-carousel/slide-2.png b/images/logo-carousel/slide-2.png
new file mode 100644
index 0000000..db385b5
Binary files /dev/null and b/images/logo-carousel/slide-2.png differ

http://git-wip-us.apache.org/repos/asf/incubator-trafodion-site/blob/2fb69022/index.html
----------------------------------------------------------------------
diff --git a/index.html b/index.html
index 6662ba5..2715935 100644
--- a/index.html
+++ b/index.html
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2016-03-15
+ Generated by Apache Maven Doxia at 2016-04-08
  Rendered using Reflow Maven Skin 1.1.1 
(http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -92,26 +92,23 @@
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/security-ansi-schemas"; 
title="ANSI Schema Support" class="externalLink">ANSI Schema Support</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/ustat-automation"; 
title="Automated Update Statistics" class="externalLink">Automated Update 
Statistics</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/bulkunload"; title="Bulk 
Unload" class="externalLink">Bulk Unload</a></li>
-                                                                       <li ><a 
href="https://wiki.trafodion.org/wiki/index.php/Trafodion_Manageability#Logging_Events";
 title="Event Handling" class="externalLink">Event Handling</a></li>
+                                                                       <li ><a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Trafodion+Manageability#TrafodionManageability-LoggingEvents";
 title="Event Handling" class="externalLink">Event Handling</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/hybrid-query-cache"; 
title="Hybrid Query Cache" class="externalLink">Hybrid Query Cache</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/identity-column"; 
title="Identity Column" class="externalLink">Identity Column</a></li>
-                                                                       <li ><a 
href="https://wiki.trafodion.org/wiki/index.php/Creating_Statistics_During_Bulk_Load";
 title="Immediate Update Statistics" class="externalLink">Immediate Update 
Statistics</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/lob-support"; 
title="Large Object (LOB)" class="externalLink">Large Object (LOB)</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/ddl-query-invalidation"; 
title="Metadata Query Invalidation" class="externalLink">Metadata Query 
Invalidation</a></li>
                                                                        <li ><a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Cmp-divisioning"; 
title="Multi-Temperature Data" class="externalLink">Multi-Temperature 
Data</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/access-external-hbase-tables";
 title="Native HBase Tables" class="externalLink">Native HBase Tables</a></li>
-                                                                       <li ><a 
href="docs/odb_user/index.html" title="ODB">ODB</a></li>
+                                                                       <li ><a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Tutorial:+The+object-oriented+UDF+interface";
 title="Object-Oriented UDF Tutorial" class="externalLink">Object-Oriented UDF 
Tutorial</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/sql-query-cancel"; 
title="Query Cancel" class="externalLink">Query Cancel</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/security-privilege-updates";
 title="Privilege Checking" class="externalLink">Privilege Checking</a></li>
-                                                                       <li ><a 
href="https://wiki.trafodion.org/wiki/index.php/Trafodion_Manageability"; 
title="Repository" class="externalLink">Repository</a></li>
+                                                                       <li ><a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Trafodion+Manageability";
 title="Repository" class="externalLink">Repository</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/enable-get-statistics-thru-rms";
 title="Runtime Management System" class="externalLink">Runtime Management 
System</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/sequence-numbers"; 
title="Sequence Numbers" class="externalLink">Sequence Numbers</a></li>
                                                                        <li ><a 
href="https://blueprints.launchpad.net/trafodion/+spec/skew-buster"; title="Skew 
Buster" class="externalLink">Skew Buster</a></li>
-                                                                       <li ><a 
href="https://wiki.trafodion.org/wiki/index.php/Tutorial:_The_object-oriented_UDF_interface";
 title="Table-Oriented UDF" class="externalLink">Table-Oriented UDF</a></li>
-                                                                       <li ><a 
href="https://wiki.trafodion.org/wiki/index.php/Data_Loading#Trickle_Loading_Data_Into_Trafodion_Tables";
 title="Trickle Load" class="externalLink">Trickle Load</a></li>
                                                                        <li ><a 
href="http:divider" title=""></a></li>
-                                                                       <li ><a 
href="https://wiki.trafodion.org/wiki/index.php/Backup_and_Restore"; 
title="Backup/Restore Utility" class="externalLink">Backup/Restore 
Utility</a></li>
-                                                                       <li ><a 
href="https://wiki.trafodion.org/wiki/index.php/Metadata_Cleanup"; 
title="Metadata Cleanup Utility" class="externalLink">Metadata Cleanup 
Utility</a></li>
+                                                                       <li ><a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Backup+and+Restore"; 
title="Backup/Restore Utility" class="externalLink">Backup/Restore 
Utility</a></li>
+                                                                       <li ><a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Metadata+Cleanup"; 
title="Metadata Cleanup Utility" class="externalLink">Metadata Cleanup 
Utility</a></li>
                                                                </ul>
                                                        </li>
                                                        <li class="dropdown">
@@ -207,9 +204,40 @@
      </div></td> 
    </tr> 
   </tbody> 
- </table>  
+ </table> 
+ <center> 
+  <h1>Contributing Companies</h1> 
+ </center>  
+ <!-- Carousel with logos --> 
 </div>
-                               <hr />
+                       </div>
+               </div>
+       </div>
+       <div id="carousel1" class="carousel slide">
+               <div class="carousel-inner">
+                       <div class="item active">
+                               <img src="images/logo-carousel/slide-1.png" 
alt="Slide 1" />
+                               <div class="carousel-caption">
+                                       <h4 id="Join_Our_Community">Join Our 
Community</h4>  
+<p>Code, test, present, document, web sites, and many other ways to 
contribute.</p> 
+<div class="section"> 
+</div>
+                               </div>
+                       </div>
+                       <div class="item ">
+                               <img src="images/logo-carousel/slide-2.png" 
alt="Slide 2" />
+                               <div class="carousel-caption">
+                                       <h4 id="Add_Your_Logo_Here">Add Your 
Logo Here</h4>  
+<p>Already a contributor? We need permission to add your company’s logo 
here. </p>
+                               </div>
+                       </div>
+               </div>
+               <a class="left carousel-control" href="#carousel1" 
data-slide="prev">&lsaquo;</a>
+               <a class="right carousel-control" href="#carousel1" 
data-slide="next">&rsaquo;</a>
+       </div>
+       <div class="row">
+               <div class="span12">
+                       <div class="body-content">
                                <div class="section"> 
  <h2 id="About">About</h2> 
  <p>Apache Trafodion is a webscale SQL-on-Hadoop solution enabling 
transactional or operational workloads on Hadoop. </p> 
@@ -270,7 +298,6 @@
      <li><a href="architecture-overview.html">Architecture</a></li> 
      <li><a href="documentation.html">Documentation</a></li> 
      <li><a href="faq.html">FAQ</a></li> 
-     <li><a href="roadmap.html">Roadmap</a></li> 
     </ul> </td> 
    <td width="33%" valign="top"> 
     <center> 
@@ -289,8 +316,7 @@
     </center> 
     <ul> 
      <li><a href="download.html">Download</a></li> 
-     <li><a href="quick-start.html">Quick Start</a></li> 
-     <li><a href="features.html">Features</a></li> 
+     <li><a href="quickstart.html">Quick Start</a></li> 
      <li><a href="release-notes.html">Release Notes</a></li> 
     </ul> </td> 
    <td width="33%" valign="top"> 
@@ -312,7 +338,6 @@
      <li><a href="contributing-redirect.html">Contribute</a></li> 
      <li><a href="mail-lists.html">Discuss</a></li> 
      <li><a class="externalLink" 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Apache+Trafodion+Home";>Wiki</a></li>
 
-     <li><a href="presentations.html">Presentations</a></li> 
     </ul> </td> 
   </tr> 
  </tbody> 
@@ -398,7 +423,7 @@
                                                        <a 
href="https://blueprints.launchpad.net/trafodion/+spec/bulkunload"; title="Bulk 
Unload" class="externalLink">Bulk Unload</a>
                                                </li>
                                                <li >
-                                                       <a 
href="https://wiki.trafodion.org/wiki/index.php/Trafodion_Manageability#Logging_Events";
 title="Event Handling" class="externalLink">Event Handling</a>
+                                                       <a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Trafodion+Manageability#TrafodionManageability-LoggingEvents";
 title="Event Handling" class="externalLink">Event Handling</a>
                                                </li>
                                                <li >
                                                        <a 
href="https://blueprints.launchpad.net/trafodion/+spec/hybrid-query-cache"; 
title="Hybrid Query Cache" class="externalLink">Hybrid Query Cache</a>
@@ -407,9 +432,6 @@
                                                        <a 
href="https://blueprints.launchpad.net/trafodion/+spec/identity-column"; 
title="Identity Column" class="externalLink">Identity Column</a>
                                                </li>
                                                <li >
-                                                       <a 
href="https://wiki.trafodion.org/wiki/index.php/Creating_Statistics_During_Bulk_Load";
 title="Immediate Update Statistics" class="externalLink">Immediate Update 
Statistics</a>
-                                               </li>
-                                               <li >
                                                        <a 
href="https://blueprints.launchpad.net/trafodion/+spec/lob-support"; 
title="Large Object (LOB)" class="externalLink">Large Object (LOB)</a>
                                                </li>
                                                <li >
@@ -422,7 +444,7 @@
                                                        <a 
href="https://blueprints.launchpad.net/trafodion/+spec/access-external-hbase-tables";
 title="Native HBase Tables" class="externalLink">Native HBase Tables</a>
                                                </li>
                                                <li >
-                                                       <a 
href="docs/odb_user/index.html" title="ODB">ODB</a>
+                                                       <a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Tutorial:+The+object-oriented+UDF+interface";
 title="Object-Oriented UDF Tutorial" class="externalLink">Object-Oriented UDF 
Tutorial</a>
                                                </li>
                                                <li >
                                                        <a 
href="https://blueprints.launchpad.net/trafodion/+spec/sql-query-cancel"; 
title="Query Cancel" class="externalLink">Query Cancel</a>
@@ -431,7 +453,7 @@
                                                        <a 
href="https://blueprints.launchpad.net/trafodion/+spec/security-privilege-updates";
 title="Privilege Checking" class="externalLink">Privilege Checking</a>
                                                </li>
                                                <li >
-                                                       <a 
href="https://wiki.trafodion.org/wiki/index.php/Trafodion_Manageability"; 
title="Repository" class="externalLink">Repository</a>
+                                                       <a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Trafodion+Manageability";
 title="Repository" class="externalLink">Repository</a>
                                                </li>
                                                <li >
                                                        <a 
href="https://blueprints.launchpad.net/trafodion/+spec/enable-get-statistics-thru-rms";
 title="Runtime Management System" class="externalLink">Runtime Management 
System</a>
@@ -443,19 +465,13 @@
                                                        <a 
href="https://blueprints.launchpad.net/trafodion/+spec/skew-buster"; title="Skew 
Buster" class="externalLink">Skew Buster</a>
                                                </li>
                                                <li >
-                                                       <a 
href="https://wiki.trafodion.org/wiki/index.php/Tutorial:_The_object-oriented_UDF_interface";
 title="Table-Oriented UDF" class="externalLink">Table-Oriented UDF</a>
-                                               </li>
-                                               <li >
-                                                       <a 
href="https://wiki.trafodion.org/wiki/index.php/Data_Loading#Trickle_Loading_Data_Into_Trafodion_Tables";
 title="Trickle Load" class="externalLink">Trickle Load</a>
-                                               </li>
-                                               <li >
                                                        <a href="http:divider" 
title=""></a>
                                                </li>
                                                <li >
-                                                       <a 
href="https://wiki.trafodion.org/wiki/index.php/Backup_and_Restore"; 
title="Backup/Restore Utility" class="externalLink">Backup/Restore Utility</a>
+                                                       <a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Backup+and+Restore"; 
title="Backup/Restore Utility" class="externalLink">Backup/Restore Utility</a>
                                                </li>
                                                <li >
-                                                       <a 
href="https://wiki.trafodion.org/wiki/index.php/Metadata_Cleanup"; 
title="Metadata Cleanup Utility" class="externalLink">Metadata Cleanup 
Utility</a>
+                                                       <a 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Metadata+Cleanup"; 
title="Metadata Cleanup Utility" class="externalLink">Metadata Cleanup 
Utility</a>
                                                </li>
                                        </ul>
                                </div>

Reply via email to