Promote ApacheCon 2018
diff --git a/_includes/apachecon.html b/_includes/apachecon.html
index 5dbd6b3..bbaaca2 100644
--- a/_includes/apachecon.html
+++ b/_includes/apachecon.html
@@ -1,12 +1,12 @@
-<div id="apachecon" class="alert alert-success">
+<div id="apachecon" class="alert alert-warning">
<p>
- <a href="http://www.apache.org/events/current-event.html">
- <img style="float: left; margin-right: 10px;" src="http://www.apache.org/events/current-event-234x60.png"/>
+ <a href="https://www.apache.org/events/current-event.html">
+ <img style="height: 70px; float: left; margin-right: 10px;" src="http://apachecon.com/acna18/banners/acna-large-standard.png"/>
</a>
- <strong>ApacheCon North America</strong> is coming to Miami!<br/>
+ <strong>ApacheCon North America</strong> is coming to Montréal!<br/>
ApacheCon is the premier community event of the Apache Software Foundation.
It's the best place to meet the other people in your community, learn about Apache software projects, and hack on ASF code.
- See the <a href="http://www.apache.org/events/current-event.html">main conference site</a> for details and registration.
+ See the <a href="https://www.apache.org/events/current-event.html">main conference site</a> for details and registration.
</p>
<div style="clear: both;"></div>
</div>
diff --git a/_includes/navbar.html b/_includes/navbar.html
index 7a06cad..7c6964e 100755
--- a/_includes/navbar.html
+++ b/_includes/navbar.html
@@ -59,7 +59,7 @@
<li><a href="http://www.apache.org/licenses/">License</a></li>
<li><a href="http://www.apache.org/foundation/contributing.html">Donations</a></li>
<li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
- <li><a href="http://www.apache.org/security/">Report a Vulnerability</a></li>
+ <li><a href="http://www.apache.org/security/">Security</a></li>
<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
</ul>
</li>
diff --git a/_layouts/home.html b/_layouts/home.html
index b7dff6b..ac225fd 100644
--- a/_layouts/home.html
+++ b/_layouts/home.html
@@ -6,8 +6,11 @@
<body>
{% include navbar.html %}
<div id="home-content" class="container">
-
+
+ {% comment %}
{% include supportapache.html %}
+ {% endcomment %}
+ {% include apachecon.html %}
<div class="row clearfix">
<div class="col-md-4 column">
@@ -47,10 +50,6 @@
<p>The <a href="/start/install/">latest version</a> is {{ site.latest_version }} released on {{ site.latest_version_date }}! Read the <a href="/releasenotes/{{ site.latest_version }}/">release notes</a>.</p>
</div>
- {% comment %}
- {% include apachecon.html %}
- {% endcomment %}
-
{% capture news %}{% include news.md %}{% endcapture %}
{{ news | markdownify }}
