Repository: tajo
Updated Branches:
  refs/heads/master 303066b23 -> fa985d263


TAJO-730: Update Tajo site to reflect graduation.


Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/fa985d26
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/fa985d26
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/fa985d26

Branch: refs/heads/master
Commit: fa985d26303ca6ecfa8a5e98963998f260166782
Parents: 303066b
Author: Hyunsik Choi <[email protected]>
Authored: Tue Apr 1 17:21:38 2014 +0900
Committer: Hyunsik Choi <[email protected]>
Committed: Tue Apr 1 19:07:59 2014 +0900

----------------------------------------------------------------------
 BUILDING.txt                                    |   8 +-
 CHANGES.txt                                     |   2 +
 DISCLAIMER                                      |   1 -
 README                                          |  29 +++---
 tajo-project/pom.xml                            |  88 ++++++++++++++-----
 tajo-project/src/site/apt/index.apt             |  73 ++++++---------
 tajo-project/src/site/markdown/mailing-lists.md |  24 ++---
 .../src/site/resources/images/Tajo_logo.png     | Bin 14487 -> 0 bytes
 .../src/site/resources/images/tajo_logo.png     | Bin 0 -> 14487 bytes
 tajo-project/src/site/site.xml                  |  42 ++++-----
 10 files changed, 146 insertions(+), 121 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tajo/blob/fa985d26/BUILDING.txt
----------------------------------------------------------------------
diff --git a/BUILDING.txt b/BUILDING.txt
index 0cf0a04..cf6dd79 100644
--- a/BUILDING.txt
+++ b/BUILDING.txt
@@ -15,10 +15,16 @@ Maven main modules:
   tajo                            (Main Tajo project)
          - tajo-project           (Parent POM for all Tajo Maven modules. )
                                   (All plugins & dependencies versions are 
defined here.)
-         - tajo-common
+         - tajo-algebra
          - tajo-catalog
+         - tajo-client
+         - tajo-common
          - tajo-core
+         - tajo-docs
+         - tajo-jdbc
+         - tajo-project
          - tajo-rpc
+         - tajo-storage
          - tajo-dist              (Tajo distribution assembler)
 
 
--------------------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tajo/blob/fa985d26/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 80d05aa..83990ff 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -593,6 +593,8 @@ Release 0.8.0 - unreleased
 
   TASKS
 
+    TAJO-730: Update Tajo site to reflect graduation. (hyunsik)
+
     TAJO-529: Fix warnings in tajo-algebra. (jaehwa)
 
     TAJO-700: Update site, wikis, pom.xml and other resources to point to the 

http://git-wip-us.apache.org/repos/asf/tajo/blob/fa985d26/DISCLAIMER
----------------------------------------------------------------------
diff --git a/DISCLAIMER b/DISCLAIMER
deleted file mode 100644
index 98a762c..0000000
--- a/DISCLAIMER
+++ /dev/null
@@ -1 +0,0 @@
-Apache Tajo is an effort undergoing incubation at The Apache Software 
Foundation (ASF) sponsored by the Apache Incubator PMC. Incubation is required 
of all newly accepted projects until a further review indicates that the 
infrastructure, communications, and decision making process have stabilized in 
a manner consistent with other successful ASF projects. While incubation status 
is not necessarily a reflection of the completeness or stability of the code, 
it does indicate that the project has yet to be fully endorsed by the ASF.

http://git-wip-us.apache.org/repos/asf/tajo/blob/fa985d26/README
----------------------------------------------------------------------
diff --git a/README b/README
index dae8973..95406e9 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-Apache Tajo (incubation)
+Apache Tajo
 ========================
 Tajo is a relational and distributed data warehouse system for Hadoop.
 Tajo is designed for low-latency and scalable ad-hoc queries, online
@@ -37,25 +37,16 @@ Requirements
 
 Mailing lists
 =============
-* [email protected] - To discuss and ask development and usage
-  issues. Send an empty email to [email protected] in
-  order to subscribe to this mailing list.
+* [email protected]     - To discuss and ask general development issues.
 
-* [email protected] - In order to monitor commits to the source
-  repository. Send an empty email to 
[email protected]
-  in order to subscribe to this mailing list.
+* [email protected]    - To discuss and ask end-user questions/issues.
+
+* [email protected]  - To see notifications made in the Tajo issue
+                            tracking system, review board, and Jenkins CI.
+
+* [email protected] - To monitor commits to the source repository.
 
 To subscribe to the mailing lists, please send an email to:
-${listname}[email protected]. For example, to subscribe to 
+${listname}[email protected]. For example, to subscribe to
 dev, send an email from your desired subscription address to:
[email protected] and follow the instructions from there.
-
-Disclaimer
-==========
-Apache Tajo is an effort undergoing incubation at The Apache Software
-Foundation (ASF) sponsored by the Apache Incubator PMC. Incubation is required
-of all newly accepted projects until a further review indicates that the
-infrastructure, communications, and decision making process have stabilized in
-a manner consistent with other successful ASF projects. While incubation status
-is not necessarily a reflection of the completeness or stability of the code,
-it does indicate that the project has yet to be fully endorsed by the ASF.
[email protected] and follow the instructions from there.

http://git-wip-us.apache.org/repos/asf/tajo/blob/fa985d26/tajo-project/pom.xml
----------------------------------------------------------------------
diff --git a/tajo-project/pom.xml b/tajo-project/pom.xml
index 8934045..7f78724 100644
--- a/tajo-project/pom.xml
+++ b/tajo-project/pom.xml
@@ -60,7 +60,7 @@
       <email>[email protected]</email>
       <organization></organization>
       <roles>
-        <role>Mentor</role>
+        <role>PMC</role>
       </roles>
       <timezone></timezone>
     </developer>
@@ -70,7 +70,7 @@
       <email>[email protected]</email>
       <organization>NASA JPL</organization>
       <roles>
-        <role>Mentor</role>
+        <role>PMC</role>
       </roles>
       <timezone>-8</timezone>
     </developer>
@@ -80,7 +80,7 @@
       <email>[email protected]</email>
       <organization>Hortonworks</organization>
       <roles>
-        <role>PPMC</role>
+        <role>PMC</role>
       </roles>
       <timezone>-8</timezone>
     </developer>
@@ -89,7 +89,7 @@
       <name>Henry Saputra</name>
       <email>[email protected]</email>
       <roles>
-        <role>PPMC</role>
+        <role>PMC</role>
       </roles>
       <timezone>-8</timezone>
     </developer>
@@ -99,7 +99,7 @@
       <email>[email protected]</email>
       <organization>Gruter</organization>
       <roles>
-        <role>PPMC</role>
+        <role>V.P.</role>
       </roles>
       <timezone>+9</timezone>
     </developer>
@@ -109,7 +109,7 @@
       <email>[email protected]</email>
       <organization>Gruter</organization>
       <roles>
-        <role>PPMC</role>
+        <role>PMC</role>
       </roles>
       <timezone>+9</timezone>
     </developer>
@@ -119,7 +119,7 @@
       <email>[email protected]</email>
       <organization>LinkedIn</organization>
       <roles>
-        <role>Champion</role>
+        <role>PMC</role>
       </roles>
       <timezone>-8</timezone>
     </developer>
@@ -129,7 +129,7 @@
       <email>[email protected]</email>
       <organization>Gruter</organization>
       <roles>
-        <role>PPMC</role>
+        <role>PMC</role>
       </roles>
       <timezone>+9</timezone>
     </developer>
@@ -139,17 +139,27 @@
       <email>[email protected]</email>
       <organization>Korea University</organization>
       <roles>
-        <role>PPMC</role>
+        <role>PMC</role>
       </roles>
       <timezone>+9</timezone>
     </developer>
     <developer>
+      <id></id>
+      <name>Min Zhou</name>
+      <email></email>
+      <organization>LinkedIn</organization>
+      <roles>
+        <role>Committer</role>
+      </roles>
+      <timezone>-8</timezone>
+    </developer>
+    <developer>
       <id>sirpkt</id>
       <name>Keuntae Park</name>
       <email>[email protected]</email>
       <organization>SK Telecom</organization>
       <roles>
-        <role></role>
+        <role>PMC</role>
       </roles>
       <timezone>+9</timezone>
     </developer>
@@ -159,7 +169,7 @@
       <email>[email protected]</email>
       <organization>Hortonworks</organization>
       <roles>
-        <role>Mentor</role>
+        <role>PMC</role>
       </roles>
       <timezone>-8</timezone>
     </developer>
@@ -169,7 +179,7 @@
       <email>[email protected]</email>
       <organization>LinkedIn</organization>
       <roles>
-        <role>PPMC</role>
+        <role>PMC</role>
       </roles>
       <timezone>-8</timezone>
     </developer>
@@ -179,7 +189,7 @@
       <email>[email protected]</email>
       <organization>Inervit</organization>
       <roles>
-        <role>PPMC</role>
+        <role>PMC</role>
       </roles>
       <timezone>+9</timezone>
     </developer>
@@ -189,7 +199,7 @@
       <email>[email protected]</email>
       <organization>Intel</organization>
       <roles>
-        <role>PPMC</role>
+        <role>PMC</role>
       </roles>
       <timezone>+8</timezone>
     </developer>
@@ -197,46 +207,76 @@
 
   <contributors>
     <contributor>
+      <name>Alvin Henrick</name>
+      <roles><role>Contributor</role></roles>
+    </contributor>
+    <contributor>
       <name>Camelia</name>
+      <roles><role>Contributor</role></roles>
     </contributor>
     <contributor>
       <name>DaeMyung Kang</name>
       <organization>Kakao</organization>
+      <roles><role>Contributor</role></roles>
+    </contributor>
+    <contributor>
+      <name>David Chen</name>
+      <organization>LinkedIn</organization>
+      <roles><role>Contributor</role></roles>
     </contributor>
     <contributor>
       <name>Dongmin Yu</name>
       <organization>InfiniLoop</organization>
+      <roles><role>Contributor</role></roles>
     </contributor>
     <contributor>
       <name>Hyoung Jun Kim</name>
       <organization>Gruter</organization>
+      <roles><role>Contributor</role></roles>
+    </contributor>
+    <contributor>
+      <name>Ilhyun Suh</name>
+      <organization>Korea University</organization>
+      <roles><role>Contributor</role></roles>
     </contributor>
     <contributor>
       <name>Jae Young Lee</name>
       <organization>SK Telecom</organization>
+      <roles><role>Contributor</role></roles>
     </contributor>
     <contributor>
-      <name>KyoungBok Lee</name>
-      <organization>Line</organization>
+      <name>Tae-kyeong Goh</name>
+      <organization>Gruter</organization>
+      <roles><role>Logo Designer</role></roles>
     </contributor>
     <contributor>
-      <name>Min Zhou</name>
-      <organization>LinkedIn</organization>
+      <name>KyoungBok Lee</name>
+      <organization>Line</organization>
+      <roles><role>Contributor</role></roles>
     </contributor>
     <contributor>
       <name>Seungun Choe</name>
       <organization>SK Telecom</organization>
+      <roles><role>Contributor</role></roles>
     </contributor>
     <contributor>
       <name>Sergio Esteves</name>
+      <roles><role>Contributor</role></roles>
     </contributor>
     <contributor>
       <name>SeongHwa Ahn</name>
       <organization>SK Telecom</organization>
+      <roles><role>Contributor</role></roles>
+    </contributor>
+    <contributor>
+      <name>Youngjun Park</name>
+      <organization>Gruter</organization>
+      <roles><role>Contributor</role></roles>
     </contributor>
     <contributor>
       <name>Wan Heo</name>
       <organization>Korea University</organization>
+      <roles><role>Contributor</role></roles>
     </contributor>
   </contributors>
 
@@ -254,20 +294,20 @@
   <mailingLists>
     <mailingList>
       <name>Development list</name>
-      <subscribe>mailto:[email protected]
+      <subscribe>mailto:[email protected]
       </subscribe>
-      <unsubscribe>mailto:[email protected]
+      <unsubscribe>mailto:[email protected]
       </unsubscribe>
-      <post>mailto:[email protected]</post>
+      <post>mailto:[email protected]</post>
       <archive>http://mail-archives.apache.org/mod_mbox/tajo-dev/</archive>
     </mailingList>
     <mailingList>
       <name>Commit list</name>
-      <subscribe>mailto:[email protected]
+      <subscribe>mailto:[email protected]
       </subscribe>
-      <unsubscribe>mailto:[email protected]
+      <unsubscribe>mailto:[email protected]
       </unsubscribe>
-      <post>mailto:[email protected]</post>
+      <post>mailto:[email protected]</post>
       <archive>http://mail-archives.apache.org/mod_mbox/tajo-commits/</archive>
     </mailingList>
   </mailingLists>

http://git-wip-us.apache.org/repos/asf/tajo/blob/fa985d26/tajo-project/src/site/apt/index.apt
----------------------------------------------------------------------
diff --git a/tajo-project/src/site/apt/index.apt 
b/tajo-project/src/site/apt/index.apt
index d452a3f..3f124e1 100644
--- a/tajo-project/src/site/apt/index.apt
+++ b/tajo-project/src/site/apt/index.apt
@@ -14,64 +14,58 @@
 ~~ See the License for the specific language governing permissions and
 ~~ limitations under the License.
 
-Apache Tajo&#153; - An open source big data warehouse system in Hadoop
+Apache Tajo&#153;: A big data warehouse system on Hadoop
 
-  The main goal of Apache Tajo&#153; project is to build an advanced open 
source data warehouse system in Hadoop for processing web-scale data sets    
+  Apache Tajo is a robust big data relational and distributed data warehouse 
system for Apache Hadoop.
+  Tajo is designed for low-latency and scalable ad-hoc queries, online 
aggregation,
+  and ETL (extract-transform-load process) on large-data sets stored on HDFS 
(Hadoop Distributed File System)
+  and other data sources. By supporting SQL standards and leveraging advanced 
database techniques,
+  Tajo allows direct control of distributed execution and data flow across a 
variety of query evaluation
+  strategies and optimization opportunities.
 
 Features
 
-  * <<Interactive and Batch Queries>>
+  * <<Fast and Efficient>>
 
-    * Fully distributed SQL query processing on large data sets stored in HDFS 
and other data sources
+    * Fully distributed SQL query processing engine
 
-    * Very low response time (100 msec ~) against simple queries (e.g., just 
aggregation or small-large join) on reasonable data size
+    * Advanced Query Optimization such as cost-based and progressive query 
optimization
 
-  * <<Long running query support>>
+    * Interactive analysis on reasonable data set
 
-    * Fault tolerance support that avoids query restart when some tasks are 
failed.
+  * <<Scalable>>
 
-    * Dynamic scheduling support that handles struggling and heterogeneous 
cluster nodes
+    * Fault tolerance and dynamic scheduling for long-running queries
 
-  * <<Query Optimization>>
+    * Out-of-core algorithms for data sets larger than main memory
 
-    * Cost-based optimization for bushy join trees
+  * <<Compatible>>
 
-    * Progressive query optimization for reoptimizing running queries
+    * ANSI/ISO SQL standard compliance
 
-  * <<ETL>>
-
-    * ETL features that transform one data format to another data format
-
-    * Various file formats support, such as CSV, RCFile, and RowFile (a row 
store file)
-
-  * <<Extensibility>>
-
-    * User-defined function support
-
-    * Scanner/Appender interface for custom file formats
-
-  * <<Compatibility>>
-
-    * ANSI/ISO SQL standard compliance and PostgreSQL compliance for 
non-standard parts
-
-    * HiveQL mode support
-
-    * Tables access in HCatalog and Hive MetaStore
+    * Hive MetaStore access support
 
     * JDBC driver support
 
+    * Various file formats support, such as CSV, RCFile, RowFile, SequenceFile 
and Parquet
+
   * <<Easy>>
 
-    * Interactive shell to allow users to submit SQL queries to Tajo clusters
+    * User-defined functions
 
-    * Backup/Restore utility
+    * Interactive shell
 
-    * Asynchronous/Synchronous Java API to enable clients to submit SQL 
queries to Tajo clusters
+    * Convenient Backup/Restore utility
 
+    * Asynchronous/Synchronous Java API
 
 News
 
-  * <<[2014-02-27]>> Keuntae Park was invited to ApacheConf 2014.
+  * <<[2014-04-01]>> Min Zhou was invited to a new committer.
+
+  * <<[2014-03-24]>> Apache Tajo became Apache Top-level Project.
+
+  * <<[2014-02-27]>> Keuntae Park was invited to ApacheConf 2014 
({{{http://sched.co/1bsN9iE}schedule}}).
 
   * <<[2014-01-02]>> Keuntae Park was invited to become a new committer.
 
@@ -91,13 +85,4 @@ News
 
 Downloads
 
-  * <<[2013-11-20]>> Most recent release: 
{{{http://apache.org/dyn/closer.cgi/incubator/tajo/tajo-0.2.0-incubating/}Apache
 Tajo 0.2.0-incubating}} ({{{http://s.apache.org/tajo-0.2-release-notes}Release 
Notes}})
-
-Disclaimer
-
-  Apache Tajo&#153; is an effort undergoing incubation at The Apache Software 
Foundation (ASF)
-  sponsored by the Apache Incubator PMC. Incubation is required of all newly 
accepted projects
-  until a further review indicates that the infrastructure, communications, 
and decision making
-  process have stabilized in a manner consistent with other successful ASF 
projects.
-  While incubation status is not necessarily a reflection of the completeness 
or stability of the
-  code, it does indicate that the project has yet to be fully endorsed by the 
ASF.
+  * <<[2013-11-20]>> Most recent release: 
{{{http://apache.org/dyn/closer.cgi/incubator/tajo/tajo-0.2.0-incubating/}Apache
 Tajo 0.2.0-incubating}} ({{{http://s.apache.org/tajo-0.2-release-notes}Release 
Notes}})
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tajo/blob/fa985d26/tajo-project/src/site/markdown/mailing-lists.md
----------------------------------------------------------------------
diff --git a/tajo-project/src/site/markdown/mailing-lists.md 
b/tajo-project/src/site/markdown/mailing-lists.md
index b4cbff5..7fbe461 100644
--- a/tajo-project/src/site/markdown/mailing-lists.md
+++ b/tajo-project/src/site/markdown/mailing-lists.md
@@ -25,38 +25,38 @@ In order to post to the list, it is necessary to first 
subscribe to the mailing
 
 The user@ mailing list is the preferred mailing list for end-user questions 
and discussion.
 
-The Tajo user mailing list is : [email protected]. 
+The Tajo user mailing list is : [email protected].
 
-* [Subscribe to List] (mailto:[email protected])
-* [Unsubscribe from List] (mailto:[email protected])
+* [Subscribe to List] (mailto:[email protected])
+* [Unsubscribe from List] (mailto:[email protected])
 * [Archives] (http://mail-archives.apache.org/mod_mbox/tajo-user/)
 
 ### Devlopers
 
 If you'd like to contribute to Tajo, please subscribe to the Tajo developer 
mailing list.
 
-The Tajo developer mailing list is: [email protected].
+The Tajo developer mailing list is: [email protected].
 
-* [Subscribe to List] (mailto:[email protected])
-* [Unsubscribe from List] (mailto:[email protected])
+* [Subscribe to List] (mailto:[email protected])
+* [Unsubscribe from List] (mailto:[email protected])
 * [Archives] (http://mail-archives.apache.org/mod_mbox/tajo-dev/)
 
 ### Issues
 
 If you'd like to see notifications made in the Tajo issue tracking system, 
review board, and Jenkins CI, please subscribe to the Tajo issues mailing list.
 
-The Tajo issues mailing list is: [email protected].
+The Tajo issues mailing list is: [email protected].
 
-* [Subscribe to List] (mailto:[email protected])
-* [Unsubscribe from List] (mailto:[email protected])
+* [Subscribe to List] (mailto:[email protected])
+* [Unsubscribe from List] (mailto:[email protected])
 * [Archives] (http://mail-archives.apache.org/mod_mbox/tajo-issues/)
 
 ### Commits
 
 If you'd like to see changes made in the Tajo source version control system, 
please subscribe to the Tajo commits mailing list.
 
-The Tajo commits mailing list is: [email protected].
+The Tajo commits mailing list is: [email protected].
 
-* [Subscribe to List] (mailto:[email protected])
-* [Unsubscribe from List] 
(mailto:[email protected])
+* [Subscribe to List] (mailto:[email protected])
+* [Unsubscribe from List] (mailto:[email protected])
 * [Archives] (http://mail-archives.apache.org/mod_mbox/tajo-commits/)

http://git-wip-us.apache.org/repos/asf/tajo/blob/fa985d26/tajo-project/src/site/resources/images/Tajo_logo.png
----------------------------------------------------------------------
diff --git a/tajo-project/src/site/resources/images/Tajo_logo.png 
b/tajo-project/src/site/resources/images/Tajo_logo.png
deleted file mode 100644
index 61e5eca..0000000
Binary files a/tajo-project/src/site/resources/images/Tajo_logo.png and 
/dev/null differ

http://git-wip-us.apache.org/repos/asf/tajo/blob/fa985d26/tajo-project/src/site/resources/images/tajo_logo.png
----------------------------------------------------------------------
diff --git a/tajo-project/src/site/resources/images/tajo_logo.png 
b/tajo-project/src/site/resources/images/tajo_logo.png
new file mode 100644
index 0000000..61e5eca
Binary files /dev/null and 
b/tajo-project/src/site/resources/images/tajo_logo.png differ

http://git-wip-us.apache.org/repos/asf/tajo/blob/fa985d26/tajo-project/src/site/site.xml
----------------------------------------------------------------------
diff --git a/tajo-project/src/site/site.xml b/tajo-project/src/site/site.xml
index 85edf34..5721f52 100644
--- a/tajo-project/src/site/site.xml
+++ b/tajo-project/src/site/site.xml
@@ -20,7 +20,8 @@
 <project xmlns="http://maven.apache.org/DECORATION/1.3.0";
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
          xsi:schemaLocation="http://maven.apache.org/DECORATION/1.3.0
-         http://maven.apache.org/xsd/decoration-1.3.0.xsd"; name="Tajo - A Big 
Data Warehouse System on Hadoop">
+         http://maven.apache.org/xsd/decoration-1.3.0.xsd";
+         name="Tajo - A Big Data Warehouse System on Hadoop">
   <skin>
     <groupId>org.apache.maven.skins</groupId>
     <artifactId>maven-fluido-skin</artifactId>
@@ -30,23 +31,24 @@
 
   <bannerLeft>
     <name>Apache Tajo</name>
-       <src>./images/tajo_logo.png</src>
-    <href>http://tajo.incubator.apache.org</href>
-       <width>240</width>
+         <src>./images/tajo_logo.png</src>
+    <href>http://tajo.apache.org</href>
+         <width>240</width>
+    <title/>
   </bannerLeft>
 
-  <bannerRight>
-    <name>Apache Incubator</name>
-    <src>http://incubator.apache.org/images/egg-logo.png</src>
-    <href>http://incubator.apache.org/</href>
-  </bannerRight>
+  <poweredBy>
+    <logo name="ApacheCon 2014" 
href="http://events.linuxfoundation.org/events/apachecon-north-america";
+          img="http://www.apache.org/events/current-event-328x78.png"/>
+    <logo name="Maven" href="http://maven.apache.org/"; 
img="http://maven.apache.org/images/logos/maven-feather.png"/>
+  </poweredBy>
 
   <publishDate position="right" />
   <version position="right" />
 
   <body>
     <head>
-      <meta name="description" content="Apache Tajo,big data warehouse system 
on Hadoop,relational and distributed query engine" />
+      <meta name="description" content="Apache Tajo,SQL-on-Hadoop,big data 
warehouse system on Hadoop,relational and distributed query engine" />
       <script type="text/javascript">
 
         var _gaq = _gaq || [];
@@ -74,7 +76,6 @@
 
     <breadcrumbs>
       <item name="Apache" href="http://www.apache.org"; />
-      <item name="Incubator" href="../" />
       <item name="Tajo" href="/" />
     </breadcrumbs>
 
@@ -86,26 +87,27 @@
     </menu>
 
     <menu name="Community">
-      <item name="Wiki" href="http://wiki.apache.org/tajo"; />
+      <item name="Wiki" 
href="http://cwiki.apache.org/confluence/display/TAJO/"; />
       <item name="Team" href="team-list.html" />
       <item name="Mailing Lists" href="mailing-lists.html" />
       <item name="Issue Tracker" 
href="https://issues.apache.org/jira/browse/TAJO"; />
-      <item name="Powered By" href="http://wiki.apache.org/tajo/PoweredBy"; />
-      <item name="Presentations" 
href="http://wiki.apache.org/tajo/Presentations"; />
+      <item name="Powered By" 
href="https://cwiki.apache.org/confluence/display/TAJO/Powered+By"; />
+      <item name="Presentations" 
href="https://cwiki.apache.org/confluence/display/TAJO/Presentations"; />
     </menu>
 
     <menu name="Documentation">
-      <item name="0.8.0-SNAPSHOT (dev)" href="docs/0.8.0/index.html" />
+      <item name="Current (Dev)" href="docs/current/index.html" />
+      <item name="0.8.0-SNAPSHOT" href="docs/0.8.0/index.html" />
       <item name="0.2.0-incubating release" href="tajo-0.2.0-doc.html" />
     </menu>
 
     <menu name="Contributes">
       <item name="Source Code" href="source-code.html" />
       <item name="Get Involved" 
href="http://www.apache.org/foundation/getinvolved.html"; />
-      <item name="How To Contribute" 
href="http://wiki.apache.org/tajo/HowToContribute"; />
+      <item name="How To Contribute" 
href="https://cwiki.apache.org/confluence/display/TAJO/How+to+Contribute+to+Tajo";
 />
       <item name="Review Board" href="https://reviews.apache.org/groups/tajo"; 
/>
       <item name="Review Request Tool" href="review-request-tool.html" />
-      <item name="Coding Style" href="http://wiki.apache.org/tajo/CodingStyle"; 
/>
+      <item name="Coding Style" 
href="https://cwiki.apache.org/confluence/display/TAJO/Code+Style"; />
     </menu>
 
     <menu name="Apache">
@@ -117,9 +119,9 @@
 
     <footer>
       <div class="row span12">
-        Apache Tajo, Apache Hadoop, Apache, the Apache feather logo, and the 
Apache incubator logo are
-        trademarks of The Apache Software Foundation. All other marks 
mentioned may be trademarks
-        or registered trademarks of their respective owners.
+        Apache Tajo, Tajo, Apache, the Apache feather logo, and the Apache 
Tajo logo are trademarks
+        of The Apache Software Foundation. All other marks mentioned may be 
trademarks or registered
+        trademarks of their respective owners.
       </div>
     </footer>
   </body>

Reply via email to