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
* also ordered committers alphabetically (not a requirement ...)

Change-Id: I645e5b3474de203ee62e9c0cf34317d02722bc69
Reviewed-on: https://asterix-gerrit.ics.uci.edu/717
Reviewed-by: Ian Maxon <imaxon@apache.org>

_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>

_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
     ================================================== -->

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™ (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 @@ AsterixDB is a highly scalable data management system that can store,index, and
   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.
 

community.md

@@ -3,7 +3,8 @@ title: Community
 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™ (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 }
@@ -32,31 +33,31 @@ Some of the developers hang out in #asterixdb on irc.freenode.net. Feel free to
 {:.table .table-striped}
 |                                                                    | Name              | Organization       | Apache ID  |
 |--------------------------------------------------------------------|-------------------|--------------------|------------|
-|<img src="img/team/michael_carey.jpg" width="100" height="100">     | Michael Carey     | UC Irvine          | dtabass    |
-|<img src="img/team/till_westmann.jpg"  width="100" height="100">    | Till Westmann     | Couchbase          | tillw      |
-|<img src="img/team/vinayak_borkar.jpg"  width="100" height="100">   | Vinayak Borkar    | X15 Software       | vborkar    |
-|<img src="img/team/vassilis_tsotras.jpg" width="100" height="100">  | Vassilis Tsotras  | UC Riverside       | tsotras    |
+|<img src="img/team/abdullah_alamoudi.jpg" width="100" height="100"> | Abdullah Alamoudi | Couchbase          | amoudi     |
+|<img src="img/team/anonymous.jpg"     width="100" height="100">     | Cameron Samak     | UC Irvine          | csamak     |
 |<img src="img/team/chen_li.jpg"  width="100" height="100">          | Chen Li           | UC Irvine          | chenli     |
-|<img src="img/team/yingyi_bu.jpg" width="100" height="100">         | Yingyi Bu         | Couchbase          | buyingyi   |
-|<img src="img/team/young_seok_kim.jpg" width="100" height="100">    | Young-Seok Kim    | UC Irvine          | kisskys    |
-|<img src="img/team/inci_cetindil.jpg" width="100" height="100">     | Inci Cetindil     | UC Irvine          | icetindil  |
-|<img src="img/team/raman_grover.jpg" width="100" height="100">      | Raman Grover      | Microsoft Research | raman      |
-|<img src="img/team/pouria_pirzadeh.jpg" width="100" height="100">   | Pouria Pirzadeh   | UC Irvine          | pouria     |
-|<img src="img/team/murtadha_hubail.jpg" width="100" height="100">   | Murtadha Hubail   | UC Irvine          | mhubail    |
+|<img src="img/team/chris_hillery.jpg" width="100" height="100">     | Chris Hillery     | Couchbase          | ceej       |
+|<img src="img/team/heri_ramampiaro.jpg" width="100" height="100">   | Heri Ramampiaro   | NTNU Trondheim     | heri       |
 |<img src="img/team/ian_maxon.jpg" width="100" height="100">         | Ian Maxon         | UC Irvine          | imaxon     |
+|<img src="img/team/ildar_absalyamov.jpg" width="100" height="100">  | Ildar Absalyamov  | UC Riverside       | ildar      |
+|<img src="img/team/inci_cetindil.jpg" width="100" height="100">     | Inci Cetindil     | UC Irvine          | icetindil  |
 |<img src="img/team/jianfeng_jia.jpg"  width="100" height="100">     | Jianfeng Jia      | UC Irvine          | jianfeng   |
-|<img src="img/team/taewoo_kim.jpg"  width="100" height="100">       | Taewoo Kim        | UC Irvine          | wangsaeu   |
-|<img src="img/team/anonymous.jpg"     width="100" height="100">     | Cameron Samak     | UC Irvine          | csamak     |
+|<img src="img/team/keren_ouaknine.jpg"  width="100" height="100">   | Keren Ouaknine    | Hebrew University  | kereno     |
+|<img src="img/team/anonymous.jpg"  width="100" height="100">        | Markus Dreseler   | HPI                | mrks       |
+|<img src="img/team/michael_carey.jpg" width="100" height="100">     | Michael Carey     | UC Irvine          | dtabass    |
+|<img src="img/team/murtadha_hubail.jpg" width="100" height="100">   | Murtadha Hubail   | UC Irvine          | mhubail    |
+|<img src="img/team/pouria_pirzadeh.jpg" width="100" height="100">   | Pouria Pirzadeh   | UC Irvine          | pouria     |
+|<img src="img/team/anonymous.jpg" width="100" height="100">         | Preston Carman    | UC Riverside       | prestonc   |
+|<img src="img/team/raman_grover.jpg" width="100" height="100">      | Raman Grover      | Microsoft Research | raman      |
 |<img src="img/team/sattam_alsubaiee.png" width="100" height="100">  | Sattam Alsubaiee  | KACST Saudi Arabia | salsubaiee |
 |<img src="img/team/steven_jacobs.jpg" width="100" height="100">     | Steven Jacobs     | UC Riverside       | sjaco002   |
-|<img src="img/team/ildar_absalyamov.jpg" width="100" height="100">  | Ildar Absalyamov  | UC Riverside       | ildar      |
-|<img src="img/team/anonymous.jpg" width="100" height="100">         | Preston Carman    | UC Riverside       | prestonc   |
-|<img src="img/team/abdullah_alamoudi.jpg" width="100" height="100"> | Abdullah Alamoudi | Couchbase          | amoudi     |
+|<img src="img/team/taewoo_kim.jpg"  width="100" height="100">       | Taewoo Kim        | UC Irvine          | wangsaeu   |
+|<img src="img/team/till_westmann.jpg"  width="100" height="100">    | Till Westmann     | Couchbase          | tillw      |
+|<img src="img/team/vassilis_tsotras.jpg" width="100" height="100">  | Vassilis Tsotras  | UC Riverside       | tsotras    |
+|<img src="img/team/vinayak_borkar.jpg"  width="100" height="100">   | Vinayak Borkar    | X15 Software       | vborkar    |
+|<img src="img/team/yingyi_bu.jpg" width="100" height="100">         | Yingyi Bu         | Couchbase          | buyingyi   |
+|<img src="img/team/young_seok_kim.jpg" width="100" height="100">    | Young-Seok Kim    | UC Irvine          | kisskys    |
 |<img src="img/team/zachary_heilbron.jpg"  width="100" height="100"> | Zach Heilbron     | X15 Software       | zheilbron  |
-|<img src="img/team/anonymous.jpg"  width="100" height="100">        | Markus Dreseler   | HPI                | mrks       |
-|<img src="img/team/keren_ouaknine.jpg"  width="100" height="100">   | Keren Ouaknine    | Hebrew University  | kereno     |
-|<img src="img/team/chris_hillery.jpg" width="100" height="100">     | Chris Hillery     | Couchbase          | ceej       |
-|<img src="img/team/heri_ramampiaro.jpg" width="100" height="100">   | Heri Ramampiaro   | NTNU Trondheim     | heri       |
 
 <hr/>