[accumulo-website] branch master updated: Add ASF event promotion

[ctubbsii]

This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo-website.git


The following commit(s) were added to refs/heads/master by this push:
     new c733862  Add ASF event promotion
c733862 is described below

commit c733862fdc3d0db5afaeb73f62302719b6772bc9
Author: Christopher Tubbs <ctubb...@apache.org>
AuthorDate: Wed Apr 11 14:07:34 2018 -0400

    Add ASF event promotion
    
    Also fix other issues identified by Whimsy site checker
    https://whimsy.apache.org/site/project/accumulo
---
 _includes/footer.md | 10 ++++++----
 _includes/nav.html  |  3 ++-
 index.html          |  7 +++++--
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/_includes/footer.md b/_includes/footer.md
index 3f884c2..7e67551 100644
--- a/_includes/footer.md
+++ b/_includes/footer.md
@@ -3,14 +3,16 @@
 
 [![Support the ASF][SUPPORT_IMG]{: #asf-logo height="100"}][SUPPORT_URL]
 
-Copyright &copy; 2011-{{ site.time | date: '%Y' }} The Apache Software 
Foundation. Licensed under the 
[Apache&nbsp;License,&nbsp;Version&nbsp;2.0][AL2].
+Copyright &copy; 2011-{{ site.time | date: '%Y' }} 
The&nbsp;Apache&nbsp;Software&nbsp;Foundation.
+Licensed under the [Apache&nbsp;License,&nbsp;Version&nbsp;2.0][AL2].
 
-
-{{ page.legal_notice }}
+Apache®, the names of Apache projects and their logos, and the multicolor 
feather
+logo are registered trademarks or trademarks of the 
[Apache&nbsp;Software&nbsp;Foundation][ASF]
+in the United States and/or other countries.
 
 </footer>
 
 [ASF]: https://www.apache.org
-[AL2]: https://www.apache.org/licenses/LICENSE-2.0
+[AL2]: https://www.apache.org/licenses/
 [SUPPORT_IMG]:https://www.apache.org/images/SupportApache-small.png
 [SUPPORT_URL]:https://www.apache.org/foundation/contributing
diff --git a/_includes/nav.html b/_includes/nav.html
index 91ba059..f8d7f7b 100644
--- a/_includes/nav.html
+++ b/_includes/nav.html
@@ -50,11 +50,12 @@
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Apache 
Software Foundation<span class="caret"></span></a>
           <ul class="dropdown-menu">
             <li><a href="https://www.apache.org";>Apache Homepage <i class="fa 
fa-external-link"></i></a></li>
-            <li><a href="https://www.apache.org/licenses/LICENSE-2.0";>License 
<i class="fa fa-external-link"></i></a></li>
+            <li><a href="https://www.apache.org/licenses/";>License <i 
class="fa fa-external-link"></i></a></li>
             <li><a 
href="https://www.apache.org/foundation/sponsorship";>Sponsorship <i class="fa 
fa-external-link"></i></a></li>
             <li><a href="https://www.apache.org/security";>Security <i 
class="fa fa-external-link"></i></a></li>
             <li><a href="https://www.apache.org/foundation/thanks";>Thanks <i 
class="fa fa-external-link"></i></a></li>
             <li><a 
href="https://www.apache.org/foundation/policies/conduct";>Code of Conduct <i 
class="fa fa-external-link"></i></a></li>
+            <li><a 
href="https://www.apache.org/events/current-event.html";>Current Event <i 
class="fa fa-external-link"></i></a></li>
           </ul>
         </li>
       </ul>
diff --git a/index.html b/index.html
index 54d57c3..a10d651 100644
--- a/index.html
+++ b/index.html
@@ -1,7 +1,6 @@
 ---
 title: Apache Accumulo
 skiph1fortitle: true
-legal_notice: Apache Accumulo, Apache Hadoop, and the Accumulo project logo 
are trademarks<br>of the [Apache Software Foundation](https://www.apache.org).
 ---
 <div class="row">
   <div class="col-md-8">
@@ -59,6 +58,10 @@ legal_notice: Apache Accumulo, Apache Hadoop, and the 
Accumulo project logo are
         {% capture social-include %}{% include social.md %}{% endcapture %}{{ 
social-include | markdownify }}
       </div>
     </div>
-    <a id="accumulo-summit-logo" a href="http://accumulosummit.com/";><img 
alt="Accumulo Summit" class="img-responsive" src="{{ site.baseurl 
}}/images/accumulo-summit-2017-logo-horizontal.png"></a>
+    <div class="row">
+      <div class="col-sm-12">
+        <a id="asf-current-event-logo" 
href="https://www.apache.org/events/current-event.html";><img alt="ASF Current 
Events" class="img-responsive center-block" 
src="https://www.apache.org/events/current-event-234x60.png"/></a><br/>
+        <a id="accumulo-summit-logo" href="http://accumulosummit.com/";><img 
alt="Accumulo Summit" class="img-responsive center-block" src="{{ site.baseurl 
}}/images/accumulo-summit-2017-logo-horizontal.png"/></a>
+      </div>
   </div>
 </div>

-- 
To stop receiving notification emails like this one, please contact
ctubb...@apache.org.