Repository: incubator-trafodion
Updated Branches:
  refs/heads/master 70dd60219 -> fe92c7b6b


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/3063990d/docs/src/site/markdown/testing.md
----------------------------------------------------------------------
diff --git a/docs/src/site/markdown/testing.md 
b/docs/src/site/markdown/testing.md
deleted file mode 100644
index 17895de..0000000
--- a/docs/src/site/markdown/testing.md
+++ /dev/null
@@ -1,179 +0,0 @@
-<!--
-  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.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-This page describes the Trafodion test suites and their usage.
-
-# Component Tests
-Trafodion comes with several component-specific testing libraries.
-
-## SQL Core
-The SQL core components are written in a combination of C++ and Java. 
-
-You should ensure that the current set of regression tests pass each time you 
add or modify a SQL feature.
-
-If adding a new feature, then check that it is either covered by an existing 
regression test or add a new test to an existing test suite.
-
-### Test Suites
-**Location**: ```core/sql/regress```
-
-Directory              | Usage
------------------------|---------------------------------------------------------------------------
-**```catman1```**      | Tests the Catalog Manager.
-**```charsets```**     | Tests Character Sets.
-**```compGeneral```**  | Compiler test suite; tests optimizer-specific 
features.
-**```core```**         | Tests a subset/sample of all features from all the 
test suites.
-**```executor```**     | Tests the SQL Executor.
-**```fullstack2```**   | Similar to core but a very limited subset.
-**```hive```**         | Tests HDFS access to Hive tables.
-**```newregr```**      | Unused/Saved repository for some unpublished 
features. These are not run.
-**```qat```**          | Tests basic DDL and DML syntax.
-**```seabase```**      | Tests JNI interface to HBase.
-**```tools```**        | Regression driver scripts and general regression 
scripts.
-**```udr```**          | Tests the User Defined Routines (UDR) and TMUDF 
functionality.
-
-### Check Test Results
-On completion, the test run prints out a test summary. All tests should pass, 
or pass with known diffs.
-
-Test results are written to the **```runregr-sb.log```** file in each 
component's directory. Therefore, you can check the test results after the fact 
as follows:
-
-    cd $MY_SQROOT/rundir
-    grep FAIL */runregr-sb.log
- 
-A successful test run shows no failures.
-
-### Run Full Test Suite
-This suite tests:
-
-* SQL Compiler
-* SQL Executor
-* Transactions
-* Foundation
-
-
-Do the following:
-
-    cd $MY_SQHOME
-    . ./sqenv.sh
-    cd $MY_SQROOT/../sql/regress
-    tools/runallsb
-
-### Run Individual Test Suites
-You can select individual test suites as follows:
-
-    cd $MY_SQHOME
-    . ./sqenv.sh
-    cd $MY_SQROOT/../sql/regress
-    tools/runallsb <suite1> <suite2>
-
-### Running an Individual Test
-#### If You've Already Run the Test Suite
-If you have already run the suite once, then you will have all your 
directories set up and you can run one test as follows:
-
-    cd $MY_SQROOT/../sql/regress/<suite>
-    # You can add the following two exports to .bashrc or .profile for 
convenience
-    export rundir=$MY_SQROOT/rundir
-    export scriptsdir=$MY_SQROOT/../sql/regress
-    # run the test
-    cd $rundir/<suite>
-    $scriptsdir/<suite>/runregr -sb <test>
-
-**Example**
-
-    cd $rundir/executor
-    $scriptsdir/executor/runregr -sb TEST130
-
-#### If You've Not Run the Test Suite
-If you have not run any regression suites so far, then you will not have the 
required sub directories set up. You manually create them for each suite you 
want to run.
-
-    cd $MY_SQROOT/../sql/regress/<suite>
-    # You can add the following two exports to .bashrc or .profile for 
convenience
-    export rundir=$MY_SQROOT/rundir
-    export scriptsdir=$MY_SQROOT/../sql/regress
-    mkdir $rundir
-    cd $rundir
-    # <suitename> should match the name of each directory in $scriptsdir
-    mkdir <suitename>
-    # run the test
-    cd $rundir/<suite>
-    $scriptsdir/<suite>/runregr -sb <test>
-
-### Detecting Failures
-If you see failures in any of your tests, you want to try running that suite 
or test individually as detailed above.
- 
-Open up the DIFF file and correlate them to the LOG and EXPECTED files.
- 
-* DIFF files are in **```$rundir/<suite name>```**.
-* LOG files are in **```$rundir/<suite name>```**.
-* EXPECTED files are in **```$scriptsdir/<suite name>```**.
- 
-To narrow down the failure, open up the test file (for example: 
**```TEST130```**) in **```$scriptsdir/executor```**. 
-
-Recreate the problem with a smaller set of SQL commands and create a script to 
run from **```sqlci```**. If it's an issue that can be recreated only by 
running the whole suite, you can add a line to the test just before the command 
that fails to include a **```wait```** or a **```sleep```** **```sh sleep 
60```** will make the test pause and give you time to attach the 
**```sqlci```** process to the debugger. (You can find the PID of the 
**```sqlci```** process using **```sqps```** on the command line)
- 
-Introducing a **```wait```** in the test will wait forever until you enter a 
character. This is another way to make the test pause to attach the debugger to 
the **```sqlci```** process.    
-
-### Modifying an Existing Test
-If you would like to add coverage for your new change, you can modify an 
existing test.
-
-Run the test after your modifications. If you are satisfied with your results, 
you need to modify the **```EXPECTED<test number>```** file to reflect your new 
change. The standard way to do it is to copy the **```LOG<test number>```** 
file to **```EXPECTED<test number>```** file.
-
-## Database Connectivity Services (DCS)
-The DCS test suite is organized per the Maven standard. 
-
-## JDBC T4
-The code is written in Java, and is built and unit tested using Maven. The 
test suite organization and use follow Maven standards.
-
-Instructions for setting up and running the test can be found in source tree 
at **```dcs/src/test/jdbc_test```**.
-
-## ODBC Tests
-The code is written for the Python 2.7 
[```unittest```](https://docs.python.org/2/library/unittest.html) framework. 
-
-It is run via the **```Testr```** and **```Tox```**. 
-
-    cd dcs/src/test/pytests
-    ./config.sh -d <host>t:<port> -t <Location of your Linux ODBC driver tar 
file>
-    tox -e py27
-
-Further instructions for setting up and running the test can be found in 
source tree at **```dcs/src/test/pytests```**.
-
-# Functional Tests
-
-## Phoenix
-The Phoenix tests provides basic functional tests for Trafodion. These tests 
were originally adapted from their counterpart at salesforce.com.
-
-The tests are executed using Maven with a Python wrapper. You can run them the 
same way on your own workstation instance just like the way Jenkins runs them. 
Do the following:
-
-<!-- This part is done in raw HTML because it's too complex to do this level 
of formatting in markdown. -->
-<ol>
-   <li>Prior to running Phoenix tests, you need to bring up your Trafodion 
instance and DCS. You need to configure at least 2-4 servers for DCS. The tests 
need at least two mxosrvrs as they make two connections at any given time. We 
recommend configuring DCS with four mxosrvrs since we have seen situations that 
mxosrvrs do not get released in time for the next connection if there are only 
two mxosrvrs.</li>
-  <li><p>Run the Phoenix tests from source tree</p>
-       <p style="text-indent=20px">
-          <pre>
-cd tests/phx
-phoenix_test.py --target=&lt;host&gt;:&lt;port&gt; --user=dontcare 
--pw=dontcare --targettype=TR --javahome=&lt;jdk&gt; 
--jdbccp=&lt;jdir&gt;/jdbcT4.jar</pre>
-          </p>
-       <p style="text-indent=20px">
-         <ul>
-           <li><strong>&lt;host&gt;</strong>: your workstation name or IP 
address.</li>
-           <li><strong>&lt;port&gt;</strong>: your DCS master port number.</li>
-           <li><strong>&lt;jdk&gt;</strong>:  the directory containing the 
jdk1.7.0_21_64 or later version of the JDK.</li>
-           <li><strong>&lt;jdir&gt;</strong>: the directory containing your 
JDBC T4 jar file. (export/lib if you downloaded a Trafodion binary 
package.)</li>
-         </ul>
-       </p>
-  </li>
-  <li><p>Analyze the results. The test results can be found in 
<strong><code>phoenix_test/target/surefire-reports</code></strong>. If there 
are any failures, they would come with file names and line numbers.</p>
-   <p>The source code can be found in 
<strong><code>phoenix_test/src/test/java/com/trafodion/phoenix/end2end</code></strong>.</p>
 
-   <p>These are JDBC tests written in java.</p>
-  </li>
- </ol>
-    
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/3063990d/docs/src/site/markdown/tests.md
----------------------------------------------------------------------
diff --git a/docs/src/site/markdown/tests.md b/docs/src/site/markdown/tests.md
deleted file mode 100644
index ab9baf4..0000000
--- a/docs/src/site/markdown/tests.md
+++ /dev/null
@@ -1,71 +0,0 @@
-<!--
-  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.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-This page describes how to add or modify Trafodion tests and/or test suites. 
Please refer to the [Contribute](contribute.html) page for information about 
other ways to contribute to the Trafodion project.
-
-**Note**: The [Test](testing.html) page describes how the different Trafodion 
test libraries are organized and how you run different test. You should 
familiarize yourself with that page before modifying the Trafodion tests.
-
-# SQL Tests
-The SQL tests are located in: **```core/sql/regress```**. Please refer to the 
[Test](testing.html) page for information about each directory. Below, each of 
these directories is referred to as **```$scriptdir```**.
-
-The default output from **```core/sql/regress/tools/runallsb```** is located 
in **```$MY_SQROOT/rundir```**. This directory is referred to as 
**```$rundir```** below.
-
-Files associated with individual tests use the following naming convention: 
**```\<Type\>\<number\>```**. The files are organized as follows:
-
-Type       | Usage                              | Location
------------|------------------------------------|---------------------------------------------
-TEST       | The test itself.                   | **```$scriptdir/<test 
suite>```** 
-EXPECTED   | The expected output from the test. | **```$scriptdir/<test 
suite>```**
-FILTER     | Filters out variable results (for example, timestamps) from test 
results to ensure consistent runs. | **```$scriptdir/<test suite>```**
-LOG        | The output from running the test.  | **```$rundir/<test 
suite>```**
-DIFF       | Diff between LOG and EXPECTED.     | **```$rundir/<test 
suite>```**
-
-## Modify a Test
-The comments in a test provides information of what it does. Make your changes 
and then do the following:
-
-* Run the test.
-* Verify that the LOG output is as desired.
-* Copy the LOG output to EXPECTED.
-* Rerun the test and verify that the test passes.
-
-### Output with Variable Data
-If there are time stamps or generated names that may vary from run to run or 
from user to user, then you need to create a ```FILTER\<test number\>``` file. 
This will filter out the variable portions of the test results so the test 
results are consistent.
- 
-Example filter file: **```core/sql/regress/core/FILTER024```**  
-
-**```core/sql/regress/tools```** contains generic filter files. These cover 
general/common variables in test output. You will need to add a new test 
specific filer if it’s specific to your new test output only. 
-
-### Check In Changes
-Check in the TEST and EXPECTED files in **```$scriptsdir```**.
-
-## Create New Test
-Creating a test is just a variation of [Modify a Test](#Modify_a_Test). The 
test should be associated with a test suite that covers the component you want 
to test. Please contact the [Trafodion Developer List](mail-lists.html) if you 
need help chosing the correct test suite.
-
-Once you've chosen the test suite and, therefore, the test source directory, 
you do the following:
-
-* Add the new test file to the test file in the selected test-suite directory.
-    * Use the naming convention found in the directory. (Normally: 
**```TEST\<nnn\>```**)
-    * Refer to **```core/sql/regress/runregr_\<test suite\>.ksh```** to verify 
the naming convention used.
-* The test DDL should use the schema name associated with the test suite.
-    * Refer to other test suites for examples.
-* Test and validate as described in [Modify a Test](#Modify_a_Test) above. 
-
-## Create New Test Suite
-The test suites cover different SQL components. Most components should be 
covered with the existing test suites.
-
-Do the following to create a new test suite:
-
-* Create a new directory with the suite name under **```core/sql/regress```**; 
for example: **```\<new test suite\>```**.
-* Refer to [Create New Test](#Create_New_Test) for instructions on how to add 
tests to the new test suite.
-* Add a test driver in **```core/sql/regress/tools```** directory with name 
**```runregr_\<new test suite\>.ksh```**. (Just copy and modify one of the 
other test drivers.)
-* Add the new test suite to **```core/sql/regress/runallsb/TEST_SUBDIRS```**.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/3063990d/docs/src/site/markdown/website.md
----------------------------------------------------------------------
diff --git a/docs/src/site/markdown/website.md 
b/docs/src/site/markdown/website.md
deleted file mode 100644
index ac38ec7..0000000
--- a/docs/src/site/markdown/website.md
+++ /dev/null
@@ -1,108 +0,0 @@
-<!--
-  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.
-  See the License for the specific language governing permissions and
-  limitations under the 
-  License.
--->
-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 gitpubsub, thereby populating 
http://incubator.trafodion.apache.org.
-
-# Making Changes
-The following information helps you understand how to make changes to the 
web-site content.
-
-----
-
-## Technology
-
-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)
-* **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.
-
-**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 **```docs```** directory. The code organization 
follows the [Maven 
standard](https://maven.apache.org/guides/mini/guide-site.html).
-
-**```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.
-
-**```docs/src/site/markdown```** contains the files that generate the 
different HTML files.
-
-**```docs/target```** contains the generated HTML files after you run a build.
-
-## Managing Pages
-
-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 **```\<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: **```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 **```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.
-
-## Tables
-markdown supports a simple format for tables. You can use markdown-style 
writing in such tables.
-
-    Table Header   | Table Header
-    ---------------|---------------
-    Text           | Text
-    Text           | Text
-
-However, no special formatting can be done; for example, creating a bulleted 
list in a cell. If you need tables with such formatting, then you will need to 
define the table in raw HTML format. No markdown-style writing is supported for 
HTML tables; use pure HTML tagging instead.
-
-## Callout Boxes
-You can create a simple callout box using an HTML table. Example:
-
-    <table><tr><td><strong>NOTE</strong><br />Whatever you want to say 
here.</td></tr></table>
-
-Generates:
-
-<table><tr><td><strong>NOTE</strong><br />Whatever you want to say 
here.</td></tr></table>
-
-----
-
-# 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. Fetch changes to be published from the Trafodion master branch.
-2. Build Trafodion site (source ./env.sh; mvn post-site).
-3. If there are documentation changes to prior releases, check out those 
release branch(es) and re-build the affected docs (mvn post-site).
-4. ```git clone``` 
https://git-wip-us.apache.org/repos/asf/incubator-trafodion-site.git
-5. Copy content of ```docs/target``` into the incubator-trafodion-site 
directory. Commit changes.
-6. Push them back to the apache origin repo to the ```asf-site``` branch.
-
-Once pushed, Apache gitpubsub takes care of populating 
http://incubator.trafodion.apache.org with your new changes.
-If they don't show up, pushing another empty (or whitespace change) commit may 
work to trigger the automation.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/3063990d/docs/src/site/markdown/wiki.md
----------------------------------------------------------------------
diff --git a/docs/src/site/markdown/wiki.md b/docs/src/site/markdown/wiki.md
deleted file mode 100644
index e583e34..0000000
--- a/docs/src/site/markdown/wiki.md
+++ /dev/null
@@ -1,23 +0,0 @@
-<!--
-  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.
-  See the License for the specific language governing permissions and
-  limitations under the 
-  License.
--->
-This page describes how to change the Trafodion Wiki. Please refer to the 
[Contribute](contribute.html) page for information about other ways to 
contribute to the Trafodion project.
-
-# Getting Access
-
-We use a "white-listing" permissions scheme for editing the Wiki. We do this 
to prevent anonymous spammers from spamming the site.
-
-If you'd like to contribute to the wiki, just obtain a Confluence user ID on 
the Apache wiki, then send an e-mail to the [email protected] dlist 
requesting access (and providing your Confluence user ID name). 
-
-A friendly administrator will then grant you editing privileges.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/3063990d/docs/src/site/site.xml
----------------------------------------------------------------------
diff --git a/docs/src/site/site.xml b/docs/src/site/site.xml
index fe2482e..641c321 100644
--- a/docs/src/site/site.xml
+++ b/docs/src/site/site.xml
@@ -97,41 +97,7 @@
             <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>Contribute</shortTitle>
-           <toc>false</toc>
-          <sections>
-            <body />
-            <columns>2</columns>
-            <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>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>
@@ -157,13 +123,6 @@
         <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>
@@ -204,39 +163,12 @@
            <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>
         <uninstall>
           <shortTitle>Uninstall</shortTitle>
           <!-- Use H1 headings only for the TOC -->
           <tocTopFlatten>false</tocTopFlatten>
         </uninstall>
-        <website>
-           <shortTitle>Modify Web Site</shortTitle>
-           <tocTopFlatten>false</tocTopFlatten>
-           <sections>
-              <body />
-              <columns>2</columns>
-              <body />
-           </sections>
-        </website>
-        <wiki><toc>false</toc></wiki>
       </pages>
     </reflowSkin>
   </custom>
@@ -247,6 +179,7 @@
     </breadcrumbs>
     <links>
       <item name="Download" href="download.html"/>
+      <item name="Contributing" href="contributing-redirect.html"/>
     </links>
     <menu name="About">
       <item href="index.html" name="Project Overview"/>
@@ -254,7 +187,7 @@
       <item href="roadmap.html" name="Roadmap"/>
       <item href="performance.html" name="Performance"/>
       <item href="http:divider" name=""/>
-      <item href="team-list.html" name="Team"/>
+      <item href="team-redirect.html" name="Team"/>
       <item href="presentations.html" name="Presentations"/>
       <item href="mail-lists.html" name="Mailing List"/>
       <item href="http:divider" name=""/>
@@ -305,28 +238,6 @@
       <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="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="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="Project Status" target="_blank"/>
       <item href="http://www.apache.org/foundation/how-it-works.html"; 
name="Apache Foundation" target="_blank"/>

Reply via email to