You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@community.apache.org by bu...@apache.org on 2016/09/28 01:47:34 UTC
svn commit: r998439 [1/2] - in /websites/staging/community/trunk/content: ./
apache-way/ calendars/ committers/ contributors/ events/ gettingStarted/
mentoring/ newcomers/ proposals/ speakers/
Author: buildbot
Date: Wed Sep 28 01:47:33 2016
New Revision: 998439
Log:
Staging update by buildbot for community
Modified:
websites/staging/community/trunk/content/ (props changed)
websites/staging/community/trunk/content/apache-way/apache-project-maturity-model.html
websites/staging/community/trunk/content/boardreport.html
websites/staging/community/trunk/content/calendars/conferences.html
websites/staging/community/trunk/content/calendars/index.html
websites/staging/community/trunk/content/comdevboardreports.html
websites/staging/community/trunk/content/comdevboardresolution.html
websites/staging/community/trunk/content/committers/consensusBuilding.html
websites/staging/community/trunk/content/committers/decisionMaking.html
websites/staging/community/trunk/content/committers/funding-disclaimer.html
websites/staging/community/trunk/content/committers/index.html
websites/staging/community/trunk/content/committers/lazyConsensus.html
websites/staging/community/trunk/content/committers/voting.html
websites/staging/community/trunk/content/contactpoints.html
websites/staging/community/trunk/content/contributors/etiquette.html
websites/staging/community/trunk/content/contributors/index.html
websites/staging/community/trunk/content/events/small-events.html
websites/staging/community/trunk/content/gettingStarted/101.html
websites/staging/community/trunk/content/gsoc-admin-tasks.html
websites/staging/community/trunk/content/gsoc.html
websites/staging/community/trunk/content/guide-to-being-a-mentor.html
websites/staging/community/trunk/content/index.html
websites/staging/community/trunk/content/links.html
websites/staging/community/trunk/content/lists.html
websites/staging/community/trunk/content/localmentors.html
websites/staging/community/trunk/content/mentee-ranking-process.html
websites/staging/community/trunk/content/mentor-request-mail.html
websites/staging/community/trunk/content/mentoring/experiences.html
websites/staging/community/trunk/content/mentoringprogramme-icfoss-pilot.html
websites/staging/community/trunk/content/mentoringprogramme.html
websites/staging/community/trunk/content/mentorprogrammeapplication.html
websites/staging/community/trunk/content/mentorprogrammeformaleducation.html
websites/staging/community/trunk/content/newbiefaq.html
websites/staging/community/trunk/content/newcomers/index.html
websites/staging/community/trunk/content/newcommitter.html
websites/staging/community/trunk/content/projectIndependence.html
websites/staging/community/trunk/content/proposals/ZestProposal.html
websites/staging/community/trunk/content/speakers/index.html
websites/staging/community/trunk/content/speakers/slides.html
websites/staging/community/trunk/content/speakers/speakers.html
websites/staging/community/trunk/content/use-the-comdev-issue-tracker-for-gsoc-tasks.html
Propchange: websites/staging/community/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Wed Sep 28 01:47:33 2016
@@ -1 +1 @@
-1762595
+1762597
Modified: websites/staging/community/trunk/content/apache-way/apache-project-maturity-model.html
==============================================================================
--- websites/staging/community/trunk/content/apache-way/apache-project-maturity-model.html (original)
+++ websites/staging/community/trunk/content/apache-way/apache-project-maturity-model.html Wed Sep 28 01:47:33 2016
@@ -77,9 +77,9 @@
<li><a href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a></li>
<li><a href="/contactpoints.html">Contact Points Within the ASF</a></li>
<li class="divider"></li>
- <li class="nav-header">Additional Resources</li>
+ <li class="nav-header">About Community Development</li>
<li><a href="/comdevboardresolution.html">ComDev Original Board Resolution</a></li>
- <li><a href="/comdevboardreports.html">ComDev Board Reports</a></li>
+ <li><a href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a></li>
</ul>
</li>
<li class="dropdown">
@@ -94,11 +94,10 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">For Committers/PMCs <b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/boardreport.html">Board Report Template</a></li>
<li><a href="/newcommitter.html">Recruiting New Committers</a></li>
<li><a href="/committers/">Useful Information for Committers</a></li>
- <li><a href="/committers/lazyConsensus.html">Lazy Consensus</a></li>
<li><a href="/committers/consensusBuilding.html">Consensus Building</a></li>
+ <li><a href="/committers/lazyConsensus.html">Lazy Consensus</a></li>
<li><a href="/committers/decisionMaking.html">Decision Making</a></li>
<li><a href="/committers/voting.html">Voting</a></li>
<li><a href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a></li>
@@ -123,14 +122,14 @@
<li><a href="/speakers/">Speaker Information</a></li>
<li><a href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a></li>
<li><a href="/speakers/slides.html">Apache-related Slides</a></li>
- <li><a href="http://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a></li>
</ul>
</li>
<li class="dropdown">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown">Calendars <b class="caret"></b></a>
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown">Events <b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/calendars/">Calendars</a></li>
- <li><a href="/calendars/conferences.html">Conferences</a></li>
+ <li><a href="/calendars/">Major Apache-related Events</a></li>
+ <li><a href="http://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a></li>
+ <li><a href="http://www.apache.org/foundation/marks/events">Apache event branding policies</a></li>
</ul>
</li>
<li><a href="/lists.html">Mailing List</a></li>
@@ -525,10 +524,10 @@ with no hidden agendas.
<footer class="footer" align="center">
<div class="container">
<p>
- Copyright © 2013-2015 The Apache Software Foundation, Licensed under
+ Copyright © 2013-2016 The Apache Software Foundation, Licensed under
the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
<br />
- Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+ Apache®, the names of Apache projects, and the feather logo are either <a href="http://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache Software Foundation in the United States and/or other countries.
</p>
</div>
</footer>
Modified: websites/staging/community/trunk/content/boardreport.html
==============================================================================
--- websites/staging/community/trunk/content/boardreport.html (original)
+++ websites/staging/community/trunk/content/boardreport.html Wed Sep 28 01:47:33 2016
@@ -77,9 +77,9 @@
<li><a href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a></li>
<li><a href="/contactpoints.html">Contact Points Within the ASF</a></li>
<li class="divider"></li>
- <li class="nav-header">Additional Resources</li>
+ <li class="nav-header">About Community Development</li>
<li><a href="/comdevboardresolution.html">ComDev Original Board Resolution</a></li>
- <li><a href="/comdevboardreports.html">ComDev Board Reports</a></li>
+ <li><a href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a></li>
</ul>
</li>
<li class="dropdown">
@@ -94,11 +94,10 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">For Committers/PMCs <b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/boardreport.html">Board Report Template</a></li>
<li><a href="/newcommitter.html">Recruiting New Committers</a></li>
<li><a href="/committers/">Useful Information for Committers</a></li>
- <li><a href="/committers/lazyConsensus.html">Lazy Consensus</a></li>
<li><a href="/committers/consensusBuilding.html">Consensus Building</a></li>
+ <li><a href="/committers/lazyConsensus.html">Lazy Consensus</a></li>
<li><a href="/committers/decisionMaking.html">Decision Making</a></li>
<li><a href="/committers/voting.html">Voting</a></li>
<li><a href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a></li>
@@ -123,14 +122,14 @@
<li><a href="/speakers/">Speaker Information</a></li>
<li><a href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a></li>
<li><a href="/speakers/slides.html">Apache-related Slides</a></li>
- <li><a href="http://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a></li>
</ul>
</li>
<li class="dropdown">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown">Calendars <b class="caret"></b></a>
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown">Events <b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/calendars/">Calendars</a></li>
- <li><a href="/calendars/conferences.html">Conferences</a></li>
+ <li><a href="/calendars/">Major Apache-related Events</a></li>
+ <li><a href="http://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a></li>
+ <li><a href="http://www.apache.org/foundation/marks/events">Apache event branding policies</a></li>
</ul>
</li>
<li><a href="/lists.html">Mailing List</a></li>
@@ -236,10 +235,10 @@ the first of the month)</li>
<footer class="footer" align="center">
<div class="container">
<p>
- Copyright © 2013-2015 The Apache Software Foundation, Licensed under
+ Copyright © 2013-2016 The Apache Software Foundation, Licensed under
the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
<br />
- Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+ Apache®, the names of Apache projects, and the feather logo are either <a href="http://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache Software Foundation in the United States and/or other countries.
</p>
</div>
</footer>
Modified: websites/staging/community/trunk/content/calendars/conferences.html
==============================================================================
--- websites/staging/community/trunk/content/calendars/conferences.html (original)
+++ websites/staging/community/trunk/content/calendars/conferences.html Wed Sep 28 01:47:33 2016
@@ -77,9 +77,9 @@
<li><a href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a></li>
<li><a href="/contactpoints.html">Contact Points Within the ASF</a></li>
<li class="divider"></li>
- <li class="nav-header">Additional Resources</li>
+ <li class="nav-header">About Community Development</li>
<li><a href="/comdevboardresolution.html">ComDev Original Board Resolution</a></li>
- <li><a href="/comdevboardreports.html">ComDev Board Reports</a></li>
+ <li><a href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a></li>
</ul>
</li>
<li class="dropdown">
@@ -94,11 +94,10 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">For Committers/PMCs <b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/boardreport.html">Board Report Template</a></li>
<li><a href="/newcommitter.html">Recruiting New Committers</a></li>
<li><a href="/committers/">Useful Information for Committers</a></li>
- <li><a href="/committers/lazyConsensus.html">Lazy Consensus</a></li>
<li><a href="/committers/consensusBuilding.html">Consensus Building</a></li>
+ <li><a href="/committers/lazyConsensus.html">Lazy Consensus</a></li>
<li><a href="/committers/decisionMaking.html">Decision Making</a></li>
<li><a href="/committers/voting.html">Voting</a></li>
<li><a href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a></li>
@@ -123,14 +122,14 @@
<li><a href="/speakers/">Speaker Information</a></li>
<li><a href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a></li>
<li><a href="/speakers/slides.html">Apache-related Slides</a></li>
- <li><a href="http://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a></li>
</ul>
</li>
<li class="dropdown">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown">Calendars <b class="caret"></b></a>
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown">Events <b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/calendars/">Calendars</a></li>
- <li><a href="/calendars/conferences.html">Conferences</a></li>
+ <li><a href="/calendars/">Major Apache-related Events</a></li>
+ <li><a href="http://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a></li>
+ <li><a href="http://www.apache.org/foundation/marks/events">Apache event branding policies</a></li>
</ul>
</li>
<li><a href="/lists.html">Mailing List</a></li>
@@ -253,10 +252,10 @@ function render(data) {
<footer class="footer" align="center">
<div class="container">
<p>
- Copyright © 2013-2015 The Apache Software Foundation, Licensed under
+ Copyright © 2013-2016 The Apache Software Foundation, Licensed under
the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
<br />
- Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+ Apache®, the names of Apache projects, and the feather logo are either <a href="http://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache Software Foundation in the United States and/or other countries.
</p>
</div>
</footer>
Modified: websites/staging/community/trunk/content/calendars/index.html
==============================================================================
--- websites/staging/community/trunk/content/calendars/index.html (original)
+++ websites/staging/community/trunk/content/calendars/index.html Wed Sep 28 01:47:33 2016
@@ -77,9 +77,9 @@
<li><a href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a></li>
<li><a href="/contactpoints.html">Contact Points Within the ASF</a></li>
<li class="divider"></li>
- <li class="nav-header">Additional Resources</li>
+ <li class="nav-header">About Community Development</li>
<li><a href="/comdevboardresolution.html">ComDev Original Board Resolution</a></li>
- <li><a href="/comdevboardreports.html">ComDev Board Reports</a></li>
+ <li><a href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a></li>
</ul>
</li>
<li class="dropdown">
@@ -94,11 +94,10 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">For Committers/PMCs <b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/boardreport.html">Board Report Template</a></li>
<li><a href="/newcommitter.html">Recruiting New Committers</a></li>
<li><a href="/committers/">Useful Information for Committers</a></li>
- <li><a href="/committers/lazyConsensus.html">Lazy Consensus</a></li>
<li><a href="/committers/consensusBuilding.html">Consensus Building</a></li>
+ <li><a href="/committers/lazyConsensus.html">Lazy Consensus</a></li>
<li><a href="/committers/decisionMaking.html">Decision Making</a></li>
<li><a href="/committers/voting.html">Voting</a></li>
<li><a href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a></li>
@@ -123,14 +122,14 @@
<li><a href="/speakers/">Speaker Information</a></li>
<li><a href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a></li>
<li><a href="/speakers/slides.html">Apache-related Slides</a></li>
- <li><a href="http://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a></li>
</ul>
</li>
<li class="dropdown">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown">Calendars <b class="caret"></b></a>
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown">Events <b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/calendars/">Calendars</a></li>
- <li><a href="/calendars/conferences.html">Conferences</a></li>
+ <li><a href="/calendars/">Major Apache-related Events</a></li>
+ <li><a href="http://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a></li>
+ <li><a href="http://www.apache.org/foundation/marks/events">Apache event branding policies</a></li>
</ul>
</li>
<li><a href="/lists.html">Mailing List</a></li>
@@ -200,10 +199,10 @@ Apache project related events there.</p>
<footer class="footer" align="center">
<div class="container">
<p>
- Copyright © 2013-2015 The Apache Software Foundation, Licensed under
+ Copyright © 2013-2016 The Apache Software Foundation, Licensed under
the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
<br />
- Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+ Apache®, the names of Apache projects, and the feather logo are either <a href="http://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache Software Foundation in the United States and/or other countries.
</p>
</div>
</footer>
Modified: websites/staging/community/trunk/content/comdevboardreports.html
==============================================================================
--- websites/staging/community/trunk/content/comdevboardreports.html (original)
+++ websites/staging/community/trunk/content/comdevboardreports.html Wed Sep 28 01:47:33 2016
@@ -77,9 +77,9 @@
<li><a href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a></li>
<li><a href="/contactpoints.html">Contact Points Within the ASF</a></li>
<li class="divider"></li>
- <li class="nav-header">Additional Resources</li>
+ <li class="nav-header">About Community Development</li>
<li><a href="/comdevboardresolution.html">ComDev Original Board Resolution</a></li>
- <li><a href="/comdevboardreports.html">ComDev Board Reports</a></li>
+ <li><a href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a></li>
</ul>
</li>
<li class="dropdown">
@@ -94,11 +94,10 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">For Committers/PMCs <b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/boardreport.html">Board Report Template</a></li>
<li><a href="/newcommitter.html">Recruiting New Committers</a></li>
<li><a href="/committers/">Useful Information for Committers</a></li>
- <li><a href="/committers/lazyConsensus.html">Lazy Consensus</a></li>
<li><a href="/committers/consensusBuilding.html">Consensus Building</a></li>
+ <li><a href="/committers/lazyConsensus.html">Lazy Consensus</a></li>
<li><a href="/committers/decisionMaking.html">Decision Making</a></li>
<li><a href="/committers/voting.html">Voting</a></li>
<li><a href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a></li>
@@ -123,14 +122,14 @@
<li><a href="/speakers/">Speaker Information</a></li>
<li><a href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a></li>
<li><a href="/speakers/slides.html">Apache-related Slides</a></li>
- <li><a href="http://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a></li>
</ul>
</li>
<li class="dropdown">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown">Calendars <b class="caret"></b></a>
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown">Events <b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/calendars/">Calendars</a></li>
- <li><a href="/calendars/conferences.html">Conferences</a></li>
+ <li><a href="/calendars/">Major Apache-related Events</a></li>
+ <li><a href="http://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a></li>
+ <li><a href="http://www.apache.org/foundation/marks/events">Apache event branding policies</a></li>
</ul>
</li>
<li><a href="/lists.html">Mailing List</a></li>
@@ -895,10 +894,10 @@ Main items for next period
<footer class="footer" align="center">
<div class="container">
<p>
- Copyright © 2013-2015 The Apache Software Foundation, Licensed under
+ Copyright © 2013-2016 The Apache Software Foundation, Licensed under
the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
<br />
- Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+ Apache®, the names of Apache projects, and the feather logo are either <a href="http://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache Software Foundation in the United States and/or other countries.
</p>
</div>
</footer>
Modified: websites/staging/community/trunk/content/comdevboardresolution.html
==============================================================================
--- websites/staging/community/trunk/content/comdevboardresolution.html (original)
+++ websites/staging/community/trunk/content/comdevboardresolution.html Wed Sep 28 01:47:33 2016
@@ -77,9 +77,9 @@
<li><a href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a></li>
<li><a href="/contactpoints.html">Contact Points Within the ASF</a></li>
<li class="divider"></li>
- <li class="nav-header">Additional Resources</li>
+ <li class="nav-header">About Community Development</li>
<li><a href="/comdevboardresolution.html">ComDev Original Board Resolution</a></li>
- <li><a href="/comdevboardreports.html">ComDev Board Reports</a></li>
+ <li><a href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a></li>
</ul>
</li>
<li class="dropdown">
@@ -94,11 +94,10 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">For Committers/PMCs <b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/boardreport.html">Board Report Template</a></li>
<li><a href="/newcommitter.html">Recruiting New Committers</a></li>
<li><a href="/committers/">Useful Information for Committers</a></li>
- <li><a href="/committers/lazyConsensus.html">Lazy Consensus</a></li>
<li><a href="/committers/consensusBuilding.html">Consensus Building</a></li>
+ <li><a href="/committers/lazyConsensus.html">Lazy Consensus</a></li>
<li><a href="/committers/decisionMaking.html">Decision Making</a></li>
<li><a href="/committers/voting.html">Voting</a></li>
<li><a href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a></li>
@@ -123,14 +122,14 @@
<li><a href="/speakers/">Speaker Information</a></li>
<li><a href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a></li>
<li><a href="/speakers/slides.html">Apache-related Slides</a></li>
- <li><a href="http://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a></li>
</ul>
</li>
<li class="dropdown">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown">Calendars <b class="caret"></b></a>
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown">Events <b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/calendars/">Calendars</a></li>
- <li><a href="/calendars/conferences.html">Conferences</a></li>
+ <li><a href="/calendars/">Major Apache-related Events</a></li>
+ <li><a href="http://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a></li>
+ <li><a href="http://www.apache.org/foundation/marks/events">Apache event branding policies</a></li>
</ul>
</li>
<li><a href="/lists.html">Mailing List</a></li>
@@ -228,10 +227,10 @@ Project,
<footer class="footer" align="center">
<div class="container">
<p>
- Copyright © 2013-2015 The Apache Software Foundation, Licensed under
+ Copyright © 2013-2016 The Apache Software Foundation, Licensed under
the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
<br />
- Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+ Apache®, the names of Apache projects, and the feather logo are either <a href="http://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache Software Foundation in the United States and/or other countries.
</p>
</div>
</footer>
Modified: websites/staging/community/trunk/content/committers/consensusBuilding.html
==============================================================================
--- websites/staging/community/trunk/content/committers/consensusBuilding.html (original)
+++ websites/staging/community/trunk/content/committers/consensusBuilding.html Wed Sep 28 01:47:33 2016
@@ -77,9 +77,9 @@
<li><a href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a></li>
<li><a href="/contactpoints.html">Contact Points Within the ASF</a></li>
<li class="divider"></li>
- <li class="nav-header">Additional Resources</li>
+ <li class="nav-header">About Community Development</li>
<li><a href="/comdevboardresolution.html">ComDev Original Board Resolution</a></li>
- <li><a href="/comdevboardreports.html">ComDev Board Reports</a></li>
+ <li><a href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a></li>
</ul>
</li>
<li class="dropdown">
@@ -94,11 +94,10 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">For Committers/PMCs <b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/boardreport.html">Board Report Template</a></li>
<li><a href="/newcommitter.html">Recruiting New Committers</a></li>
<li><a href="/committers/">Useful Information for Committers</a></li>
- <li><a href="/committers/lazyConsensus.html">Lazy Consensus</a></li>
<li><a href="/committers/consensusBuilding.html">Consensus Building</a></li>
+ <li><a href="/committers/lazyConsensus.html">Lazy Consensus</a></li>
<li><a href="/committers/decisionMaking.html">Decision Making</a></li>
<li><a href="/committers/voting.html">Voting</a></li>
<li><a href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a></li>
@@ -123,14 +122,14 @@
<li><a href="/speakers/">Speaker Information</a></li>
<li><a href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a></li>
<li><a href="/speakers/slides.html">Apache-related Slides</a></li>
- <li><a href="http://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a></li>
</ul>
</li>
<li class="dropdown">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown">Calendars <b class="caret"></b></a>
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown">Events <b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/calendars/">Calendars</a></li>
- <li><a href="/calendars/conferences.html">Conferences</a></li>
+ <li><a href="/calendars/">Major Apache-related Events</a></li>
+ <li><a href="http://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a></li>
+ <li><a href="http://www.apache.org/foundation/marks/events">Apache event branding policies</a></li>
</ul>
</li>
<li><a href="/lists.html">Mailing List</a></li>
@@ -213,10 +212,10 @@ the work under the <a href="/committers/
<footer class="footer" align="center">
<div class="container">
<p>
- Copyright © 2013-2015 The Apache Software Foundation, Licensed under
+ Copyright © 2013-2016 The Apache Software Foundation, Licensed under
the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
<br />
- Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+ Apache®, the names of Apache projects, and the feather logo are either <a href="http://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache Software Foundation in the United States and/or other countries.
</p>
</div>
</footer>
Modified: websites/staging/community/trunk/content/committers/decisionMaking.html
==============================================================================
--- websites/staging/community/trunk/content/committers/decisionMaking.html (original)
+++ websites/staging/community/trunk/content/committers/decisionMaking.html Wed Sep 28 01:47:33 2016
@@ -77,9 +77,9 @@
<li><a href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a></li>
<li><a href="/contactpoints.html">Contact Points Within the ASF</a></li>
<li class="divider"></li>
- <li class="nav-header">Additional Resources</li>
+ <li class="nav-header">About Community Development</li>
<li><a href="/comdevboardresolution.html">ComDev Original Board Resolution</a></li>
- <li><a href="/comdevboardreports.html">ComDev Board Reports</a></li>
+ <li><a href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a></li>
</ul>
</li>
<li class="dropdown">
@@ -94,11 +94,10 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">For Committers/PMCs <b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/boardreport.html">Board Report Template</a></li>
<li><a href="/newcommitter.html">Recruiting New Committers</a></li>
<li><a href="/committers/">Useful Information for Committers</a></li>
- <li><a href="/committers/lazyConsensus.html">Lazy Consensus</a></li>
<li><a href="/committers/consensusBuilding.html">Consensus Building</a></li>
+ <li><a href="/committers/lazyConsensus.html">Lazy Consensus</a></li>
<li><a href="/committers/decisionMaking.html">Decision Making</a></li>
<li><a href="/committers/voting.html">Voting</a></li>
<li><a href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a></li>
@@ -123,14 +122,14 @@
<li><a href="/speakers/">Speaker Information</a></li>
<li><a href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a></li>
<li><a href="/speakers/slides.html">Apache-related Slides</a></li>
- <li><a href="http://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a></li>
</ul>
</li>
<li class="dropdown">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown">Calendars <b class="caret"></b></a>
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown">Events <b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/calendars/">Calendars</a></li>
- <li><a href="/calendars/conferences.html">Conferences</a></li>
+ <li><a href="/calendars/">Major Apache-related Events</a></li>
+ <li><a href="http://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a></li>
+ <li><a href="http://www.apache.org/foundation/marks/events">Apache event branding policies</a></li>
</ul>
</li>
<li><a href="/lists.html">Mailing List</a></li>
@@ -196,10 +195,10 @@ to approve a release. </p>
<footer class="footer" align="center">
<div class="container">
<p>
- Copyright © 2013-2015 The Apache Software Foundation, Licensed under
+ Copyright © 2013-2016 The Apache Software Foundation, Licensed under
the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
<br />
- Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+ Apache®, the names of Apache projects, and the feather logo are either <a href="http://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache Software Foundation in the United States and/or other countries.
</p>
</div>
</footer>
Modified: websites/staging/community/trunk/content/committers/funding-disclaimer.html
==============================================================================
--- websites/staging/community/trunk/content/committers/funding-disclaimer.html (original)
+++ websites/staging/community/trunk/content/committers/funding-disclaimer.html Wed Sep 28 01:47:33 2016
@@ -77,9 +77,9 @@
<li><a href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a></li>
<li><a href="/contactpoints.html">Contact Points Within the ASF</a></li>
<li class="divider"></li>
- <li class="nav-header">Additional Resources</li>
+ <li class="nav-header">About Community Development</li>
<li><a href="/comdevboardresolution.html">ComDev Original Board Resolution</a></li>
- <li><a href="/comdevboardreports.html">ComDev Board Reports</a></li>
+ <li><a href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a></li>
</ul>
</li>
<li class="dropdown">
@@ -94,11 +94,10 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">For Committers/PMCs <b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/boardreport.html">Board Report Template</a></li>
<li><a href="/newcommitter.html">Recruiting New Committers</a></li>
<li><a href="/committers/">Useful Information for Committers</a></li>
- <li><a href="/committers/lazyConsensus.html">Lazy Consensus</a></li>
<li><a href="/committers/consensusBuilding.html">Consensus Building</a></li>
+ <li><a href="/committers/lazyConsensus.html">Lazy Consensus</a></li>
<li><a href="/committers/decisionMaking.html">Decision Making</a></li>
<li><a href="/committers/voting.html">Voting</a></li>
<li><a href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a></li>
@@ -123,14 +122,14 @@
<li><a href="/speakers/">Speaker Information</a></li>
<li><a href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a></li>
<li><a href="/speakers/slides.html">Apache-related Slides</a></li>
- <li><a href="http://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a></li>
</ul>
</li>
<li class="dropdown">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown">Calendars <b class="caret"></b></a>
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown">Events <b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/calendars/">Calendars</a></li>
- <li><a href="/calendars/conferences.html">Conferences</a></li>
+ <li><a href="/calendars/">Major Apache-related Events</a></li>
+ <li><a href="http://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a></li>
+ <li><a href="http://www.apache.org/foundation/marks/events">Apache event branding policies</a></li>
</ul>
</li>
<li><a href="/lists.html">Mailing List</a></li>
@@ -190,10 +189,10 @@ campaign.</p>
<footer class="footer" align="center">
<div class="container">
<p>
- Copyright © 2013-2015 The Apache Software Foundation, Licensed under
+ Copyright © 2013-2016 The Apache Software Foundation, Licensed under
the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
<br />
- Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+ Apache®, the names of Apache projects, and the feather logo are either <a href="http://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache Software Foundation in the United States and/or other countries.
</p>
</div>
</footer>
Modified: websites/staging/community/trunk/content/committers/index.html
==============================================================================
--- websites/staging/community/trunk/content/committers/index.html (original)
+++ websites/staging/community/trunk/content/committers/index.html Wed Sep 28 01:47:33 2016
@@ -77,9 +77,9 @@
<li><a href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a></li>
<li><a href="/contactpoints.html">Contact Points Within the ASF</a></li>
<li class="divider"></li>
- <li class="nav-header">Additional Resources</li>
+ <li class="nav-header">About Community Development</li>
<li><a href="/comdevboardresolution.html">ComDev Original Board Resolution</a></li>
- <li><a href="/comdevboardreports.html">ComDev Board Reports</a></li>
+ <li><a href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a></li>
</ul>
</li>
<li class="dropdown">
@@ -94,11 +94,10 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">For Committers/PMCs <b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/boardreport.html">Board Report Template</a></li>
<li><a href="/newcommitter.html">Recruiting New Committers</a></li>
<li><a href="/committers/">Useful Information for Committers</a></li>
- <li><a href="/committers/lazyConsensus.html">Lazy Consensus</a></li>
<li><a href="/committers/consensusBuilding.html">Consensus Building</a></li>
+ <li><a href="/committers/lazyConsensus.html">Lazy Consensus</a></li>
<li><a href="/committers/decisionMaking.html">Decision Making</a></li>
<li><a href="/committers/voting.html">Voting</a></li>
<li><a href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a></li>
@@ -123,14 +122,14 @@
<li><a href="/speakers/">Speaker Information</a></li>
<li><a href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a></li>
<li><a href="/speakers/slides.html">Apache-related Slides</a></li>
- <li><a href="http://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a></li>
</ul>
</li>
<li class="dropdown">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown">Calendars <b class="caret"></b></a>
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown">Events <b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/calendars/">Calendars</a></li>
- <li><a href="/calendars/conferences.html">Conferences</a></li>
+ <li><a href="/calendars/">Major Apache-related Events</a></li>
+ <li><a href="http://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a></li>
+ <li><a href="http://www.apache.org/foundation/marks/events">Apache event branding policies</a></li>
</ul>
</li>
<li><a href="/lists.html">Mailing List</a></li>
@@ -260,10 +259,10 @@ here are a few you might want to take a
<footer class="footer" align="center">
<div class="container">
<p>
- Copyright © 2013-2015 The Apache Software Foundation, Licensed under
+ Copyright © 2013-2016 The Apache Software Foundation, Licensed under
the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
<br />
- Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+ Apache®, the names of Apache projects, and the feather logo are either <a href="http://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache Software Foundation in the United States and/or other countries.
</p>
</div>
</footer>
Modified: websites/staging/community/trunk/content/committers/lazyConsensus.html
==============================================================================
--- websites/staging/community/trunk/content/committers/lazyConsensus.html (original)
+++ websites/staging/community/trunk/content/committers/lazyConsensus.html Wed Sep 28 01:47:33 2016
@@ -77,9 +77,9 @@
<li><a href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a></li>
<li><a href="/contactpoints.html">Contact Points Within the ASF</a></li>
<li class="divider"></li>
- <li class="nav-header">Additional Resources</li>
+ <li class="nav-header">About Community Development</li>
<li><a href="/comdevboardresolution.html">ComDev Original Board Resolution</a></li>
- <li><a href="/comdevboardreports.html">ComDev Board Reports</a></li>
+ <li><a href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a></li>
</ul>
</li>
<li class="dropdown">
@@ -94,11 +94,10 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">For Committers/PMCs <b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/boardreport.html">Board Report Template</a></li>
<li><a href="/newcommitter.html">Recruiting New Committers</a></li>
<li><a href="/committers/">Useful Information for Committers</a></li>
- <li><a href="/committers/lazyConsensus.html">Lazy Consensus</a></li>
<li><a href="/committers/consensusBuilding.html">Consensus Building</a></li>
+ <li><a href="/committers/lazyConsensus.html">Lazy Consensus</a></li>
<li><a href="/committers/decisionMaking.html">Decision Making</a></li>
<li><a href="/committers/voting.html">Voting</a></li>
<li><a href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a></li>
@@ -123,14 +122,14 @@
<li><a href="/speakers/">Speaker Information</a></li>
<li><a href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a></li>
<li><a href="/speakers/slides.html">Apache-related Slides</a></li>
- <li><a href="http://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a></li>
</ul>
</li>
<li class="dropdown">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown">Calendars <b class="caret"></b></a>
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown">Events <b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/calendars/">Calendars</a></li>
- <li><a href="/calendars/conferences.html">Conferences</a></li>
+ <li><a href="/calendars/">Major Apache-related Events</a></li>
+ <li><a href="http://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a></li>
+ <li><a href="http://www.apache.org/foundation/marks/events">Apache event branding policies</a></li>
</ul>
</li>
<li><a href="/lists.html">Mailing List</a></li>
@@ -214,10 +213,10 @@ can take some time to get used to.</p>
<footer class="footer" align="center">
<div class="container">
<p>
- Copyright © 2013-2015 The Apache Software Foundation, Licensed under
+ Copyright © 2013-2016 The Apache Software Foundation, Licensed under
the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
<br />
- Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+ Apache®, the names of Apache projects, and the feather logo are either <a href="http://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache Software Foundation in the United States and/or other countries.
</p>
</div>
</footer>
Modified: websites/staging/community/trunk/content/committers/voting.html
==============================================================================
--- websites/staging/community/trunk/content/committers/voting.html (original)
+++ websites/staging/community/trunk/content/committers/voting.html Wed Sep 28 01:47:33 2016
@@ -77,9 +77,9 @@
<li><a href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a></li>
<li><a href="/contactpoints.html">Contact Points Within the ASF</a></li>
<li class="divider"></li>
- <li class="nav-header">Additional Resources</li>
+ <li class="nav-header">About Community Development</li>
<li><a href="/comdevboardresolution.html">ComDev Original Board Resolution</a></li>
- <li><a href="/comdevboardreports.html">ComDev Board Reports</a></li>
+ <li><a href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a></li>
</ul>
</li>
<li class="dropdown">
@@ -94,11 +94,10 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">For Committers/PMCs <b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/boardreport.html">Board Report Template</a></li>
<li><a href="/newcommitter.html">Recruiting New Committers</a></li>
<li><a href="/committers/">Useful Information for Committers</a></li>
- <li><a href="/committers/lazyConsensus.html">Lazy Consensus</a></li>
<li><a href="/committers/consensusBuilding.html">Consensus Building</a></li>
+ <li><a href="/committers/lazyConsensus.html">Lazy Consensus</a></li>
<li><a href="/committers/decisionMaking.html">Decision Making</a></li>
<li><a href="/committers/voting.html">Voting</a></li>
<li><a href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a></li>
@@ -123,14 +122,14 @@
<li><a href="/speakers/">Speaker Information</a></li>
<li><a href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a></li>
<li><a href="/speakers/slides.html">Apache-related Slides</a></li>
- <li><a href="http://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a></li>
</ul>
</li>
<li class="dropdown">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown">Calendars <b class="caret"></b></a>
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown">Events <b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/calendars/">Calendars</a></li>
- <li><a href="/calendars/conferences.html">Conferences</a></li>
+ <li><a href="/calendars/">Major Apache-related Events</a></li>
+ <li><a href="http://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a></li>
+ <li><a href="http://www.apache.org/foundation/marks/events">Apache event branding policies</a></li>
</ul>
</li>
<li><a href="/lists.html">Mailing List</a></li>
@@ -195,10 +194,10 @@ of action that you are willing and able
<footer class="footer" align="center">
<div class="container">
<p>
- Copyright © 2013-2015 The Apache Software Foundation, Licensed under
+ Copyright © 2013-2016 The Apache Software Foundation, Licensed under
the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
<br />
- Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+ Apache®, the names of Apache projects, and the feather logo are either <a href="http://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache Software Foundation in the United States and/or other countries.
</p>
</div>
</footer>
Modified: websites/staging/community/trunk/content/contactpoints.html
==============================================================================
--- websites/staging/community/trunk/content/contactpoints.html (original)
+++ websites/staging/community/trunk/content/contactpoints.html Wed Sep 28 01:47:33 2016
@@ -77,9 +77,9 @@
<li><a href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a></li>
<li><a href="/contactpoints.html">Contact Points Within the ASF</a></li>
<li class="divider"></li>
- <li class="nav-header">Additional Resources</li>
+ <li class="nav-header">About Community Development</li>
<li><a href="/comdevboardresolution.html">ComDev Original Board Resolution</a></li>
- <li><a href="/comdevboardreports.html">ComDev Board Reports</a></li>
+ <li><a href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a></li>
</ul>
</li>
<li class="dropdown">
@@ -94,11 +94,10 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">For Committers/PMCs <b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/boardreport.html">Board Report Template</a></li>
<li><a href="/newcommitter.html">Recruiting New Committers</a></li>
<li><a href="/committers/">Useful Information for Committers</a></li>
- <li><a href="/committers/lazyConsensus.html">Lazy Consensus</a></li>
<li><a href="/committers/consensusBuilding.html">Consensus Building</a></li>
+ <li><a href="/committers/lazyConsensus.html">Lazy Consensus</a></li>
<li><a href="/committers/decisionMaking.html">Decision Making</a></li>
<li><a href="/committers/voting.html">Voting</a></li>
<li><a href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a></li>
@@ -123,14 +122,14 @@
<li><a href="/speakers/">Speaker Information</a></li>
<li><a href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a></li>
<li><a href="/speakers/slides.html">Apache-related Slides</a></li>
- <li><a href="http://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a></li>
</ul>
</li>
<li class="dropdown">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown">Calendars <b class="caret"></b></a>
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown">Events <b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/calendars/">Calendars</a></li>
- <li><a href="/calendars/conferences.html">Conferences</a></li>
+ <li><a href="/calendars/">Major Apache-related Events</a></li>
+ <li><a href="http://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a></li>
+ <li><a href="http://www.apache.org/foundation/marks/events">Apache event branding policies</a></li>
</ul>
</li>
<li><a href="/lists.html">Mailing List</a></li>
@@ -198,10 +197,10 @@ response from the ASF's legal counsel to
<footer class="footer" align="center">
<div class="container">
<p>
- Copyright © 2013-2015 The Apache Software Foundation, Licensed under
+ Copyright © 2013-2016 The Apache Software Foundation, Licensed under
the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
<br />
- Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+ Apache®, the names of Apache projects, and the feather logo are either <a href="http://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache Software Foundation in the United States and/or other countries.
</p>
</div>
</footer>
Modified: websites/staging/community/trunk/content/contributors/etiquette.html
==============================================================================
--- websites/staging/community/trunk/content/contributors/etiquette.html (original)
+++ websites/staging/community/trunk/content/contributors/etiquette.html Wed Sep 28 01:47:33 2016
@@ -77,9 +77,9 @@
<li><a href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a></li>
<li><a href="/contactpoints.html">Contact Points Within the ASF</a></li>
<li class="divider"></li>
- <li class="nav-header">Additional Resources</li>
+ <li class="nav-header">About Community Development</li>
<li><a href="/comdevboardresolution.html">ComDev Original Board Resolution</a></li>
- <li><a href="/comdevboardreports.html">ComDev Board Reports</a></li>
+ <li><a href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a></li>
</ul>
</li>
<li class="dropdown">
@@ -94,11 +94,10 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">For Committers/PMCs <b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/boardreport.html">Board Report Template</a></li>
<li><a href="/newcommitter.html">Recruiting New Committers</a></li>
<li><a href="/committers/">Useful Information for Committers</a></li>
- <li><a href="/committers/lazyConsensus.html">Lazy Consensus</a></li>
<li><a href="/committers/consensusBuilding.html">Consensus Building</a></li>
+ <li><a href="/committers/lazyConsensus.html">Lazy Consensus</a></li>
<li><a href="/committers/decisionMaking.html">Decision Making</a></li>
<li><a href="/committers/voting.html">Voting</a></li>
<li><a href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a></li>
@@ -123,14 +122,14 @@
<li><a href="/speakers/">Speaker Information</a></li>
<li><a href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a></li>
<li><a href="/speakers/slides.html">Apache-related Slides</a></li>
- <li><a href="http://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a></li>
</ul>
</li>
<li class="dropdown">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown">Calendars <b class="caret"></b></a>
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown">Events <b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/calendars/">Calendars</a></li>
- <li><a href="/calendars/conferences.html">Conferences</a></li>
+ <li><a href="/calendars/">Major Apache-related Events</a></li>
+ <li><a href="http://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a></li>
+ <li><a href="http://www.apache.org/foundation/marks/events">Apache event branding policies</a></li>
</ul>
</li>
<li><a href="/lists.html">Mailing List</a></li>
@@ -270,10 +269,10 @@ comment before closing out the issue.</p
<footer class="footer" align="center">
<div class="container">
<p>
- Copyright © 2013-2015 The Apache Software Foundation, Licensed under
+ Copyright © 2013-2016 The Apache Software Foundation, Licensed under
the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
<br />
- Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+ Apache®, the names of Apache projects, and the feather logo are either <a href="http://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache Software Foundation in the United States and/or other countries.
</p>
</div>
</footer>
Modified: websites/staging/community/trunk/content/contributors/index.html
==============================================================================
--- websites/staging/community/trunk/content/contributors/index.html (original)
+++ websites/staging/community/trunk/content/contributors/index.html Wed Sep 28 01:47:33 2016
@@ -77,9 +77,9 @@
<li><a href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a></li>
<li><a href="/contactpoints.html">Contact Points Within the ASF</a></li>
<li class="divider"></li>
- <li class="nav-header">Additional Resources</li>
+ <li class="nav-header">About Community Development</li>
<li><a href="/comdevboardresolution.html">ComDev Original Board Resolution</a></li>
- <li><a href="/comdevboardreports.html">ComDev Board Reports</a></li>
+ <li><a href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a></li>
</ul>
</li>
<li class="dropdown">
@@ -94,11 +94,10 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">For Committers/PMCs <b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/boardreport.html">Board Report Template</a></li>
<li><a href="/newcommitter.html">Recruiting New Committers</a></li>
<li><a href="/committers/">Useful Information for Committers</a></li>
- <li><a href="/committers/lazyConsensus.html">Lazy Consensus</a></li>
<li><a href="/committers/consensusBuilding.html">Consensus Building</a></li>
+ <li><a href="/committers/lazyConsensus.html">Lazy Consensus</a></li>
<li><a href="/committers/decisionMaking.html">Decision Making</a></li>
<li><a href="/committers/voting.html">Voting</a></li>
<li><a href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a></li>
@@ -123,14 +122,14 @@
<li><a href="/speakers/">Speaker Information</a></li>
<li><a href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a></li>
<li><a href="/speakers/slides.html">Apache-related Slides</a></li>
- <li><a href="http://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a></li>
</ul>
</li>
<li class="dropdown">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown">Calendars <b class="caret"></b></a>
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown">Events <b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/calendars/">Calendars</a></li>
- <li><a href="/calendars/conferences.html">Conferences</a></li>
+ <li><a href="/calendars/">Major Apache-related Events</a></li>
+ <li><a href="http://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a></li>
+ <li><a href="http://www.apache.org/foundation/marks/events">Apache event branding policies</a></li>
</ul>
</li>
<li><a href="/lists.html">Mailing List</a></li>
@@ -239,10 +238,10 @@ list by sending a mail to
<footer class="footer" align="center">
<div class="container">
<p>
- Copyright © 2013-2015 The Apache Software Foundation, Licensed under
+ Copyright © 2013-2016 The Apache Software Foundation, Licensed under
the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
<br />
- Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+ Apache®, the names of Apache projects, and the feather logo are either <a href="http://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache Software Foundation in the United States and/or other countries.
</p>
</div>
</footer>
Modified: websites/staging/community/trunk/content/events/small-events.html
==============================================================================
--- websites/staging/community/trunk/content/events/small-events.html (original)
+++ websites/staging/community/trunk/content/events/small-events.html Wed Sep 28 01:47:33 2016
@@ -77,9 +77,9 @@
<li><a href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a></li>
<li><a href="/contactpoints.html">Contact Points Within the ASF</a></li>
<li class="divider"></li>
- <li class="nav-header">Additional Resources</li>
+ <li class="nav-header">About Community Development</li>
<li><a href="/comdevboardresolution.html">ComDev Original Board Resolution</a></li>
- <li><a href="/comdevboardreports.html">ComDev Board Reports</a></li>
+ <li><a href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a></li>
</ul>
</li>
<li class="dropdown">
@@ -94,11 +94,10 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">For Committers/PMCs <b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/boardreport.html">Board Report Template</a></li>
<li><a href="/newcommitter.html">Recruiting New Committers</a></li>
<li><a href="/committers/">Useful Information for Committers</a></li>
- <li><a href="/committers/lazyConsensus.html">Lazy Consensus</a></li>
<li><a href="/committers/consensusBuilding.html">Consensus Building</a></li>
+ <li><a href="/committers/lazyConsensus.html">Lazy Consensus</a></li>
<li><a href="/committers/decisionMaking.html">Decision Making</a></li>
<li><a href="/committers/voting.html">Voting</a></li>
<li><a href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a></li>
@@ -123,14 +122,14 @@
<li><a href="/speakers/">Speaker Information</a></li>
<li><a href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a></li>
<li><a href="/speakers/slides.html">Apache-related Slides</a></li>
- <li><a href="http://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a></li>
</ul>
</li>
<li class="dropdown">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown">Calendars <b class="caret"></b></a>
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown">Events <b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/calendars/">Calendars</a></li>
- <li><a href="/calendars/conferences.html">Conferences</a></li>
+ <li><a href="/calendars/">Major Apache-related Events</a></li>
+ <li><a href="http://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a></li>
+ <li><a href="http://www.apache.org/foundation/marks/events">Apache event branding policies</a></li>
</ul>
</li>
<li><a href="/lists.html">Mailing List</a></li>
@@ -188,10 +187,10 @@ dev@community.apache.org so that it can
<footer class="footer" align="center">
<div class="container">
<p>
- Copyright © 2013-2015 The Apache Software Foundation, Licensed under
+ Copyright © 2013-2016 The Apache Software Foundation, Licensed under
the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
<br />
- Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+ Apache®, the names of Apache projects, and the feather logo are either <a href="http://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache Software Foundation in the United States and/or other countries.
</p>
</div>
</footer>
Modified: websites/staging/community/trunk/content/gettingStarted/101.html
==============================================================================
--- websites/staging/community/trunk/content/gettingStarted/101.html (original)
+++ websites/staging/community/trunk/content/gettingStarted/101.html Wed Sep 28 01:47:33 2016
@@ -77,9 +77,9 @@
<li><a href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a></li>
<li><a href="/contactpoints.html">Contact Points Within the ASF</a></li>
<li class="divider"></li>
- <li class="nav-header">Additional Resources</li>
+ <li class="nav-header">About Community Development</li>
<li><a href="/comdevboardresolution.html">ComDev Original Board Resolution</a></li>
- <li><a href="/comdevboardreports.html">ComDev Board Reports</a></li>
+ <li><a href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a></li>
</ul>
</li>
<li class="dropdown">
@@ -94,11 +94,10 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">For Committers/PMCs <b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/boardreport.html">Board Report Template</a></li>
<li><a href="/newcommitter.html">Recruiting New Committers</a></li>
<li><a href="/committers/">Useful Information for Committers</a></li>
- <li><a href="/committers/lazyConsensus.html">Lazy Consensus</a></li>
<li><a href="/committers/consensusBuilding.html">Consensus Building</a></li>
+ <li><a href="/committers/lazyConsensus.html">Lazy Consensus</a></li>
<li><a href="/committers/decisionMaking.html">Decision Making</a></li>
<li><a href="/committers/voting.html">Voting</a></li>
<li><a href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a></li>
@@ -123,14 +122,14 @@
<li><a href="/speakers/">Speaker Information</a></li>
<li><a href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a></li>
<li><a href="/speakers/slides.html">Apache-related Slides</a></li>
- <li><a href="http://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a></li>
</ul>
</li>
<li class="dropdown">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown">Calendars <b class="caret"></b></a>
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown">Events <b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/calendars/">Calendars</a></li>
- <li><a href="/calendars/conferences.html">Conferences</a></li>
+ <li><a href="/calendars/">Major Apache-related Events</a></li>
+ <li><a href="http://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a></li>
+ <li><a href="http://www.apache.org/foundation/marks/events">Apache event branding policies</a></li>
</ul>
</li>
<li><a href="/lists.html">Mailing List</a></li>
@@ -225,10 +224,10 @@ foundations <a href="http://apache.org/f
<footer class="footer" align="center">
<div class="container">
<p>
- Copyright © 2013-2015 The Apache Software Foundation, Licensed under
+ Copyright © 2013-2016 The Apache Software Foundation, Licensed under
the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
<br />
- Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+ Apache®, the names of Apache projects, and the feather logo are either <a href="http://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache Software Foundation in the United States and/or other countries.
</p>
</div>
</footer>
Modified: websites/staging/community/trunk/content/gsoc-admin-tasks.html
==============================================================================
--- websites/staging/community/trunk/content/gsoc-admin-tasks.html (original)
+++ websites/staging/community/trunk/content/gsoc-admin-tasks.html Wed Sep 28 01:47:33 2016
@@ -77,9 +77,9 @@
<li><a href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a></li>
<li><a href="/contactpoints.html">Contact Points Within the ASF</a></li>
<li class="divider"></li>
- <li class="nav-header">Additional Resources</li>
+ <li class="nav-header">About Community Development</li>
<li><a href="/comdevboardresolution.html">ComDev Original Board Resolution</a></li>
- <li><a href="/comdevboardreports.html">ComDev Board Reports</a></li>
+ <li><a href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a></li>
</ul>
</li>
<li class="dropdown">
@@ -94,11 +94,10 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">For Committers/PMCs <b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/boardreport.html">Board Report Template</a></li>
<li><a href="/newcommitter.html">Recruiting New Committers</a></li>
<li><a href="/committers/">Useful Information for Committers</a></li>
- <li><a href="/committers/lazyConsensus.html">Lazy Consensus</a></li>
<li><a href="/committers/consensusBuilding.html">Consensus Building</a></li>
+ <li><a href="/committers/lazyConsensus.html">Lazy Consensus</a></li>
<li><a href="/committers/decisionMaking.html">Decision Making</a></li>
<li><a href="/committers/voting.html">Voting</a></li>
<li><a href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a></li>
@@ -123,14 +122,14 @@
<li><a href="/speakers/">Speaker Information</a></li>
<li><a href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a></li>
<li><a href="/speakers/slides.html">Apache-related Slides</a></li>
- <li><a href="http://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a></li>
</ul>
</li>
<li class="dropdown">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown">Calendars <b class="caret"></b></a>
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown">Events <b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/calendars/">Calendars</a></li>
- <li><a href="/calendars/conferences.html">Conferences</a></li>
+ <li><a href="/calendars/">Major Apache-related Events</a></li>
+ <li><a href="http://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a></li>
+ <li><a href="http://www.apache.org/foundation/marks/events">Apache event branding policies</a></li>
</ul>
</li>
<li><a href="/lists.html">Mailing List</a></li>
@@ -339,10 +338,10 @@ http://www.oanda.com/currency/historical
<footer class="footer" align="center">
<div class="container">
<p>
- Copyright © 2013-2015 The Apache Software Foundation, Licensed under
+ Copyright © 2013-2016 The Apache Software Foundation, Licensed under
the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
<br />
- Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+ Apache®, the names of Apache projects, and the feather logo are either <a href="http://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache Software Foundation in the United States and/or other countries.
</p>
</div>
</footer>
Modified: websites/staging/community/trunk/content/gsoc.html
==============================================================================
--- websites/staging/community/trunk/content/gsoc.html (original)
+++ websites/staging/community/trunk/content/gsoc.html Wed Sep 28 01:47:33 2016
@@ -77,9 +77,9 @@
<li><a href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a></li>
<li><a href="/contactpoints.html">Contact Points Within the ASF</a></li>
<li class="divider"></li>
- <li class="nav-header">Additional Resources</li>
+ <li class="nav-header">About Community Development</li>
<li><a href="/comdevboardresolution.html">ComDev Original Board Resolution</a></li>
- <li><a href="/comdevboardreports.html">ComDev Board Reports</a></li>
+ <li><a href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a></li>
</ul>
</li>
<li class="dropdown">
@@ -94,11 +94,10 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">For Committers/PMCs <b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/boardreport.html">Board Report Template</a></li>
<li><a href="/newcommitter.html">Recruiting New Committers</a></li>
<li><a href="/committers/">Useful Information for Committers</a></li>
- <li><a href="/committers/lazyConsensus.html">Lazy Consensus</a></li>
<li><a href="/committers/consensusBuilding.html">Consensus Building</a></li>
+ <li><a href="/committers/lazyConsensus.html">Lazy Consensus</a></li>
<li><a href="/committers/decisionMaking.html">Decision Making</a></li>
<li><a href="/committers/voting.html">Voting</a></li>
<li><a href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a></li>
@@ -123,14 +122,14 @@
<li><a href="/speakers/">Speaker Information</a></li>
<li><a href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a></li>
<li><a href="/speakers/slides.html">Apache-related Slides</a></li>
- <li><a href="http://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a></li>
</ul>
</li>
<li class="dropdown">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown">Calendars <b class="caret"></b></a>
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown">Events <b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/calendars/">Calendars</a></li>
- <li><a href="/calendars/conferences.html">Conferences</a></li>
+ <li><a href="/calendars/">Major Apache-related Events</a></li>
+ <li><a href="http://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a></li>
+ <li><a href="http://www.apache.org/foundation/marks/events">Apache event branding policies</a></li>
</ul>
</li>
<li><a href="/lists.html">Mailing List</a></li>
@@ -307,10 +306,10 @@ date indicated.</p>
<footer class="footer" align="center">
<div class="container">
<p>
- Copyright © 2013-2015 The Apache Software Foundation, Licensed under
+ Copyright © 2013-2016 The Apache Software Foundation, Licensed under
the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
<br />
- Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+ Apache®, the names of Apache projects, and the feather logo are either <a href="http://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache Software Foundation in the United States and/or other countries.
</p>
</div>
</footer>
Modified: websites/staging/community/trunk/content/guide-to-being-a-mentor.html
==============================================================================
--- websites/staging/community/trunk/content/guide-to-being-a-mentor.html (original)
+++ websites/staging/community/trunk/content/guide-to-being-a-mentor.html Wed Sep 28 01:47:33 2016
@@ -77,9 +77,9 @@
<li><a href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a></li>
<li><a href="/contactpoints.html">Contact Points Within the ASF</a></li>
<li class="divider"></li>
- <li class="nav-header">Additional Resources</li>
+ <li class="nav-header">About Community Development</li>
<li><a href="/comdevboardresolution.html">ComDev Original Board Resolution</a></li>
- <li><a href="/comdevboardreports.html">ComDev Board Reports</a></li>
+ <li><a href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a></li>
</ul>
</li>
<li class="dropdown">
@@ -94,11 +94,10 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">For Committers/PMCs <b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/boardreport.html">Board Report Template</a></li>
<li><a href="/newcommitter.html">Recruiting New Committers</a></li>
<li><a href="/committers/">Useful Information for Committers</a></li>
- <li><a href="/committers/lazyConsensus.html">Lazy Consensus</a></li>
<li><a href="/committers/consensusBuilding.html">Consensus Building</a></li>
+ <li><a href="/committers/lazyConsensus.html">Lazy Consensus</a></li>
<li><a href="/committers/decisionMaking.html">Decision Making</a></li>
<li><a href="/committers/voting.html">Voting</a></li>
<li><a href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a></li>
@@ -123,14 +122,14 @@
<li><a href="/speakers/">Speaker Information</a></li>
<li><a href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a></li>
<li><a href="/speakers/slides.html">Apache-related Slides</a></li>
- <li><a href="http://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a></li>
</ul>
</li>
<li class="dropdown">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown">Calendars <b class="caret"></b></a>
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown">Events <b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/calendars/">Calendars</a></li>
- <li><a href="/calendars/conferences.html">Conferences</a></li>
+ <li><a href="/calendars/">Major Apache-related Events</a></li>
+ <li><a href="http://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a></li>
+ <li><a href="http://www.apache.org/foundation/marks/events">Apache event branding policies</a></li>
</ul>
</li>
<li><a href="/lists.html">Mailing List</a></li>
@@ -262,10 +261,10 @@ contribute.</p>
<footer class="footer" align="center">
<div class="container">
<p>
- Copyright © 2013-2015 The Apache Software Foundation, Licensed under
+ Copyright © 2013-2016 The Apache Software Foundation, Licensed under
the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
<br />
- Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+ Apache®, the names of Apache projects, and the feather logo are either <a href="http://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache Software Foundation in the United States and/or other countries.
</p>
</div>
</footer>