Till Westmann has uploaded a new change for review.

  https://asterix-gerrit.ics.uci.edu/717

Change subject: update branding
......................................................................

update branding

* add incubation disclaimer to all pages
* add (incubating) to first occurrence of "Apache AsterixDB" on every page
* add (tm) to the logo and to "Apache AsterixDB"
* add required links to www.apache.org

Change-Id: I645e5b3474de203ee62e9c0cf34317d02722bc69
---
M _includes/nav_header.html
M _layouts/default.html
M about.md
M community.md
M content/about.html
M content/community.html
M content/dev-setup.html
M content/download.html
M content/features.md
A content/img/asf_logo.png
A content/img/asterixdb_tm.png
A content/img/feather.png
M content/index.html
M content/pushing.html
M content/site.html
M content/tools.html
M dev-setup.md
M download.md
M features.md
A img/asf_logo.png
A img/asterixdb_tm.png
A img/feather.png
M index.md
M tools.md
24 files changed, 522 insertions(+), 237 deletions(-)


  git pull ssh://asterix-gerrit.ics.uci.edu:29418/incubator-asterixdb-site 
refs/changes/17/717/1

diff --git a/_includes/nav_header.html b/_includes/nav_header.html
index 28db61c..f3b5754 100644
--- a/_includes/nav_header.html
+++ b/_includes/nav_header.html
@@ -1,10 +1,12 @@
-<div class="masthead">
-    <p class="lead">
-        <a href="{{ site.url }}index.html"><img src="{{ site.url 
}}img/asterixdb.png" style="height:75px; width:auto; vertical-align:bottom; 
margin-top:10px;"/></a>
-    </p>
-</div>
+      <div class="masthead">
+        <p class="lead">
+           <a href="index.html">
+             <img src="img/asterixdb_tm.png" style="height:75px; width:auto; 
vertical-align:bottom; margin-top:10px;"/>
+           </a>
+        </p>
+      </div>
 
-<nav class="navbar navbar-default">
+      <nav class="navbar navbar-default">
         <div class="container">
           <div class="navbar-header">
             <button type="button" class="navbar-toggle collapsed" 
data-toggle="collapse" data-target=".navbar-collapse">
@@ -42,6 +44,21 @@
                 </ul>
               </li>
             </ul>
+            <ul class="nav navbar-nav navbar-right">
+              <li class="dropdown">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-expanded="false"
+                   style="padding-right: 30px">
+                  <img src="img/feather.png" style="height:20px"/>Apache 
Software Foundation<span class="caret"/>
+                </a>
+                <ul class="dropdown-menu dropdown-menu-right" role="menu">
+                  <li><a href="http://www.apache.org/";><b>ASF 
Homepage</b></a></li>
+                  <li><a 
href="http://www.apache.org/licenses/";>License</a></li>
+                  <li><a 
href="http://www.apache.org/foundation/sponsorship.html";>Donate</a></li>
+                  <li><a 
href="http://www.apache.org/foundation/thanks.html";>Thanks</a></li>
+                  <li><a 
href="http://www.apache.org/security/";>Security</a></li>
+                </ul>
+              </li>
+            </ul>
           </div><!--/.nav-collapse -->
         </div>
       </nav>
diff --git a/_layouts/default.html b/_layouts/default.html
index cb8b897..179d35a 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -27,25 +27,39 @@
   </head>
 
   <div class="container theme-showcase" role="main">
-  {% include nav_header.html %}
+    {% include nav_header.html %}
 
-  {{ content }}
+    {{ content }}
 
-   <hr />
+    <hr/>
 
-   <footer>
-        <div class="row">
-        <div class="col-md-6 col-md-offset-3  text-center">
-        <p>&copy; Copyright 2016 The Apache Software foundation. All Rights 
Reserved. </p>
-        <p>Apache AsterixDB, Apache, and the Apache feather logo are 
trademarks of the Apache Software Foundation</p>
+    <footer>
+      <div class="row">
+        <div class="col-md-9 col-centered">
+          <div class="col-md-9 text-left">
+            <p>Apache AsterixDB is an effort undergoing incubation at The 
Apache Software Foundation (ASF), sponsored
+              by the Apache Incubator.
+              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.</p>
+          </div>
+          <div class="col-md-3 text-right">
+            <img src="img/egg-logo.png" style="height:auto; width:200px; 
vertical-align:bottom;"/>
+          </div>
+      </div>
+      </div>
+      <div class="row">
+        <div class="col-md-9 col-centered text-center">
+          <p/>
+          <p>&copy; Copyright 2016 The Apache Software foundation. All Rights 
Reserved. </p>
+          <p>Apache AsterixDB, the Apache AsterixDB logo, Apache, and the 
Apache feather logo are trademarks of the
+            Apache Software Foundation</p>
         </div>
-        <div class="col-md-1 text-right">
-        <img src="{{ site.url }}img/egg-logo.png" style="height:auto; 
width:200px; vertical-align:bottom;"/>
-        </div>
-        </div>
-   </footer>
-    </div> <!-- /container -->
-
+      </div>
+    </footer>
+  </div> <!-- /container -->
 
     <!-- Bootstrap core JavaScript
     ================================================== -->
diff --git a/about.md b/about.md
index d73efcd..bb36787 100644
--- a/about.md
+++ b/about.md
@@ -1,8 +1,14 @@
 ---
-title: About AsterixDB
+title: About Apache AsterixDB
 ---
 
-AsterixDB is a highly scalable data management system that can store,index, 
and manage semi-structured data, e.g., much like MongoDB, butit also supports a 
full-power query language with the expressiveness of SQL (and more). Unlike 
analytics engines like Hive or Spark, it stores and manages data, so AsterixDB 
can exploit its knowledge of data partitioning and the availability of indexes 
to avoid always scanning data set(s) to process queries. Somewhat surprisingly, 
there is no open source parallel database system (relational or otherwise) 
available to developers today -- AsterixDB aims to fill this need.
+Apache AsterixDB&trade; (incubating) is a highly scalable data management 
system that can store,index, and manage
+semi-structured data, e.g., much like MongoDB, but it also supports a 
full-power query language with the expressiveness
+of SQL (and more).
+Unlike analytics engines like Hive or Spark, it stores and manages data, so 
AsterixDB can exploit its knowledge
+of data partitioning and the availability of indexes to avoid always scanning 
data set(s) to process queries. Somewhat
+surprisingly, there is no open source parallel database system (relational or 
otherwise) available to developers today
+-- AsterixDB aims to fill this need.
 
 ### Core features
 
@@ -24,8 +30,8 @@
   those of a NoSQL store.
 
 ### History
-The current version of AsterixDB was co-developed by a team of faculty, staff, 
and students at UC Irvine and UC Riverside. The project was initiated as a 
large NSF-sponsored project in 2009, the goal of which was to combine the best 
ideas from the parallel database world, the then new Hadoop world, and the 
semi-structured (e.g., XML/JSON) data world in order to create a 
next-generation BDMS. A first informal open source release was made four years 
later, in June of 2013, under the Apache Software License 2.0. AsterixDB was 
accepted into the Apache Incubator and began Incubation as of Febuary of 2015.
-
-
-
+Prior to being developed at the Apache Software Foundation AsterixDB was 
co-developed by a team of faculty, staff, and students at UC Irvine and UC 
Riverside.
+The project was initiated as a large NSF-sponsored project in 2009, the goal 
of which was to combine the best ideas from the parallel database world, the 
then new Hadoop world, and the semi-structured (e.g., XML/JSON) data world in 
order to create a next-generation BDMS.
+A first informal open source release was made four years later, in June of 
2013, under the Apache Software License 2.0.
+AsterixDB was accepted into the Apache Incubator and began Incubation as of 
Febuary of 2015.
 
diff --git a/community.md b/community.md
index 2254f98..4f607fd 100644
--- a/community.md
+++ b/community.md
@@ -3,7 +3,8 @@
 layout: wide
 ---
 
-Apache AsterixDB strives to support an open and transparent development 
process. Here are the various places where you can find discussions relating to 
the day to day development of AsterixDB and related projects, as well as 
answers to any AsterixDB-related questions.
+Apache AsterixDB&trade; (incubating) strives to support an open and 
transparent development process.
+Here are the various places where you can find discussions relating to the day 
to day development of AsterixDB and related projects, as well as answers to any 
AsterixDB-related questions.
 
 * TOC
 {:toc }
diff --git a/content/about.html b/content/about.html
index 35da19f..850f72f 100644
--- a/content/about.html
+++ b/content/about.html
@@ -9,7 +9,7 @@
     <meta name="author" content="">
     <link rel="icon" href="favicon.ico">
 
-    <title>About AsterixDB</title>
+    <title>About Apache AsterixDB</title>
 
     <!-- Bootstrap core CSS -->
     <link href="css/bootstrap.min.css" rel="stylesheet">
@@ -27,13 +27,15 @@
   </head>
 
   <div class="container theme-showcase" role="main">
-  <div class="masthead">
-    <p class="lead">
-        <a href="index.html"><img src="img/asterixdb.png" style="height:75px; 
width:auto; vertical-align:bottom; margin-top:10px;"/></a>
-    </p>
-</div>
+          <div class="masthead">
+        <p class="lead">
+           <a href="index.html">
+             <img src="img/asterixdb_tm.png" style="height:75px; width:auto; 
vertical-align:bottom; margin-top:10px;"/>
+           </a>
+        </p>
+      </div>
 
-<nav class="navbar navbar-default">
+      <nav class="navbar navbar-default">
         <div class="container">
           <div class="navbar-header">
             <button type="button" class="navbar-toggle collapsed" 
data-toggle="collapse" data-target=".navbar-collapse">
@@ -71,15 +73,36 @@
                 </ul>
               </li>
             </ul>
+            <ul class="nav navbar-nav navbar-right">
+              <li class="dropdown">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-expanded="false"
+                   style="padding-right: 30px">
+                  <img src="img/feather.png" style="height:20px"/>Apache 
Software Foundation<span class="caret"/>
+                </a>
+                <ul class="dropdown-menu dropdown-menu-right" role="menu">
+                  <li><a href="http://www.apache.org/";><b>ASF 
Homepage</b></a></li>
+                  <li><a 
href="http://www.apache.org/licenses/";>License</a></li>
+                  <li><a 
href="http://www.apache.org/foundation/sponsorship.html";>Donate</a></li>
+                  <li><a 
href="http://www.apache.org/foundation/thanks.html";>Thanks</a></li>
+                  <li><a 
href="http://www.apache.org/security/";>Security</a></li>
+                </ul>
+              </li>
+            </ul>
           </div><!--/.nav-collapse -->
         </div>
       </nav>
 
 
-  <div class="row">
+    <div class="row">
 <div class="col-md-8 col-centered">
-<h2>About AsterixDB</h2>
-<p>AsterixDB is a highly scalable data management system that can store,index, 
and manage semi-structured data, e.g., much like MongoDB, butit also supports a 
full-power query language with the expressiveness of SQL (and more). Unlike 
analytics engines like Hive or Spark, it stores and manages data, so AsterixDB 
can exploit its knowledge of data partitioning and the availability of indexes 
to avoid always scanning data set(s) to process queries. Somewhat surprisingly, 
there is no open source parallel database system (relational or otherwise) 
available to developers today – AsterixDB aims to fill this need.</p>
+<h2>About Apache AsterixDB</h2>
+<p>Apache AsterixDB™ (incubating) is a highly scalable data management system 
that can store,index, and manage
+semi-structured data, e.g., much like MongoDB, but it also supports a 
full-power query language with the expressiveness
+of SQL (and more).
+Unlike analytics engines like Hive or Spark, it stores and manages data, so 
AsterixDB can exploit its knowledge
+of data partitioning and the availability of indexes to avoid always scanning 
data set(s) to process queries. Somewhat
+surprisingly, there is no open source parallel database system (relational or 
otherwise) available to developers today
+– AsterixDB aims to fill this need.</p>
 
 <h3 id="core-features">Core features</h3>
 
@@ -103,28 +126,45 @@
 </ul>
 
 <h3 id="history">History</h3>
-<p>The current version of AsterixDB was co-developed by a team of faculty, 
staff, and students at UC Irvine and UC Riverside. The project was initiated as 
a large NSF-sponsored project in 2009, the goal of which was to combine the 
best ideas from the parallel database world, the then new Hadoop world, and the 
semi-structured (e.g., XML/JSON) data world in order to create a 
next-generation BDMS. A first informal open source release was made four years 
later, in June of 2013, under the Apache Software License 2.0. AsterixDB was 
accepted into the Apache Incubator and began Incubation as of Febuary of 
2015.</p>
+<p>Prior to being developed at the Apache Software Foundation AsterixDB was 
co-developed by a team of faculty, staff, and students at UC Irvine and UC 
Riverside.
+The project was initiated as a large NSF-sponsored project in 2009, the goal 
of which was to combine the best ideas from the parallel database world, the 
then new Hadoop world, and the semi-structured (e.g., XML/JSON) data world in 
order to create a next-generation BDMS.
+A first informal open source release was made four years later, in June of 
2013, under the Apache Software License 2.0.
+AsterixDB was accepted into the Apache Incubator and began Incubation as of 
Febuary of 2015.</p>
 
 
 </div>
 </div>
 
 
-   <hr />
+    <hr/>
 
-   <footer>
-        <div class="row">
-        <div class="col-md-6 col-md-offset-3  text-center">
-        <p>&copy; Copyright 2016 The Apache Software foundation. All Rights 
Reserved. </p>
-        <p>Apache AsterixDB, Apache, and the Apache feather logo are 
trademarks of the Apache Software Foundation</p>
+    <footer>
+      <div class="row">
+        <div class="col-md-9 col-centered">
+          <div class="col-md-9 text-left">
+            <p>Apache AsterixDB is an effort undergoing incubation at The 
Apache Software Foundation (ASF), sponsored
+              by the Apache Incubator.
+              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.</p>
+          </div>
+          <div class="col-md-3 text-right">
+            <img src="img/egg-logo.png" style="height:auto; width:200px; 
vertical-align:bottom;"/>
+          </div>
+      </div>
+      </div>
+      <div class="row">
+        <div class="col-md-9 col-centered text-center">
+          <p/>
+          <p>&copy; Copyright 2016 The Apache Software foundation. All Rights 
Reserved. </p>
+          <p>Apache AsterixDB, the Apache AsterixDB logo, Apache, and the 
Apache feather logo are trademarks of the
+            Apache Software Foundation</p>
         </div>
-        <div class="col-md-1 text-right">
-        <img src="img/egg-logo.png" style="height:auto; width:200px; 
vertical-align:bottom;"/>
-        </div>
-        </div>
-   </footer>
-    </div> <!-- /container -->
-
+      </div>
+    </footer>
+  </div> <!-- /container -->
 
     <!-- Bootstrap core JavaScript
     ================================================== -->
diff --git a/content/community.html b/content/community.html
index cc7d119..8c37a87 100644
--- a/content/community.html
+++ b/content/community.html
@@ -27,13 +27,15 @@
   </head>
 
   <div class="container theme-showcase" role="main">
-  <div class="masthead">
-    <p class="lead">
-        <a href="index.html"><img src="img/asterixdb.png" style="height:75px; 
width:auto; vertical-align:bottom; margin-top:10px;"/></a>
-    </p>
-</div>
+          <div class="masthead">
+        <p class="lead">
+           <a href="index.html">
+             <img src="img/asterixdb_tm.png" style="height:75px; width:auto; 
vertical-align:bottom; margin-top:10px;"/>
+           </a>
+        </p>
+      </div>
 
-<nav class="navbar navbar-default">
+      <nav class="navbar navbar-default">
         <div class="container">
           <div class="navbar-header">
             <button type="button" class="navbar-toggle collapsed" 
data-toggle="collapse" data-target=".navbar-collapse">
@@ -71,15 +73,31 @@
                 </ul>
               </li>
             </ul>
+            <ul class="nav navbar-nav navbar-right">
+              <li class="dropdown">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-expanded="false"
+                   style="padding-right: 30px">
+                  <img src="img/feather.png" style="height:20px"/>Apache 
Software Foundation<span class="caret"/>
+                </a>
+                <ul class="dropdown-menu dropdown-menu-right" role="menu">
+                  <li><a href="http://www.apache.org/";><b>ASF 
Homepage</b></a></li>
+                  <li><a 
href="http://www.apache.org/licenses/";>License</a></li>
+                  <li><a 
href="http://www.apache.org/foundation/sponsorship.html";>Donate</a></li>
+                  <li><a 
href="http://www.apache.org/foundation/thanks.html";>Thanks</a></li>
+                  <li><a 
href="http://www.apache.org/security/";>Security</a></li>
+                </ul>
+              </li>
+            </ul>
           </div><!--/.nav-collapse -->
         </div>
       </nav>
 
 
-  <div class="row">
+    <div class="row">
 <div class="col-md-10 col-centered">
 <h2>Community</h2>
-<p>Apache AsterixDB strives to support an open and transparent development 
process. Here are the various places where you can find discussions relating to 
the day to day development of AsterixDB and related projects, as well as 
answers to any AsterixDB-related questions.</p>
+<p>Apache AsterixDB™ (incubating) strives to support an open and transparent 
development process.
+Here are the various places where you can find discussions relating to the day 
to day development of AsterixDB and related projects, as well as answers to any 
AsterixDB-related questions.</p>
 
 <ul id="markdown-toc">
   <li><a href="#mailing-lists" id="markdown-toc-mailing-lists">Mailing 
Lists</a></li>
@@ -330,21 +348,35 @@
 </div>
 
 
-   <hr />
+    <hr/>
 
-   <footer>
-        <div class="row">
-        <div class="col-md-6 col-md-offset-3  text-center">
-        <p>&copy; Copyright 2016 The Apache Software foundation. All Rights 
Reserved. </p>
-        <p>Apache AsterixDB, Apache, and the Apache feather logo are 
trademarks of the Apache Software Foundation</p>
+    <footer>
+      <div class="row">
+        <div class="col-md-9 col-centered">
+          <div class="col-md-9 text-left">
+            <p>Apache AsterixDB is an effort undergoing incubation at The 
Apache Software Foundation (ASF), sponsored
+              by the Apache Incubator.
+              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.</p>
+          </div>
+          <div class="col-md-3 text-right">
+            <img src="img/egg-logo.png" style="height:auto; width:200px; 
vertical-align:bottom;"/>
+          </div>
+      </div>
+      </div>
+      <div class="row">
+        <div class="col-md-9 col-centered text-center">
+          <p/>
+          <p>&copy; Copyright 2016 The Apache Software foundation. All Rights 
Reserved. </p>
+          <p>Apache AsterixDB, the Apache AsterixDB logo, Apache, and the 
Apache feather logo are trademarks of the
+            Apache Software Foundation</p>
         </div>
-        <div class="col-md-1 text-right">
-        <img src="img/egg-logo.png" style="height:auto; width:200px; 
vertical-align:bottom;"/>
-        </div>
-        </div>
-   </footer>
-    </div> <!-- /container -->
-
+      </div>
+    </footer>
+  </div> <!-- /container -->
 
     <!-- Bootstrap core JavaScript
     ================================================== -->
diff --git a/content/dev-setup.html b/content/dev-setup.html
index 1447b09..b979cf2 100644
--- a/content/dev-setup.html
+++ b/content/dev-setup.html
@@ -27,13 +27,15 @@
   </head>
 
   <div class="container theme-showcase" role="main">
-  <div class="masthead">
-    <p class="lead">
-        <a href="index.html"><img src="img/asterixdb.png" style="height:75px; 
width:auto; vertical-align:bottom; margin-top:10px;"/></a>
-    </p>
-</div>
+          <div class="masthead">
+        <p class="lead">
+           <a href="index.html">
+             <img src="img/asterixdb_tm.png" style="height:75px; width:auto; 
vertical-align:bottom; margin-top:10px;"/>
+           </a>
+        </p>
+      </div>
 
-<nav class="navbar navbar-default">
+      <nav class="navbar navbar-default">
         <div class="container">
           <div class="navbar-header">
             <button type="button" class="navbar-toggle collapsed" 
data-toggle="collapse" data-target=".navbar-collapse">
@@ -71,12 +73,27 @@
                 </ul>
               </li>
             </ul>
+            <ul class="nav navbar-nav navbar-right">
+              <li class="dropdown">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-expanded="false"
+                   style="padding-right: 30px">
+                  <img src="img/feather.png" style="height:20px"/>Apache 
Software Foundation<span class="caret"/>
+                </a>
+                <ul class="dropdown-menu dropdown-menu-right" role="menu">
+                  <li><a href="http://www.apache.org/";><b>ASF 
Homepage</b></a></li>
+                  <li><a 
href="http://www.apache.org/licenses/";>License</a></li>
+                  <li><a 
href="http://www.apache.org/foundation/sponsorship.html";>Donate</a></li>
+                  <li><a 
href="http://www.apache.org/foundation/thanks.html";>Thanks</a></li>
+                  <li><a 
href="http://www.apache.org/security/";>Security</a></li>
+                </ul>
+              </li>
+            </ul>
           </div><!--/.nav-collapse -->
         </div>
       </nav>
 
 
-  <div class="row">
+    <div class="row">
 <div class="col-md-8 col-centered">
 <h2>Contributing to AsterixDB</h2>
 <hr />
@@ -112,7 +129,8 @@
 <hr />
 
 <h2 id="introduction">Introduction</h2>
-<p>We warmly welcome any contributions to the AsterixDB or related (Hyracks, 
Pregelix) projects. A great way to start contributing is to pick a bug labelled 
starter in JIRA and submit a patch for it, to get acquainted with our codebase 
and development process.</p>
+<p>We warmly welcome any contributions to the Apache AsterixDB™ (incubating) 
or related (Hyracks, Pregelix) projects.
+A great way to start contributing is to pick a bug labelled starter in JIRA 
and submit a patch for it, to get acquainted with our codebase and development 
process.</p>
 
 <hr />
 
@@ -385,21 +403,35 @@
 </div>
 
 
-   <hr />
+    <hr/>
 
-   <footer>
-        <div class="row">
-        <div class="col-md-6 col-md-offset-3  text-center">
-        <p>&copy; Copyright 2016 The Apache Software foundation. All Rights 
Reserved. </p>
-        <p>Apache AsterixDB, Apache, and the Apache feather logo are 
trademarks of the Apache Software Foundation</p>
+    <footer>
+      <div class="row">
+        <div class="col-md-9 col-centered">
+          <div class="col-md-9 text-left">
+            <p>Apache AsterixDB is an effort undergoing incubation at The 
Apache Software Foundation (ASF), sponsored
+              by the Apache Incubator.
+              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.</p>
+          </div>
+          <div class="col-md-3 text-right">
+            <img src="img/egg-logo.png" style="height:auto; width:200px; 
vertical-align:bottom;"/>
+          </div>
+      </div>
+      </div>
+      <div class="row">
+        <div class="col-md-9 col-centered text-center">
+          <p/>
+          <p>&copy; Copyright 2016 The Apache Software foundation. All Rights 
Reserved. </p>
+          <p>Apache AsterixDB, the Apache AsterixDB logo, Apache, and the 
Apache feather logo are trademarks of the
+            Apache Software Foundation</p>
         </div>
-        <div class="col-md-1 text-right">
-        <img src="img/egg-logo.png" style="height:auto; width:200px; 
vertical-align:bottom;"/>
-        </div>
-        </div>
-   </footer>
-    </div> <!-- /container -->
-
+      </div>
+    </footer>
+  </div> <!-- /container -->
 
     <!-- Bootstrap core JavaScript
     ================================================== -->
diff --git a/content/download.html b/content/download.html
index 515cd0c..3d2bde0 100644
--- a/content/download.html
+++ b/content/download.html
@@ -27,13 +27,15 @@
   </head>
 
   <div class="container theme-showcase" role="main">
-  <div class="masthead">
-    <p class="lead">
-        <a href="index.html"><img src="img/asterixdb.png" style="height:75px; 
width:auto; vertical-align:bottom; margin-top:10px;"/></a>
-    </p>
-</div>
+          <div class="masthead">
+        <p class="lead">
+           <a href="index.html">
+             <img src="img/asterixdb_tm.png" style="height:75px; width:auto; 
vertical-align:bottom; margin-top:10px;"/>
+           </a>
+        </p>
+      </div>
 
-<nav class="navbar navbar-default">
+      <nav class="navbar navbar-default">
         <div class="container">
           <div class="navbar-header">
             <button type="button" class="navbar-toggle collapsed" 
data-toggle="collapse" data-target=".navbar-collapse">
@@ -71,12 +73,27 @@
                 </ul>
               </li>
             </ul>
+            <ul class="nav navbar-nav navbar-right">
+              <li class="dropdown">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-expanded="false"
+                   style="padding-right: 30px">
+                  <img src="img/feather.png" style="height:20px"/>Apache 
Software Foundation<span class="caret"/>
+                </a>
+                <ul class="dropdown-menu dropdown-menu-right" role="menu">
+                  <li><a href="http://www.apache.org/";><b>ASF 
Homepage</b></a></li>
+                  <li><a 
href="http://www.apache.org/licenses/";>License</a></li>
+                  <li><a 
href="http://www.apache.org/foundation/sponsorship.html";>Donate</a></li>
+                  <li><a 
href="http://www.apache.org/foundation/thanks.html";>Thanks</a></li>
+                  <li><a 
href="http://www.apache.org/security/";>Security</a></li>
+                </ul>
+              </li>
+            </ul>
           </div><!--/.nav-collapse -->
         </div>
       </nav>
 
 
-  <div class="row">
+    <div class="row">
 <div class="col-md-8 col-centered">
 <h2>Download</h2>
 <div class="row">
@@ -87,15 +104,16 @@
 <div class="row">
 <div class="col-md-6">
 
-    <p>AsterixDB Source releases as a tarball/zip are available below.
-Feel free to browse and download the source tree of AsterixDB (and Hyracks) 
from our GitHub mirror.</p>
+    <p>Apache AsterixDB™ (incubating) source releases as a tarball/zip are 
available on the ASF mirror of your choice.</p>
+
+    <p>Feel free to browse and download the source tree of AsterixDB (and 
Hyracks) from our GitHub mirror.</p>
 
   </div>
 <div class="col-md-6">
 
+    <p><a class="btn btn-md btn-info" 
href="https://www.apache.org/dyn/closer.cgi/incubator/asterixdb"; 
role="button">Source Tarballs <i class="fa fa-download fa-lg"></i></a></p>
     <p><a class="btn btn-md btn-info" 
href="https://github.com/apache/incubator-asterixdb/"; role="button">AsterixDB 
on GitHub <i class="fa fa-github fa-lg"></i></a></p>
     <p><a class="btn btn-md btn-info" 
href="https://github.com/apache/incubator-asterixdb-hyracks/"; 
role="button">Hyracks on GitHub <i class="fa fa-github fa-lg"></i></a></p>
-    <p><a class="btn btn-md btn-info" 
href="https://www.apache.org/dyn/closer.cgi/incubator/asterixdb"; 
role="button">Source Tarballs <i class="fa fa-download fa-lg"></i></a></p>
 
   </div>
 </div>
@@ -111,7 +129,7 @@
 <div class="row">
 
 <div class="col-md-6">
-    <p>This packaging is most suitable for installation on a cluster without 
Hadoop or YARN. Choose from either a stable release or the latest build from 
our master branch.</p>
+    <p>This packaging is most suitable for installation on a cluster without 
Hadoop or YARN.</p>
   </div>
 
 <div class="col-md-6">
@@ -149,21 +167,35 @@
 </div>
 
 
-   <hr />
+    <hr/>
 
-   <footer>
-        <div class="row">
-        <div class="col-md-6 col-md-offset-3  text-center">
-        <p>&copy; Copyright 2016 The Apache Software foundation. All Rights 
Reserved. </p>
-        <p>Apache AsterixDB, Apache, and the Apache feather logo are 
trademarks of the Apache Software Foundation</p>
+    <footer>
+      <div class="row">
+        <div class="col-md-9 col-centered">
+          <div class="col-md-9 text-left">
+            <p>Apache AsterixDB is an effort undergoing incubation at The 
Apache Software Foundation (ASF), sponsored
+              by the Apache Incubator.
+              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.</p>
+          </div>
+          <div class="col-md-3 text-right">
+            <img src="img/egg-logo.png" style="height:auto; width:200px; 
vertical-align:bottom;"/>
+          </div>
+      </div>
+      </div>
+      <div class="row">
+        <div class="col-md-9 col-centered text-center">
+          <p/>
+          <p>&copy; Copyright 2016 The Apache Software foundation. All Rights 
Reserved. </p>
+          <p>Apache AsterixDB, the Apache AsterixDB logo, Apache, and the 
Apache feather logo are trademarks of the
+            Apache Software Foundation</p>
         </div>
-        <div class="col-md-1 text-right">
-        <img src="img/egg-logo.png" style="height:auto; width:200px; 
vertical-align:bottom;"/>
-        </div>
-        </div>
-   </footer>
-    </div> <!-- /container -->
-
+      </div>
+    </footer>
+  </div> <!-- /container -->
 
     <!-- Bootstrap core JavaScript
     ================================================== -->
diff --git a/content/features.md b/content/features.md
index c131ac0..bbf57ff 100644
--- a/content/features.md
+++ b/content/features.md
@@ -1,7 +1,7 @@
 
 # AsterixDB Features#
 
-AsterixDB is a BDMS (Big Data Management System) with a rich feature set that
+Apache AsterixDB&trade; (incubating) is a BDMS (Big Data Management System) 
with a rich feature set that
 sets it apart from other Big Data platforms.
 Its feature set makes it well-suited to modern needs such as web data
 warehousing and social data storage and analysis. AsterixDB has:
@@ -24,13 +24,3 @@
    parametric queries
  * Basic transactional (concurrency and recovery) capabilities akin to those of
    a NoSQL store
-
-### Disclaimer ###
-Apache AsterixDB is an effort undergoing incubation at The Apache Software
-Foundation (ASF), sponsored by the Apache incubator.
-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.
diff --git a/content/img/asf_logo.png b/content/img/asf_logo.png
new file mode 100644
index 0000000..8dca813
--- /dev/null
+++ b/content/img/asf_logo.png
Binary files differ
diff --git a/content/img/asterixdb_tm.png b/content/img/asterixdb_tm.png
new file mode 100644
index 0000000..0fa2ff0
--- /dev/null
+++ b/content/img/asterixdb_tm.png
Binary files differ
diff --git a/content/img/feather.png b/content/img/feather.png
new file mode 100644
index 0000000..744b8d7
--- /dev/null
+++ b/content/img/feather.png
Binary files differ
diff --git a/content/index.html b/content/index.html
index d8a86fd..486dea9 100644
--- a/content/index.html
+++ b/content/index.html
@@ -27,13 +27,15 @@
   </head>
 
   <div class="container theme-showcase" role="main">
-  <div class="masthead">
-    <p class="lead">
-        <a href="index.html"><img src="img/asterixdb.png" style="height:75px; 
width:auto; vertical-align:bottom; margin-top:10px;"/></a>
-    </p>
-</div>
+          <div class="masthead">
+        <p class="lead">
+           <a href="index.html">
+             <img src="img/asterixdb_tm.png" style="height:75px; width:auto; 
vertical-align:bottom; margin-top:10px;"/>
+           </a>
+        </p>
+      </div>
 
-<nav class="navbar navbar-default">
+      <nav class="navbar navbar-default">
         <div class="container">
           <div class="navbar-header">
             <button type="button" class="navbar-toggle collapsed" 
data-toggle="collapse" data-target=".navbar-collapse">
@@ -71,24 +73,41 @@
                 </ul>
               </li>
             </ul>
+            <ul class="nav navbar-nav navbar-right">
+              <li class="dropdown">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-expanded="false"
+                   style="padding-right: 30px">
+                  <img src="img/feather.png" style="height:20px"/>Apache 
Software Foundation<span class="caret"/>
+                </a>
+                <ul class="dropdown-menu dropdown-menu-right" role="menu">
+                  <li><a href="http://www.apache.org/";><b>ASF 
Homepage</b></a></li>
+                  <li><a 
href="http://www.apache.org/licenses/";>License</a></li>
+                  <li><a 
href="http://www.apache.org/foundation/sponsorship.html";>Donate</a></li>
+                  <li><a 
href="http://www.apache.org/foundation/thanks.html";>Thanks</a></li>
+                  <li><a 
href="http://www.apache.org/security/";>Security</a></li>
+                </ul>
+              </li>
+            </ul>
           </div><!--/.nav-collapse -->
         </div>
       </nav>
 
 
-  <div class="row">
+    <div class="row">
  <div class="col-md-9 col-centered">
-   <div class="well text-center"><p class="lead text-center"><strong>Apache 
AsterixDB</strong> is an open source Big Data Management System (BDMS).</p>
+   <div class="well text-center"><p class="lead text-center">
+     <strong>Apache AsterixDB</strong>™ (incubating) is an open source Big 
Data Management System (BDMS).</p>
    </div>
  </div>
 </div>
 
-<div class="row"><div class="col-md-3 col-centered text-center">
+<div class="row">
+  <div class="col-md-3 col-centered text-center">
     <h2 id="feature-overview">Feature Overview</h2>
 
     <hr />
-
-  </div></div>
+  </div>
+</div>
 
 <div class="text-center">
 <div class="col-md-5 col-md-offset-1">
@@ -230,7 +249,7 @@
 See the installation [guide](docs/install.html), and check out [AsterixDB 
101](docs/aql/primer.html) to start using AsterixDB right away.
 !-->
   </div>
-<div class="col-md-6">
+<div class="col-md-9 col-centered">
     <h3 id="community-and-support">Community and Support</h3>
     <p>If you have any questions, please feel free to ask on our <a 
href="&#109;&#097;&#105;&#108;&#116;&#111;:&#117;&#115;&#101;&#114;&#115;&#064;&#097;&#115;&#116;&#101;&#114;&#105;&#120;&#100;&#098;&#046;&#105;&#110;&#099;&#117;&#098;&#097;&#116;&#111;&#114;&#046;&#097;&#112;&#097;&#099;&#104;&#101;&#046;&#111;&#114;&#103;">users</a>
 mailing list, which you can subscribe to by sending an empty email to <a 
href="[email protected]">users-subscribe</a>. 
Check out the <a href="community.html">Community</a> page for more details.</p>
 
@@ -239,21 +258,35 @@
 </div>
 
 
-   <hr />
+    <hr/>
 
-   <footer>
-        <div class="row">
-        <div class="col-md-6 col-md-offset-3  text-center">
-        <p>&copy; Copyright 2016 The Apache Software foundation. All Rights 
Reserved. </p>
-        <p>Apache AsterixDB, Apache, and the Apache feather logo are 
trademarks of the Apache Software Foundation</p>
+    <footer>
+      <div class="row">
+        <div class="col-md-9 col-centered">
+          <div class="col-md-9 text-left">
+            <p>Apache AsterixDB is an effort undergoing incubation at The 
Apache Software Foundation (ASF), sponsored
+              by the Apache Incubator.
+              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.</p>
+          </div>
+          <div class="col-md-3 text-right">
+            <img src="img/egg-logo.png" style="height:auto; width:200px; 
vertical-align:bottom;"/>
+          </div>
+      </div>
+      </div>
+      <div class="row">
+        <div class="col-md-9 col-centered text-center">
+          <p/>
+          <p>&copy; Copyright 2016 The Apache Software foundation. All Rights 
Reserved. </p>
+          <p>Apache AsterixDB, the Apache AsterixDB logo, Apache, and the 
Apache feather logo are trademarks of the
+            Apache Software Foundation</p>
         </div>
-        <div class="col-md-1 text-right">
-        <img src="img/egg-logo.png" style="height:auto; width:200px; 
vertical-align:bottom;"/>
-        </div>
-        </div>
-   </footer>
-    </div> <!-- /container -->
-
+      </div>
+    </footer>
+  </div> <!-- /container -->
 
     <!-- Bootstrap core JavaScript
     ================================================== -->
diff --git a/content/pushing.html b/content/pushing.html
index d9ec3e3..87f49f4 100644
--- a/content/pushing.html
+++ b/content/pushing.html
@@ -27,13 +27,15 @@
   </head>
 
   <div class="container theme-showcase" role="main">
-  <div class="masthead">
-    <p class="lead">
-        <a href="index.html"><img src="img/asterixdb.png" style="height:75px; 
width:auto; vertical-align:bottom; margin-top:10px;"/></a>
-    </p>
-</div>
+          <div class="masthead">
+        <p class="lead">
+           <a href="index.html">
+             <img src="img/asterixdb_tm.png" style="height:75px; width:auto; 
vertical-align:bottom; margin-top:10px;"/>
+           </a>
+        </p>
+      </div>
 
-<nav class="navbar navbar-default">
+      <nav class="navbar navbar-default">
         <div class="container">
           <div class="navbar-header">
             <button type="button" class="navbar-toggle collapsed" 
data-toggle="collapse" data-target=".navbar-collapse">
@@ -71,12 +73,27 @@
                 </ul>
               </li>
             </ul>
+            <ul class="nav navbar-nav navbar-right">
+              <li class="dropdown">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-expanded="false"
+                   style="padding-right: 30px">
+                  <img src="img/feather.png" style="height:20px"/>Apache 
Software Foundation<span class="caret"/>
+                </a>
+                <ul class="dropdown-menu dropdown-menu-right" role="menu">
+                  <li><a href="http://www.apache.org/";><b>ASF 
Homepage</b></a></li>
+                  <li><a 
href="http://www.apache.org/licenses/";>License</a></li>
+                  <li><a 
href="http://www.apache.org/foundation/sponsorship.html";>Donate</a></li>
+                  <li><a 
href="http://www.apache.org/foundation/thanks.html";>Thanks</a></li>
+                  <li><a 
href="http://www.apache.org/security/";>Security</a></li>
+                </ul>
+              </li>
+            </ul>
           </div><!--/.nav-collapse -->
         </div>
       </nav>
 
 
-  <div class="row">
+    <div class="row">
 <div class="col-md-8 col-centered">
 <h2>Submitting Changes</h2>
 <ul id="markdown-toc">
@@ -138,21 +155,35 @@
 </div>
 
 
-   <hr />
+    <hr/>
 
-   <footer>
-        <div class="row">
-        <div class="col-md-6 col-md-offset-3  text-center">
-        <p>&copy; Copyright 2016 The Apache Software foundation. All Rights 
Reserved. </p>
-        <p>Apache AsterixDB, Apache, and the Apache feather logo are 
trademarks of the Apache Software Foundation</p>
+    <footer>
+      <div class="row">
+        <div class="col-md-9 col-centered">
+          <div class="col-md-9 text-left">
+            <p>Apache AsterixDB is an effort undergoing incubation at The 
Apache Software Foundation (ASF), sponsored
+              by the Apache Incubator.
+              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.</p>
+          </div>
+          <div class="col-md-3 text-right">
+            <img src="img/egg-logo.png" style="height:auto; width:200px; 
vertical-align:bottom;"/>
+          </div>
+      </div>
+      </div>
+      <div class="row">
+        <div class="col-md-9 col-centered text-center">
+          <p/>
+          <p>&copy; Copyright 2016 The Apache Software foundation. All Rights 
Reserved. </p>
+          <p>Apache AsterixDB, the Apache AsterixDB logo, Apache, and the 
Apache feather logo are trademarks of the
+            Apache Software Foundation</p>
         </div>
-        <div class="col-md-1 text-right">
-        <img src="img/egg-logo.png" style="height:auto; width:200px; 
vertical-align:bottom;"/>
-        </div>
-        </div>
-   </footer>
-    </div> <!-- /container -->
-
+      </div>
+    </footer>
+  </div> <!-- /container -->
 
     <!-- Bootstrap core JavaScript
     ================================================== -->
diff --git a/content/site.html b/content/site.html
index 968b184..f6d603b 100644
--- a/content/site.html
+++ b/content/site.html
@@ -27,13 +27,15 @@
   </head>
 
   <div class="container theme-showcase" role="main">
-  <div class="masthead">
-    <p class="lead">
-        <a href="index.html"><img src="img/asterixdb.png" style="height:75px; 
width:auto; vertical-align:bottom; margin-top:10px;"/></a>
-    </p>
-</div>
+          <div class="masthead">
+        <p class="lead">
+           <a href="index.html">
+             <img src="img/asterixdb_tm.png" style="height:75px; width:auto; 
vertical-align:bottom; margin-top:10px;"/>
+           </a>
+        </p>
+      </div>
 
-<nav class="navbar navbar-default">
+      <nav class="navbar navbar-default">
         <div class="container">
           <div class="navbar-header">
             <button type="button" class="navbar-toggle collapsed" 
data-toggle="collapse" data-target=".navbar-collapse">
@@ -71,12 +73,27 @@
                 </ul>
               </li>
             </ul>
+            <ul class="nav navbar-nav navbar-right">
+              <li class="dropdown">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-expanded="false"
+                   style="padding-right: 30px">
+                  <img src="img/feather.png" style="height:20px"/>Apache 
Software Foundation<span class="caret"/>
+                </a>
+                <ul class="dropdown-menu dropdown-menu-right" role="menu">
+                  <li><a href="http://www.apache.org/";><b>ASF 
Homepage</b></a></li>
+                  <li><a 
href="http://www.apache.org/licenses/";>License</a></li>
+                  <li><a 
href="http://www.apache.org/foundation/sponsorship.html";>Donate</a></li>
+                  <li><a 
href="http://www.apache.org/foundation/thanks.html";>Thanks</a></li>
+                  <li><a 
href="http://www.apache.org/security/";>Security</a></li>
+                </ul>
+              </li>
+            </ul>
           </div><!--/.nav-collapse -->
         </div>
       </nav>
 
 
-  <div class="row">
+    <div class="row">
 <div class="col-md-8 col-centered">
 <h2>Editing this website</h2>
 <!-- Major credit to the Apache Flink guys for writing a great doc in a 
similar vein for their website
@@ -196,21 +213,35 @@
 </div>
 
 
-   <hr />
+    <hr/>
 
-   <footer>
-        <div class="row">
-        <div class="col-md-6 col-md-offset-3  text-center">
-        <p>&copy; Copyright 2016 The Apache Software foundation. All Rights 
Reserved. </p>
-        <p>Apache AsterixDB, Apache, and the Apache feather logo are 
trademarks of the Apache Software Foundation</p>
+    <footer>
+      <div class="row">
+        <div class="col-md-9 col-centered">
+          <div class="col-md-9 text-left">
+            <p>Apache AsterixDB is an effort undergoing incubation at The 
Apache Software Foundation (ASF), sponsored
+              by the Apache Incubator.
+              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.</p>
+          </div>
+          <div class="col-md-3 text-right">
+            <img src="img/egg-logo.png" style="height:auto; width:200px; 
vertical-align:bottom;"/>
+          </div>
+      </div>
+      </div>
+      <div class="row">
+        <div class="col-md-9 col-centered text-center">
+          <p/>
+          <p>&copy; Copyright 2016 The Apache Software foundation. All Rights 
Reserved. </p>
+          <p>Apache AsterixDB, the Apache AsterixDB logo, Apache, and the 
Apache feather logo are trademarks of the
+            Apache Software Foundation</p>
         </div>
-        <div class="col-md-1 text-right">
-        <img src="img/egg-logo.png" style="height:auto; width:200px; 
vertical-align:bottom;"/>
-        </div>
-        </div>
-   </footer>
-    </div> <!-- /container -->
-
+      </div>
+    </footer>
+  </div> <!-- /container -->
 
     <!-- Bootstrap core JavaScript
     ================================================== -->
diff --git a/content/tools.html b/content/tools.html
index ea29122..c48e992 100644
--- a/content/tools.html
+++ b/content/tools.html
@@ -27,13 +27,15 @@
   </head>
 
   <div class="container theme-showcase" role="main">
-  <div class="masthead">
-    <p class="lead">
-        <a href="index.html"><img src="img/asterixdb.png" style="height:75px; 
width:auto; vertical-align:bottom; margin-top:10px;"/></a>
-    </p>
-</div>
+          <div class="masthead">
+        <p class="lead">
+           <a href="index.html">
+             <img src="img/asterixdb_tm.png" style="height:75px; width:auto; 
vertical-align:bottom; margin-top:10px;"/>
+           </a>
+        </p>
+      </div>
 
-<nav class="navbar navbar-default">
+      <nav class="navbar navbar-default">
         <div class="container">
           <div class="navbar-header">
             <button type="button" class="navbar-toggle collapsed" 
data-toggle="collapse" data-target=".navbar-collapse">
@@ -71,15 +73,31 @@
                 </ul>
               </li>
             </ul>
+            <ul class="nav navbar-nav navbar-right">
+              <li class="dropdown">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-expanded="false"
+                   style="padding-right: 30px">
+                  <img src="img/feather.png" style="height:20px"/>Apache 
Software Foundation<span class="caret"/>
+                </a>
+                <ul class="dropdown-menu dropdown-menu-right" role="menu">
+                  <li><a href="http://www.apache.org/";><b>ASF 
Homepage</b></a></li>
+                  <li><a 
href="http://www.apache.org/licenses/";>License</a></li>
+                  <li><a 
href="http://www.apache.org/foundation/sponsorship.html";>Donate</a></li>
+                  <li><a 
href="http://www.apache.org/foundation/thanks.html";>Thanks</a></li>
+                  <li><a 
href="http://www.apache.org/security/";>Security</a></li>
+                </ul>
+              </li>
+            </ul>
           </div><!--/.nav-collapse -->
         </div>
       </nav>
 
 
-  <div class="row">
+    <div class="row">
 <div class="col-md-10 col-centered">
 <h2>Tools</h2>
-<p>Apache AsterixDB is built and maintained using a variety of open source and 
commerical tools. This page lists some of them, in no particular order.</p>
+<p>Apache AsterixDB™ (incubating) is built and maintained using a variety of 
open source and commerical tools.
+This page lists some of them, in no particular order.</p>
 
 <ul id="markdown-toc">
   <li><a href="#apache-tools" id="markdown-toc-apache-tools">Apache 
Tools</a></li>
@@ -127,21 +145,35 @@
 </div>
 
 
-   <hr />
+    <hr/>
 
-   <footer>
-        <div class="row">
-        <div class="col-md-6 col-md-offset-3  text-center">
-        <p>&copy; Copyright 2016 The Apache Software foundation. All Rights 
Reserved. </p>
-        <p>Apache AsterixDB, Apache, and the Apache feather logo are 
trademarks of the Apache Software Foundation</p>
+    <footer>
+      <div class="row">
+        <div class="col-md-9 col-centered">
+          <div class="col-md-9 text-left">
+            <p>Apache AsterixDB is an effort undergoing incubation at The 
Apache Software Foundation (ASF), sponsored
+              by the Apache Incubator.
+              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.</p>
+          </div>
+          <div class="col-md-3 text-right">
+            <img src="img/egg-logo.png" style="height:auto; width:200px; 
vertical-align:bottom;"/>
+          </div>
+      </div>
+      </div>
+      <div class="row">
+        <div class="col-md-9 col-centered text-center">
+          <p/>
+          <p>&copy; Copyright 2016 The Apache Software foundation. All Rights 
Reserved. </p>
+          <p>Apache AsterixDB, the Apache AsterixDB logo, Apache, and the 
Apache feather logo are trademarks of the
+            Apache Software Foundation</p>
         </div>
-        <div class="col-md-1 text-right">
-        <img src="img/egg-logo.png" style="height:auto; width:200px; 
vertical-align:bottom;"/>
-        </div>
-        </div>
-   </footer>
-    </div> <!-- /container -->
-
+      </div>
+    </footer>
+  </div> <!-- /container -->
 
     <!-- Bootstrap core JavaScript
     ================================================== -->
diff --git a/dev-setup.md b/dev-setup.md
index 9ea4b2c..0a91032 100644
--- a/dev-setup.md
+++ b/dev-setup.md
@@ -11,7 +11,8 @@
 ---
 
 ## Introduction
-We warmly welcome any contributions to the AsterixDB or related (Hyracks, 
Pregelix) projects. A great way to start contributing is to pick a bug labelled 
starter in JIRA and submit a patch for it, to get acquainted with our codebase 
and development process.
+We warmly welcome any contributions to the Apache AsterixDB&trade; 
(incubating) or related (Hyracks, Pregelix) projects.
+A great way to start contributing is to pick a bug labelled starter in JIRA 
and submit a patch for it, to get acquainted with our codebase and development 
process.
 
 ---
 
diff --git a/download.md b/download.md
index ce711b4..741501f 100644
--- a/download.md
+++ b/download.md
@@ -10,16 +10,16 @@
 <div class="row">
 <div class="col-md-6" markdown="1">
 
-AsterixDB Source releases as a tarball/zip are available below.
-Feel free to browse and download the source tree of AsterixDB (and Hyracks) 
from our GitHub mirror.
+Apache AsterixDB&trade; (incubating) source releases as a tarball/zip are 
available on the ASF mirror of your choice.
 
+Feel free to browse and download the source tree of AsterixDB (and Hyracks) 
from our GitHub mirror.
 
 </div>
 <div class="col-md-6" markdown="1">
 
+<p><a class="btn btn-md btn-info" 
href="https://www.apache.org/dyn/closer.cgi/incubator/asterixdb"; 
role="button">Source Tarballs <i class="fa fa-download fa-lg"></i></a></p>
 <p><a class="btn btn-md btn-info" 
href="https://github.com/apache/incubator-asterixdb/"; role="button">AsterixDB 
on GitHub <i class="fa fa-github fa-lg"></i></a></p>
 <p><a class="btn btn-md btn-info" 
href="https://github.com/apache/incubator-asterixdb-hyracks/"; 
role="button">Hyracks on GitHub <i class="fa fa-github fa-lg"></i></a></p>
-<p><a class="btn btn-md btn-info" 
href="https://www.apache.org/dyn/closer.cgi/incubator/asterixdb"; 
role="button">Source Tarballs <i class="fa fa-download fa-lg"></i></a></p>
 
 </div>
 </div>
@@ -36,7 +36,7 @@
 <div class="row">
 
 <div class="col-md-6" markdown="1">
-This packaging is most suitable for installation on a cluster without Hadoop 
or YARN. Choose from either a stable release or the latest build from our 
master branch.
+This packaging is most suitable for installation on a cluster without Hadoop 
or YARN.
 </div>
 
 <div class="col-md-6" markdown="1">
diff --git a/features.md b/features.md
index c131ac0..bbf57ff 100644
--- a/features.md
+++ b/features.md
@@ -1,7 +1,7 @@
 
 # AsterixDB Features#
 
-AsterixDB is a BDMS (Big Data Management System) with a rich feature set that
+Apache AsterixDB&trade; (incubating) is a BDMS (Big Data Management System) 
with a rich feature set that
 sets it apart from other Big Data platforms.
 Its feature set makes it well-suited to modern needs such as web data
 warehousing and social data storage and analysis. AsterixDB has:
@@ -24,13 +24,3 @@
    parametric queries
  * Basic transactional (concurrency and recovery) capabilities akin to those of
    a NoSQL store
-
-### Disclaimer ###
-Apache AsterixDB is an effort undergoing incubation at The Apache Software
-Foundation (ASF), sponsored by the Apache incubator.
-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.
diff --git a/img/asf_logo.png b/img/asf_logo.png
new file mode 100644
index 0000000..8dca813
--- /dev/null
+++ b/img/asf_logo.png
Binary files differ
diff --git a/img/asterixdb_tm.png b/img/asterixdb_tm.png
new file mode 100644
index 0000000..0fa2ff0
--- /dev/null
+++ b/img/asterixdb_tm.png
Binary files differ
diff --git a/img/feather.png b/img/feather.png
new file mode 100644
index 0000000..744b8d7
--- /dev/null
+++ b/img/feather.png
Binary files differ
diff --git a/index.md b/index.md
index fffa8b8..9eb9851 100644
--- a/index.md
+++ b/index.md
@@ -5,18 +5,20 @@
 
 <div class="row">
  <div class="col-md-9 col-centered">
-   <div class="well text-center"><p class="lead text-center" 
markdown="1">__Apache AsterixDB__ is an open source Big Data Management System 
(BDMS).</p>
+   <div class="well text-center"><p class="lead text-center" markdown="1">
+     __Apache AsterixDB__&trade; (incubating) is an open source Big Data 
Management System (BDMS).</p>
    </div>
  </div>
 </div>
 
 
-<div class="row"><div class="col-md-3 col-centered text-center" markdown="1">
+<div class="row">
+  <div class="col-md-3 col-centered text-center" markdown="1">
 ## Feature Overview
 
 ----
-
-</div></div>
+  </div>
+</div>
 
 <div class="row" class="text-center">
 <div class="col-md-5 col-md-offset-1" markdown="1">
@@ -163,7 +165,7 @@
 See the installation [guide]({{ site.DOCS_BASE_URL }}/install.html), and check 
out [AsterixDB 101]({{ site.DOCS_BASE_URL }}/aql/primer.html) to start using 
AsterixDB right away.
 !-->
 </div>
-<div class="col-md-6" markdown="1">
+<div class="col-md-9 col-centered" markdown="1">
 ### Community and Support
 If you have any questions, please feel free to ask on our 
[users](mailto:[email protected]) mailing list, which you 
can subscribe to by sending an empty email to 
[users-subscribe]([email protected]). Check out 
the [Community]({{ site.url }}community.html) page for more details.
 
diff --git a/tools.md b/tools.md
index e33c359..4d0a925 100644
--- a/tools.md
+++ b/tools.md
@@ -3,7 +3,8 @@
 layout: wide
 ---
 
-Apache AsterixDB is built and maintained using a variety of open source and 
commerical tools. This page lists some of them, in no particular order. 
+Apache AsterixDB&trade; (incubating) is built and maintained using a variety 
of open source and commerical tools.
+This page lists some of them, in no particular order.
 
 
 * TOC

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/717
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I645e5b3474de203ee62e9c0cf34317d02722bc69
Gerrit-PatchSet: 1
Gerrit-Project: incubator-asterixdb-site
Gerrit-Branch: asf-site
Gerrit-Owner: Till Westmann <[email protected]>

Reply via email to