Repository: incubator-trafodion
Updated Branches:
  refs/heads/master 250ee055b -> d00c7731c


TRAFODION-1507 Second phase of incubator.trafodion.apache.org update.

Please refer to website.md and document.md for information about how to
update the website.

jenkins, skip test


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

Branch: refs/heads/master
Commit: 1c617ae3968352c6cf0680363350634802c6492c
Parents: fbfab1e
Author: Gunnar Tapper <gtapper@esgyn.local>
Authored: Mon Dec 7 09:07:09 2015 -0700
Committer: Gunnar Tapper <gtapper@esgyn.local>
Committed: Mon Dec 7 09:07:09 2015 -0700

----------------------------------------------------------------------
 docs/src/site/markdown/architecture-overview.md |   3 +
 docs/src/site/markdown/code-organization.md     |  47 ++---
 docs/src/site/markdown/contribute.md            |  57 +++---
 docs/src/site/markdown/index.md                 |  34 ++--
 docs/src/site/markdown/release-notes-1-3-0.md   |  13 +-
 docs/src/site/markdown/release-notes.md         |  23 +--
 docs/src/site/markdown/website.md               |  52 +++--
 docs/src/site/resources/css/site.css            |  21 ++-
 .../resources/images/carousel/processes.png     | Bin 492019 -> 129503 bytes
 .../resources/images/carousel/revolution.png    | Bin 185424 -> 66062 bytes
 .../site/resources/images/carousel/scale.png    | Bin 236303 -> 93783 bytes
 .../site/resources/images/carousel/stack.png    | Bin 408722 -> 102472 bytes
 .../site/resources/images/carousel/timeline.png | Bin 322888 -> 115681 bytes
 docs/src/site/site.xml                          | 189 +++++++++++++++----
 14 files changed, 288 insertions(+), 151 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1c617ae3/docs/src/site/markdown/architecture-overview.md
----------------------------------------------------------------------
diff --git a/docs/src/site/markdown/architecture-overview.md 
b/docs/src/site/markdown/architecture-overview.md
index 658e91a..2619d3c 100644
--- a/docs/src/site/markdown/architecture-overview.md
+++ b/docs/src/site/markdown/architecture-overview.md
@@ -11,6 +11,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
+This page provides information about the Trafodion architecture.
+
+# Introduction
 
 Trafodion provides an operational SQL engine on top of Hadoop -- a solution 
targeted toward operational workloads in the Hadoop Big Data environment. 
Included are:
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1c617ae3/docs/src/site/markdown/code-organization.md
----------------------------------------------------------------------
diff --git a/docs/src/site/markdown/code-organization.md 
b/docs/src/site/markdown/code-organization.md
index f8e3119..1ba2057 100644
--- a/docs/src/site/markdown/code-organization.md
+++ b/docs/src/site/markdown/code-organization.md
@@ -11,40 +11,17 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
+This page describes how the Trafodion source tree is organized.
 
-# Code Organization
-The Trafodion source repository is organized as follows:
+**Under Construction**
 
-## Connectivity ##
-<span>
-  <table>
-    <tr>
-      <th>Directory</th>
-      <th>Contains</th>
-    </tr>
-    <tr>
-      <td><code>core/conn/jdbc_type2</code></td>
-      <td>JDBC type-4 client-side driver</td>
-    </tr>
-    <tr>
-      <td><code>jdbc_type4</code></td>
-      <td></td>
-    </tr>
-    <tr>
-      <td><code>odb</code></td>
-      <td></td>
-    </tr>
-    <tr>
-      <td><code>odbc</code></td>
-      <td></td>
-    </tr>
-    <tr>
-      <td><code>security_dll</code></td>
-      <td></td>
-    </tr>
-    <tr>
-       <td><code>unixodbc</code></td>
-       <td></td>
-    </tr>
-  </table>
-</span>
+# Connectivity
+
+Directory                                       | Contains
+------------------------------------------------|----------------------------------------------
+**```core/conn/jdbc_type2```**                  | JDBC type-4 client-side 
driver
+**```jdbc_type4````**                           | |
+**```odb```**                                   | |
+**```odbc```**                                  | |
+**```security_dll```**                          | |
+**```unixodbc```**                              | |

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1c617ae3/docs/src/site/markdown/contribute.md
----------------------------------------------------------------------
diff --git a/docs/src/site/markdown/contribute.md 
b/docs/src/site/markdown/contribute.md
index 81ea3d9..356f398 100644
--- a/docs/src/site/markdown/contribute.md
+++ b/docs/src/site/markdown/contribute.md
@@ -2,9 +2,9 @@
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
-
+ 
       http://www.apache.org/licenses/LICENSE-2.0
-
+ 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -12,57 +12,58 @@
   limitations under the 
   License.
 -->
+This page describes how you can contribute to the Trafodion project.
+
 <div class="alert alert-dismissible alert-info">
   <button type="button" class="close" data-dismiss="alert">&close;</button>
-  <p>Contributing to this project is open to every person caring for the 
improvement of its product(s) and/or its community — anyone willing to 
further the project.</p>
-
-<p>If you want to do more; for example, be recognized for your commitment or 
be eligible for privileges (privileges to commit changes to the code base or 
have a binding vote on the directions of this project), then please follow 
steps outlined on this page.</p>
+  <p style="color:black">Contributing to this project is open to every person 
interested in the improvement of its product(s) and/or its community — anyone 
willing to further the project.</p>
+  <p style="color:black">If you want to do more; for example, be recognized 
for your commitment or be eligible for privileges (privileges to commit changes 
to the code base or have a binding vote on the directions of this project), 
then please follow steps outlined on this page.</p>
 </div>
-
-First of all, a big **Thank You** from us for evaluating and/or using our 
products. We truly appreciate it! Our products exist and continues to improve 
thanks to you. But you can help us and yourself more!
-
-We are a community of volunteers working with the guidelines and policies of 
the Apache Software Foundation (the Apache Way) in mind. Therefore, we welcome 
any kind of input you can provide to create better products. These 
contributions, whether you think of reporting bugs, supplying code 
enhancements, improvements to our documentation, answering questions in our 
mailing lists, or anywhere else are valuable to us. Because these will help us 
in helping you.
-
-Your first step toward more involvement in our project is to subscribe to one 
of our [mailing lists](mail-lists.html). Next, please consider making your 
first contribution by simply sending an e-mail to our community discussing; for 
example:
-
+ 
+First of all, a big **Thank You** from us for your interest in evaluating 
and/or using Trafodion. We truly appreciate it! Trafodion exists and continues 
to improve thanks to you. But you can help us and yourself more!
+ 
+We are a community of volunteers working with the guidelines and policies of 
the Apache Software Foundation (the Apache Way) in mind. In that spirit, we 
welcome any kind of input you can provide to create better products. These 
contributions, whether you think of reporting bugs, supplying code 
enhancements, making improvements to our documentation, answering questions in 
our mailing lists, or anywhere else are valuable to everyone. Because each of 
these helps all of us make Trafodion better.
+ 
+Your first step toward more involvement in our project is to subscribe to one 
or more of our [mailing lists](mail-lists.html). Next, please consider making 
your first contribution by simply sending an e-mail to our community 
discussing; for example:
+ 
 * What you like about Trafodion and its documentation.
 * What you find missing.
-* A bug you encountered.
+* An issue you encountered.
 
 Or, help us by writing articles, blog posts, or sharing information about 
Trafodion at conferences and on social media such as Twitter (\#trafodion).
- 
----
 
+---
+ 
 ## Contribution Ideas
-You've made your first contribution. Now, you can get more involved. For 
example:
-
+You've made your first contribution. Now, we’re eager to help you get more 
involved. For example, you can:
+ 
 * Reply to questions, and/or share your viewpoint on how to get issues 
resolved.
 * Add to our [FAQ](faq.html), [Web Site](website.html), or [Wiki](wiki.html).
 * Share your code and document patches through our [issue tracking 
system](issue-tracking.html) (Jira).
 * Evaluate bugs and proposed improvements provided by others in our team.
 * Help with outlining and evaluating the future direction of our project and 
the development iterations of our products.
-
+ 
 ## Contribution Areas
-Want to be even more involved? Some areas you should consider:
-
+Want to be even more involved? Some areas you could consider:
+ 
 * Source code (bugs and improvements) contributions
 * Documentation assistance
 * Product and feature suggestions
 * Detailed and constructive feedback
 * Articles (case studies, white papers, etc) and presentations (speeches) 
about how our products helps or helped you.
-
+ 
 These are just ideas to get you started. If you feel we missed something 
there, please let us know (via our [mailing lists](mail-lists.html) ). 
Together, we can grow Trafodion and its community.
-
+ 
 ----
-
+ 
 ## Becoming a Registered Contributor
-Do you want to be recognized on the [Team page](team-list.html) like many of 
us are? If so, please do the following:
-
+Do you want to be recognized on the [Team page](team-list.html) like many 
other contributors? If so, please do the following:
+ 
 1. Send an email to the dev mailing list of the project stating that you, as a 
contributor, want to do more and be listed on the Team page. Any community 
member with edit permissions to the source code can then add your details to 
the list. 
 2. Send your [**ICLA**](https://www.apache.org/licenses/icla.txt) to the 
secretary of the Apache Software Foundation. Refer to the 
[Licenses](http://www.apache.org/licenses/) page for information about this 
requirement. 
-
+ 
     As soon as you have your ICLA registration confirmed, inform the 
community. You can now be added (by designated space admins) to:
-
+ 
     * The Trafodion Confluence Contributors group, so that you can add new and 
edit existing wiki pages.
     * The Trafodion JIRA Contributors group, so that you can assign yourself 
to any open issue in order to bring it further to resolution and/or closure.
-
+ 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1c617ae3/docs/src/site/markdown/index.md
----------------------------------------------------------------------
diff --git a/docs/src/site/markdown/index.md b/docs/src/site/markdown/index.md
index 19f7a61..973fea7 100644
--- a/docs/src/site/markdown/index.md
+++ b/docs/src/site/markdown/index.md
@@ -15,7 +15,7 @@
 
 [![Next Hadoop Wave](images/carousel/revolution.png)][revolution]
 
-Trafodion brings enterprise-clas operational workloads to Hadoop! You can now 
run all of your data workloads on a single platform based on Hadoop.
+Trafodion brings enterprise-class operational workloads to Hadoop! You can now 
run all of your data workloads on a single platform based on Hadoop.
 
 
 #### [Hadoop-Scale with SQL Access][scale]
@@ -80,23 +80,23 @@ Trafodion builds on the scalability, elasticity, and 
flexibility of Hadoop. Traf
 </center>
 <ul>
 <li><a href="architecture-overview.html">Architecture</a></li>
-<li>Documentation</li>
-<li>Videos</li>
-<li>Frequently asked questions</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="25%" valign="top">
 <center>
 <h2>Use</h2>
 <img src="images/logos/use.png" width="108" height="108"/>
-<h4>Download and Try Trafodion</h4>
+<h4>Download and try Trafodion</h4>
 <div class="customHr">.</div>
 </center>
 <ul>
-<li><a href="index.html">Features</a> and roadmap</li>
-<li>Release Notes</li>
-<li>Download and install</li>
-<li>Quick Start</li>
+<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="release-notes.html">Release Notes</a></li>
 </ul>
 </td>
 <td width="25%" valign="top">
@@ -107,10 +107,10 @@ Trafodion builds on the scalability, elasticity, and 
flexibility of Hadoop. Traf
 <div class="customHr">.</div>
 </center>
 <ul>
-<li>Development environment</li>
-<li>Software architecture.</li>
-<li>Contribution workflow</li>
-<li>Participation</li>
+<li><a href="develop.html">Develop</a></li>
+<li><a href="test.html">Test</a></li>
+<li><a href="document.html">Document</a></li>
+<li><a href="advocate.html">Advocate</a></li>
 </ul>
 </td>
 <td width="25%" valign="top">
@@ -121,10 +121,10 @@ Trafodion builds on the scalability, elasticity, and 
flexibility of Hadoop. Traf
 <div class="customHr">.</div>
 </center>
 <ul>
-<li>Join project team</li>
-<li>Community communication</li>
-<li>Conferences and meetups</li>
-<li>Events Calendar</li>
+<li><a href="contribute.html">Join</a></li>
+<li><a href="mail-lists.html">Discuss</a></li>
+<li><a href="calendar.html">Calendar</a></li>
+<li><a href="presentations.html">Presentations</a></li>
 </ul>
 </td>
 </tr>

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1c617ae3/docs/src/site/markdown/release-notes-1-3-0.md
----------------------------------------------------------------------
diff --git a/docs/src/site/markdown/release-notes-1-3-0.md 
b/docs/src/site/markdown/release-notes-1-3-0.md
index 26c4257..94e8eb5 100644
--- a/docs/src/site/markdown/release-notes-1-3-0.md
+++ b/docs/src/site/markdown/release-notes-1-3-0.md
@@ -12,12 +12,11 @@
   limitations under the License.
 -->
 
-# Release 1.3.0
 This is the first release of the Apache Trafodion (incubating) project. In 
addition to including a number of new features and improvements across the 
project, the focus of this release is to comply with Apache release guidelines.
 
 Build instructions are available 
[here](https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=61316378).
 
-## Supported Platforms
+# Supported Platforms
 The following platforms are supported in this release.
 
 <span>
@@ -95,7 +94,7 @@ This release contains the following new features.
   </table>
 </span>
 
-## Improvements
+# Improvements
 This release contains the following improvements.
 
 <span>
@@ -138,13 +137,13 @@ This release contains the following improvements.
   </table>
 </span>
 
-## Fixes
+# Fixes
 
 This release contains fixes for 114 bugs.
 
-## Known Issues
+# Known Issues
 
-### HBase Lease Timeout Patch
+## HBase Lease Timeout Patch
 
 HBase uses a lease mechanism to protect against memory leaks in Region Servers 
caused by potential client instabilities that would open scanners, but die 
before having the opportunity to close cleanly and release resources. This 
mechanism relies on a server side timer, configured by the 
'hbase.client.scanner.timeout.period' parameter in 'hbase-site.xml'. If a 
client fails to call 'next()' within the timeout period, the server will assume 
the client died, and will force close the server side scanner and release 
resources. However, in Trafodion, there are legitimate use cases where client 
is busy doing heavy processing, and needs more time than specified in the 
default scanner timeout value.  Increasing the 
'hbase.client.scanner.timeout.period' value has the side effect of weakening 
the safety mechanism previously described. 
 
@@ -154,7 +153,7 @@ The HBase community agrees that the correct behavior of 
this safety feature shou
       <name>hbase.trafodion.patchclientscanner.enabled</name>
       <value>true</value> 
       <description>
-        Enable a Trafodion feature to allow a client to reset the HBase 
scanner and resume where it left off instead of throwing an exception upon 
expiry of the HBase hbase.client.scanner.timeout.period timer.
+        Enable a Trafodion feature to allow a client to reset the HBase 
scanner and resume where it left off instead of throwing an exception upon 
expiration of the HBase hbase.client.scanner.timeout.period timer.
       </description>
     </property>
     

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1c617ae3/docs/src/site/markdown/release-notes.md
----------------------------------------------------------------------
diff --git a/docs/src/site/markdown/release-notes.md 
b/docs/src/site/markdown/release-notes.md
index 19f46e8..79518d0 100644
--- a/docs/src/site/markdown/release-notes.md
+++ b/docs/src/site/markdown/release-notes.md
@@ -12,20 +12,13 @@
   limitations under the License.
 -->
 
-# Release Notes
 The following releases have been created for Trafodion.
 
-<span>
-  <table>
-    <tr>
-      <th>Release</th>
-      <th>Description</th>
-      <th>Date</th>
-    </tr>
-    <tr>
-      <td><a href="release-notes-1-3-0.html"><strong>1.3.0</strong></a></td>
-      <td>First Apache Release.</td>
-      <td>November 16, 2015</td>
-    </tr>
-  </table>
-</span>
\ No newline at end of file
+Release                               | Description                            
                               | Date
+--------------------------------------|-----------------------------------------------------------------------|--------------
+**[1.3.0](release-notes-1-3-0.html)** | First Apache release.                  
                               | November 2015
+**[1.1.0](release-notes-1-1-0.html)** | Major feature enhancements. Non-Apache 
release.                       | April 2015
+**[1.0.1](release-notes-1-0-1.html)** | Defect repair. Non-Apache release.     
                               | February 2015
+**[1.0.0](release-notes-1-0-0.html)** | Performance, stability, and new 
features. Non-Apache release.         | January 2015
+**[0.9.0](release-notes-0-9-0.html)** | HBase 0.98 and many feature 
improvements. Non-Apache release.         | October 2014
+**[0.8.0](release-notes-0-8-0.html)** | Initial release. Basic SQL and ACID 
transactions. Non-Apache release. | June 2014

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1c617ae3/docs/src/site/markdown/website.md
----------------------------------------------------------------------
diff --git a/docs/src/site/markdown/website.md 
b/docs/src/site/markdown/website.md
index 4321788..6d98b71 100644
--- a/docs/src/site/markdown/website.md
+++ b/docs/src/site/markdown/website.md
@@ -12,9 +12,18 @@
   limitations under the 
   License.
 -->
-# Making Changes
+This page describes how to change the Trafodion web pages. Please refer to the 
[Contribute](contribute.html) page for information about other ways to 
contribute to the Trafodion project.
+
+#Organization
+
+**Source**: **```docs/src```** in the Trafodion source tree.
+
+**Publication:** 
https://git-wip-us.apache.org/repos/asf/incubator-trafodion-site.git
+
+You develop and test all changes in the Trafodion source tree. Once checked in 
and built, the content of ```docs/target``` plus different 
[documentation](document.html) are copied to 
https://git-wip-us.apache.org/repos/asf/incubator-trafodion-site.git. The 
changes are then pushed out by Apache 
[svnpubsub](http://svn.apache.org/viewvc/subversion/trunk/tools/server-side/svnpubsub/),
 thereby populating http://incubator.trafodion.apache.org.
 
-The Trafodion web site is part of the Trafodion source tree. The following 
information helps you understand how to make changes to the web-site content.
+# Making Changes
+The following information helps you understand how to make changes to the 
web-site content.
 
 ----
 
@@ -25,40 +34,55 @@ The Trafodion website uses the following technologies:
 * **Framework**: [Apache Maven Site](https://maven.apache.org)
 * **Skin**: [Reflow Maven 
Skin](http://andriusvelykis.github.io/reflow-maven-skin/) 
 * **Theme**: [Bootswatch Cerulean](http://bootswatch.com/cerulean)
-* **Markup**: [markdown](https://daringfireball.net/projects/markdown/syntax) 
+* **Markdown**: 
[markdown](https://guides.github.com/features/mastering-markdown/) 
+
+<a href="#" class="btn btn-primary btn-xs">Note</a> **```markdown```** was 
chosen since it supports inline HTML, which provides better table control than 
APT. Asciidoc does not work well with the Reflow Maven Skin — we tested.
 
-<a href="#" class="btn btn-primary btn-xs">Note</a> **<code>markdown</code>** 
was chosen since it supports inline HTML, which provides better table control 
than APT. Asciidoc does not work well with the Reflow Maven Skin — we tested.
+**Note**: Markdown supports basic tables only; that is, you'll need to use 
```<table>``` HTML definitions for formatted tables such as cells with bullet 
lists.
 
 ## Code Organization
 
-The code is located in the **<code>docs</code>** directory. The code 
organization follows the [Maven 
standard](https://maven.apache.org/guides/mini/guide-site.html).
+The code is located in the **```docs```** directory. The code organization 
follows the [Maven 
standard](https://maven.apache.org/guides/mini/guide-site.html).
 
-**<code>docs/src/site.xml</code>** is configured per the [Reflow Maven Skin 
documentation](http://andriusvelykis.github.io/reflow-maven-skin/skin/). Pages 
and menus are defined and configured in this file. By default, all pages use an 
automated table of contents; override as needed.
+**```docs/src/site.xml```** is configured per the [Reflow Maven Skin 
documentation](http://andriusvelykis.github.io/reflow-maven-skin/skin/). Pages 
and menus are defined and configured in this file. By default, all pages use an 
automated table of contents; override as needed.
 
-**<code>docs/src/site/markdown</code>** contains the files that generate the 
different HTML files.
+**```docs/src/site/markdown```** contains the files that generate the 
different HTML files.
 
-**<code>docs/target</code>** contains the generated HTML files after you run a 
build.
+**```docs/target```** contains the generated HTML files after you run a build.
 
 ## Managing Pages
 
-You add/rename/delete pages in **<code>docs/src/site/markdown</code>**. You 
make corresponding changes in **<code>docs/src/site.xml</code>** 
adding/renaming/deleting pages from menus and defining page configuration; for 
example: removal of the table of contents bar and the special page formatting 
provided by the Reflow skin. Refer to the [Maven 
Documentation](http://maven.apache.org/plugins/maven-site-plugin/examples/sitedescriptor.html)
 for more information.
+You add/rename/delete pages in **```docs/src/site/markdown```**. You make 
corresponding changes in **```docs/src/site.xml```** adding/renaming/deleting 
pages from menus and defining page configuration; for example: removal of the 
table of contents bar and the special page formatting provided by the Reflow 
skin. Refer to the [Maven 
Documentation](http://maven.apache.org/plugins/maven-site-plugin/examples/sitedescriptor.html)
 for more information.
 
 ## Providing Content
 
 When possible, ensure that you write in active voice and to the point. 
 
-Special functions such as buttons etc. can be access by clicking **Preview** 
in the theme preview. There's a \<\> feature on each function, which allows you 
to copy the special **<code>\<div\></code>** you need to insert the selected 
object.
+Special functions such as buttons etc. can be access by clicking **Preview** 
in the theme preview. There's a \<\> feature on each function, which allows you 
to copy the special **```\<div\>```** you need to insert the selected object.
 
 ## Development Environment
 
-Typically, you'll use Eclipse to develop and build the website pages. The 
configuration goal is: **<code>clean site</code>**. The 
**<code>pom.xml</code>** file in the top-level directory drives the build steps 
for the web site.
+Typically, you'll use Eclipse to develop and build the website pages. The 
configuration goal is: **```clean site```**. The **```pom.xml```** file in the 
top-level directory drives the build steps for the web site.
 
 ## Testing Changes
 
-The website files are located in **<code>docs/target</code>**. Open 
**<code>index.html</code>** from your browser and test your changes. For 
example, you want to validate the page layout, page navigation, links, and 
review the overall content on the pages you modified or added/deleted.
+The website files are located in **```docs/target```**. Open 
**```index.html```** from your browser and test your changes. For example, you 
want to validate the page layout, page navigation, links, and review the 
overall content on the pages you modified or added/deleted.
 
 ----
 
-# Publishing Web Site
+# Publishing
+
+<div class="alert alert-dismissible alert-info">
+  <button type="button" class="close" data-dismiss="alert">&close;</button>
+  <p style="color:black">Publication is done when a committer is ready to 
update the external web site. You do <strong>not</strong> perform these steps 
as part of checking in changes.</p></div>
+
+Do the following:
+
+1. Check in your changes to the Trafodion source tree.
+2. Build Trafodion.
+3. If there are documentation changes: Follow the [documentation 
publishing](document.html#Publishing) instructions.
+3. ```svn checkout``` 
https://git-wip-us.apache.org/repos/asf/incubator-trafodion-site.git
+4. Copy content of ```docs/target``` into the svn ```asf-site``` directory.
+5. ```svn commit``` the changes. 
 
-To be written.   
\ No newline at end of file
+Once committed, Apache 
[svnpubsub](http://svn.apache.org/viewvc/subversion/trunk/tools/server-side/svnpubsub/)
 takes care of populating http://incubator.trafodion.apache.org with your new 
changes.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1c617ae3/docs/src/site/resources/css/site.css
----------------------------------------------------------------------
diff --git a/docs/src/site/resources/css/site.css 
b/docs/src/site/resources/css/site.css
index 3685589..72806f2 100644
--- a/docs/src/site/resources/css/site.css
+++ b/docs/src/site/resources/css/site.css
@@ -21,8 +21,8 @@
 * @@@ END COPYRIGHT @@@ 
  */
  
- .color-highlight {
-       color: #225E9B;
+.color-highlight {
+       color: red;
 }
 
 body {
@@ -41,7 +41,14 @@ body[class*="page-themes-bootswatch"] .color-highlight {
        margin-top: 10px;
 }
 
-/*h1, */h2 {
+h1 {
+  margin-top: 50px;
+  color: #1a334c;
+  border-bottom: 1px gray;
+  width:100%; 
+}
+
+h2 {
   margin-top: 30px;
 }
 
@@ -60,6 +67,14 @@ h3, h4, h5, h6 {
     margin-bottom: 10px;
 }
 
+/* Override the default static position to ensure correct placement on small 
screens */
+/* Bottom gives space between the box and the following text. */
+.carousel-caption {
+  position: relative;
+  bottom: 5px;
+}
+
+/* Color of the heading in the text box */
 .carousel-caption a {
   color: white;
 }

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1c617ae3/docs/src/site/resources/images/carousel/processes.png
----------------------------------------------------------------------
diff --git a/docs/src/site/resources/images/carousel/processes.png 
b/docs/src/site/resources/images/carousel/processes.png
index 3a183c8..772aa50 100644
Binary files a/docs/src/site/resources/images/carousel/processes.png and 
b/docs/src/site/resources/images/carousel/processes.png differ

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1c617ae3/docs/src/site/resources/images/carousel/revolution.png
----------------------------------------------------------------------
diff --git a/docs/src/site/resources/images/carousel/revolution.png 
b/docs/src/site/resources/images/carousel/revolution.png
index 51d60cf..a90a754 100644
Binary files a/docs/src/site/resources/images/carousel/revolution.png and 
b/docs/src/site/resources/images/carousel/revolution.png differ

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1c617ae3/docs/src/site/resources/images/carousel/scale.png
----------------------------------------------------------------------
diff --git a/docs/src/site/resources/images/carousel/scale.png 
b/docs/src/site/resources/images/carousel/scale.png
index 8702614..58f488d 100644
Binary files a/docs/src/site/resources/images/carousel/scale.png and 
b/docs/src/site/resources/images/carousel/scale.png differ

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1c617ae3/docs/src/site/resources/images/carousel/stack.png
----------------------------------------------------------------------
diff --git a/docs/src/site/resources/images/carousel/stack.png 
b/docs/src/site/resources/images/carousel/stack.png
index 553686a..7cb7673 100644
Binary files a/docs/src/site/resources/images/carousel/stack.png and 
b/docs/src/site/resources/images/carousel/stack.png differ

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1c617ae3/docs/src/site/resources/images/carousel/timeline.png
----------------------------------------------------------------------
diff --git a/docs/src/site/resources/images/carousel/timeline.png 
b/docs/src/site/resources/images/carousel/timeline.png
index c0aedf7..0bfd84c 100644
Binary files a/docs/src/site/resources/images/carousel/timeline.png and 
b/docs/src/site/resources/images/carousel/timeline.png differ

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1c617ae3/docs/src/site/site.xml
----------------------------------------------------------------------
diff --git a/docs/src/site/site.xml b/docs/src/site/site.xml
index 4703bc0..a057a09 100644
--- a/docs/src/site/site.xml
+++ b/docs/src/site/site.xml
@@ -66,7 +66,7 @@
         <column>About</column>
         <column>Using</column>
         <column>Features</column>
-        <column>Reference</column>
+        <column>Contributing</column>
       </bottomNav>
       <bottomDescription>
         <![CDATA[
@@ -94,9 +94,13 @@
             <body />
           </sections>
         </index>
+        <advocate><shortTitle>Advocate</shortTitle></advocate>
         <architecture-overview><shortTitle>Architecture 
Overview</shortTitle></architecture-overview>
+        <build><shortTitle>Build Trafodion</shortTitle></build>
+        <build-tools-manual><shortTitle>Build Tools Manual 
Installation</shortTitle></build-tools-manual>
+        <code><shortTitle>Modify Code</shortTitle></code>
         <contribute>
-           <shortTitle>How to Contribute</shortTitle>
+           <shortTitle>Contribute</shortTitle>
            <toc>false</toc>
           <sections>
             <body />
@@ -104,23 +108,119 @@
             <body />
           </sections>
         </contribute>
+        <cplusplus-coding-guidelines>
+           <shortTitle>C++ Coding Guidelines</shortTitle>
+           <!--  Smaller than standard due to long headings -->
+           <tocTopMax>5</tocTopMax>
+          <!-- Use H1 headings only for the TOC -->
+          <tocTopFlatten>false</tocTopFlatten>      
+        </cplusplus-coding-guidelines>
+        <create-dev-environment>
+           <shortTitle>Create Development Environment</shortTitle>
+           <!-- Use H1 headings only for the TOC -->
+           <tocTopFlatten>false</tocTopFlatten>
+           <!--  Smaller than standard due to long headings -->
+           <tocTopMax>5</tocTopMax>
+        </create-dev-environment>
         <develop>
-           <shortTitle>How to Develop</shortTitle>
+           <shortTitle>Develop</shortTitle>
           <sections>
             <body />
           </sections>
         </develop>
+        <document><shortTitle>Modify Documentation</shortTitle></document>
+        <documentation><shortTitle>Documentation 
Library</shortTitle></documentation>
+        <download><shortTitle>Download</shortTitle></download>
+        <enable-secure-trafodion><shortTitle>Enabling Security Features in 
Trafodion</shortTitle></enable-secure-trafodion>
         <faq>
           <toc>top</toc>
           <shortTitle>Frequently Asked Questions</shortTitle>
+          <!-- Use H1 headings only for the TOC -->
           <tocTopFlatten>false</tocTopFlatten>
         </faq>
+        <install>
+          <shortTitle>Install</shortTitle>
+          <!-- Use H1 headings only for the TOC -->
+          <tocTopFlatten>false</tocTopFlatten>
+        </install>
+        <install-preparation>
+          <shortTitle>Install Preparation</shortTitle>
+          <!-- Use H1 headings only for the TOC -->
+          <tocTopFlatten>false</tocTopFlatten>
+        </install-preparation>
         <issue-tracking><toc>false</toc></issue-tracking>
-        <license><toc>false</toc></license>
-        <mail-lists><toc>false</toc></mail-lists>
+        <ldapcheck><shortTitle>ldapcheck</shortTitle></ldapcheck>
+        
<ldapconfigcheck><shortTitle>ldapconfigcheck</shortTitle></ldapconfigcheck>
+        <license><shortTitle>License</shortTitle><toc>false</toc></license>
+        <mail-lists><shortTitle>Mailing 
Lists</shortTitle><toc>false</toc></mail-lists>
+        <management><shortTitle>Managing 
Trafodion</shortTitle><toc>false</toc></management>
+        <manage-dev-environment>
+           <shortTitle>Manage Development Environment</shortTitle>
+           <!-- Use H1 headings only for the TOC -->
+           <tocTopFlatten>false</tocTopFlatten>
+           <!--  Smaller than standard due to long headings -->
+           <tocTopMax>5</tocTopMax>
+        </manage-dev-environment>
+        <new-features><shortTitle>New Features</shortTitle></new-features>
+        <performance><shortTitle>Performance</shortTitle></performance>
+        
<presentations><shortTitle>Presentations</shortTitle><toc>false</toc></presentations>
+        <port-assignment>
+          <toc>false</toc>
+          <shortTitle>Port Assignment</shortTitle>
+        </port-assignment>
+        <quickstart><shortTitle>Quick Start</shortTitle></quickstart>
         <release-notes><toc>false</toc></release-notes>
+        <release-notes-1-3-0>
+           <shortTitle>Release 1.3.0</shortTitle>
+           <!-- Use H1 headings only for the TOC -->
+           <tocTopFlatten>false</tocTopFlatten>
+        </release-notes-1-3-0>
+        <release-notes-1-1-0>
+           <shortTitle>Release 1.1.0</shortTitle>
+           <!-- Use H1 headings only for the TOC -->
+           <tocTopFlatten>false</tocTopFlatten>
+        </release-notes-1-1-0>
+        <release-notes-1-0-1>
+           <shortTitle>Release 1.0.1</shortTitle>
+           <!-- Use H1 headings only for the TOC -->
+           <tocTopFlatten>false</tocTopFlatten>
+        </release-notes-1-0-1>
+        <release-notes-1-0-0>
+           <shortTitle>Release 1.0.0</shortTitle>
+           <!-- Use H1 headings only for the TOC -->
+           <tocTopFlatten>false</tocTopFlatten>
+        </release-notes-1-0-0>
+        <release-notes-0-9-0>
+           <shortTitle>Release 0.9.0</shortTitle>
+           <!-- Use H1 headings only for the TOC -->
+           <tocTopFlatten>false</tocTopFlatten>
+        </release-notes-0-9-0>
+        <release-notes-0-8-0>
+           <shortTitle>Release 0.8.0</shortTitle>
+           <!-- Use H1 headings only for the TOC -->
+           <tocTopFlatten>false</tocTopFlatten>
+        </release-notes-0-8-0>
+        <roadmap><shortTitle>Roadmap</shortTitle></roadmap>
+        <setup-build-environment>
+           <shortTitle>Setup Build Environment</shortTitle>
+           <!-- Use H1 headings only for the TOC -->
+           <tocTopFlatten>false</tocTopFlatten>
+           <!--  Smaller than standard due to long headings -->
+           <tocTopMax>5</tocTopMax>
+        </setup-build-environment>
+        <tests>
+          <shortTitle>Modify Tests</shortTitle>
+          <!-- Use H1 headings only for the TOC -->
+          <tocTopFlatten>false</tocTopFlatten>
+        </tests>
+        <testing>
+          <shortTitle>Testing</shortTitle>
+          <!-- Use H1 headings only for the TOC -->
+          <tocTopFlatten>false</tocTopFlatten>
+        </testing>
+        <traf_authentication_config><shortTitle>.traf_authentication_config 
Configuration File</shortTitle></traf_authentication_config>
         <website>
-           <shortTitle>How to Update Web Site</shortTitle>
+           <shortTitle>Modify Web Site</shortTitle>
            <tocTopFlatten>false</tocTopFlatten>
            <sections>
               <body />
@@ -137,6 +237,9 @@
     <breadcrumbs>
       <item name="Trafodion" href="index.html"/>
     </breadcrumbs>
+    <links>
+      <item name="Download" href="download.html"/>
+    </links>
     <menu name="About">
       <item href="index.html" name="Project Overview"/>
       <item href="new-features.html" name="New Features"/>
@@ -150,45 +253,67 @@
       <item href="source-repository.html" name="Source Repository"/>
       <item href="issue-tracking.html" name="Issue Tracking"/>
       <item href="license.html" name="License"/>
-      <item href="http:divider" name=""/>
-      <item href="download.html" name="Download"/>
-      <item href="install.html" name="Install"/>
     </menu>
     <menu name="Using">
-      <item href="faq.html" name="F.A.Q."/>
       <item href="quickstart.html" name="Quick Start"/>
+      <item href="download.html" name="Download"/>
+      <item href="install.html" name="Install"/>
+      <item href="management.html" name="Managing Trafodion"/>
+      <item href="http:divider" name=""/>
+      <item href="documentation.html" name="Documentation"/>
+      <item href="faq.html" name="FAQ"/>
+      <item href="release-notes.html" name="Release Notes"/>
       <item href="http:divider" name=""/>
       <item href="udf-tutorial.html" name="UDF API Tutorial"/>
     </menu>
     <menu name="Features">
       <item href="architecture.html" name="Architecture Overview"/>
-      <item href="technology-previews.html" name="Technology Preview"/>
-    </menu>
-    <menu name="Documentation">
-      <item href="documentation.html" name="Documenation Library"/>
-      <item href="http:divider" name=""/>
-      <item href="release-notes.html" name="Release Notes"/>
-      <item href="install.html" name="Installation Guide"/>
-      <item href="docs/apache_trafodion_client_installation_guide.pdf" 
name="Client Installation Guide"/>
       <item href="http:divider" name=""/>
-      <item href="docs/apache_trafodion_reference_guide.pdf" name="SQL 
Reference Guide"/>
-      <item href="connectivity-reference" name="Connectivity Reference Guide"/>
-      <item href="docs/apache_trafodion_trafci_guide.pdf" name="Command 
Interface Guide"/>
-      <item href="rest-reference" name="REST Reference Guide"/>
+      <item 
href="https://blueprints.launchpad.net/trafodion/+spec/security-ansi-schemas"; 
name="ANSI Schema Support"/>
+      <item 
href="https://blueprints.launchpad.net/trafodion/+spec/ustat-automation"; 
name="Automated Update Statistics"/>
+      <item href="https://blueprints.launchpad.net/trafodion/+spec/bulkunload"; 
name="Bulk Unload"/>
+      <item 
href="https://wiki.trafodion.org/wiki/index.php/Trafodion_Manageability#Logging_Events";
 name="Event Handling"/>
+      <item 
href="https://blueprints.launchpad.net/trafodion/+spec/hybrid-query-cache"; 
name="Hybrid Query Cache"/>
+      <item 
href="https://blueprints.launchpad.net/trafodion/+spec/identity-column"; 
name="Identity Column"/>
+      <item 
href="https://wiki.trafodion.org/wiki/index.php/Creating_Statistics_During_Bulk_Load";
 name="Immediate Update Statistics"/>
+      <item 
href="https://blueprints.launchpad.net/trafodion/+spec/lob-support"; name="Large 
Object (LOB)"/>
+      <item 
href="https://blueprints.launchpad.net/trafodion/+spec/ddl-query-invalidation"; 
name="Metadata Query Invalidation"/>
+      <item 
href="https://cwiki.apache.org/confluence/display/TRAFODION/Cmp-divisioning"; 
name="Multi-Temperature Data"/>
+      <item 
href="https://blueprints.launchpad.net/trafodion/+spec/access-external-hbase-tables";
 name="Native HBase Tables"/>
+      <item href="docs/Trafodion_odb_User_Guide.pdf" name="ODB"/>
+      <item 
href="https://blueprints.launchpad.net/trafodion/+spec/sql-query-cancel"; 
name="Query Cancel"/>
+      <item 
href="https://blueprints.launchpad.net/trafodion/+spec/security-privilege-updates";
 name="Privilege Checking"/>
+      <item 
href="https://wiki.trafodion.org/wiki/index.php/Trafodion_Manageability"; 
name="Repository"/>
+      <item 
href="https://blueprints.launchpad.net/trafodion/+spec/enable-get-statistics-thru-rms";
 name="Runtime Management System"/>
+      <item 
href="https://blueprints.launchpad.net/trafodion/+spec/sequence-numbers"; 
name="Sequence Numbers"/>
+      <item 
href="https://blueprints.launchpad.net/trafodion/+spec/skew-buster"; name="Skew 
Buster"/>
+      <item 
href="https://wiki.trafodion.org/wiki/index.php/Tutorial:_The_object-oriented_UDF_interface";
 name="Table-Oriented UDF"/>
+      <item 
href="https://wiki.trafodion.org/wiki/index.php/Data_Loading#Trickle_Loading_Data_Into_Trafodion_Tables";
 name="Trickle Load"/>
       <item href="http:divider" name=""/>
-      <item href="docs/apache_trafodion_odb_user_guide.pdf" name="ODB User 
Guide"/>
-      <item href="data-loading.html" name="Data Loading Guide"/>
-      <item href="open-cart.html" name="Opencart Demo Guide"/>
+      <item 
href="https://wiki.trafodion.org/wiki/index.php/Backup_and_Restore"; 
name="Backup/Restore Utility"/>
+      <item href="https://wiki.trafodion.org/wiki/index.php/Metadata_Cleanup"; 
name="Metadata Cleanup Utility"/>
     </menu>
     <menu name="Contributing">
-      <item href="contribute.html" name="How to Contribute"/>
-      <item href="develop.html" name="How to Develop"/>
-      <item href="release.html" name="How to Test"/>
-      <item href="release.html" name="How to Release"/>
-      <item href="website.html" name="How to Update Web Site"/>
-      <item href="wiki.html" name="How to Update Wiki Pages"/>
+      <item href="contribute.html" name="Contribute"/>
+      <item href="advocate.html" name="Advocate"/>
+      <item href="develop.html" name="Develop"/>
+      <item href="testing.html" name="Test"/>
+      <item href="merge.html" name="Merge"/>
+      <item href="release.html" name="Release"/>
+      <item href="http:divider" name=""/>
+      <item href="create-dev-environment.html" name="Create Dev Environment"/>
+      <item href="manage-dev-environment.html" name="Manage Dev Environment"/>
+      <item href="setup-build-environment.html" name="Setup Build 
Environment"/>
+      <item href="build.html" name="Build Trafodion"/>
+      <item href="http:divider" name=""/>
+      <item href="code.html" name="Modify Code"/>
+      <item href="tests.html" name="Modify Tests"/>
+      <item href="document.html" name="Modify Documentation"/>
+      <item href="website.html" name="Modify Web Site"/>
+      <item href="wiki.html" name="Modify Wiki Pages"/>
       <item href="http:divider" name=""/>
-      <item href="design-papers.html" name="Design Paper Template"/>
+      <item href="cplusplus-coding-guidelines.html" name="C++ Coding 
Guidelines"/>
+      <!-- item href="design-papers.html" name="Design Paper Template"/ -->
     </menu>
     <menu name="Apache">
       <item href="http://incubator.apache.org/projects/trafodion.html"; 
name="Status Page" target="_blank"/>


Reply via email to