Modified: websites/staging/community/trunk/content/index.html
==============================================================================
--- websites/staging/community/trunk/content/index.html (original)
+++ websites/staging/community/trunk/content/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>
@@ -278,10 +277,10 @@ more directly in the specific Apache pro
<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/links.html
==============================================================================
--- websites/staging/community/trunk/content/links.html (original)
+++ websites/staging/community/trunk/content/links.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>
@@ -192,10 +191,10 @@ authors for more information or question
<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/lists.html
==============================================================================
--- websites/staging/community/trunk/content/lists.html (original)
+++ websites/staging/community/trunk/content/lists.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 @@ offer useful search or sending functiona
<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/localmentors.html
==============================================================================
--- websites/staging/community/trunk/content/localmentors.html (original)
+++ websites/staging/community/trunk/content/localmentors.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 @@ application! Head over to <a href="http:
<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/mentee-ranking-process.html
==============================================================================
--- websites/staging/community/trunk/content/mentee-ranking-process.html
(original)
+++ websites/staging/community/trunk/content/mentee-ranking-process.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>
@@ -356,10 +355,10 @@ fast during this meeting.</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/mentor-request-mail.html
==============================================================================
--- websites/staging/community/trunk/content/mentor-request-mail.html (original)
+++ websites/staging/community/trunk/content/mentor-request-mail.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>
@@ -249,10 +248,10 @@ consistently.</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/mentoring/experiences.html
==============================================================================
--- websites/staging/community/trunk/content/mentoring/experiences.html
(original)
+++ websites/staging/community/trunk/content/mentoring/experiences.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>
@@ -206,10 +205,10 @@ Wookie, OpenMeetings, Nuvem, Hama, VXQue
<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/mentoringprogramme-icfoss-pilot.html
==============================================================================
---
websites/staging/community/trunk/content/mentoringprogramme-icfoss-pilot.html
(original)
+++
websites/staging/community/trunk/content/mentoringprogramme-icfoss-pilot.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 @@ for yourself.</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/mentoringprogramme.html
==============================================================================
--- websites/staging/community/trunk/content/mentoringprogramme.html (original)
+++ websites/staging/community/trunk/content/mentoringprogramme.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>
@@ -375,10 +374,10 @@ assessments/etc if the project community
<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/mentorprogrammeapplication.html
==============================================================================
--- websites/staging/community/trunk/content/mentorprogrammeapplication.html
(original)
+++ websites/staging/community/trunk/content/mentorprogrammeapplication.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>
@@ -249,10 +248,10 @@ to the project list).</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/mentorprogrammeformaleducation.html
==============================================================================
---
websites/staging/community/trunk/content/mentorprogrammeformaleducation.html
(original)
+++
websites/staging/community/trunk/content/mentorprogrammeformaleducation.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>
@@ -221,10 +220,10 @@ dispute</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/newbiefaq.html
==============================================================================
--- websites/staging/community/trunk/content/newbiefaq.html (original)
+++ websites/staging/community/trunk/content/newbiefaq.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>
@@ -385,10 +384,10 @@ that help you navigate the ASF.</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/newcomers/index.html
==============================================================================
--- websites/staging/community/trunk/content/newcomers/index.html (original)
+++ websites/staging/community/trunk/content/newcomers/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>
@@ -203,10 +202,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/newcommitter.html
==============================================================================
--- websites/staging/community/trunk/content/newcommitter.html (original)
+++ websites/staging/community/trunk/content/newcommitter.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>
@@ -555,10 +554,10 @@ use the <a href="https://mail-search.apa
<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/projectIndependence.html
==============================================================================
--- websites/staging/community/trunk/content/projectIndependence.html (original)
+++ websites/staging/community/trunk/content/projectIndependence.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>
@@ -237,10 +236,10 @@ Apache Foo (from the ASF) versus BigCo S
<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/proposals/ZestProposal.html
==============================================================================
--- websites/staging/community/trunk/content/proposals/ZestProposal.html
(original)
+++ websites/staging/community/trunk/content/proposals/ZestProposal.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>
@@ -396,10 +395,10 @@ Without an extensive check of all 100+ o
<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/speakers/index.html
==============================================================================
--- websites/staging/community/trunk/content/speakers/index.html (original)
+++ websites/staging/community/trunk/content/speakers/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>
@@ -196,10 +195,10 @@ at Apache), then please email us and sug
<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/speakers/slides.html
==============================================================================
--- websites/staging/community/trunk/content/speakers/slides.html (original)
+++ websites/staging/community/trunk/content/speakers/slides.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>
@@ -242,10 +241,10 @@ Additional slides, videos and audio reco
<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/speakers/speakers.html
==============================================================================
--- websites/staging/community/trunk/content/speakers/speakers.html (original)
+++ websites/staging/community/trunk/content/speakers/speakers.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>
@@ -231,10 +230,10 @@ a day later a check you're listed proper
<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/use-the-comdev-issue-tracker-for-gsoc-tasks.html
==============================================================================
---
websites/staging/community/trunk/content/use-the-comdev-issue-tracker-for-gsoc-tasks.html
(original)
+++
websites/staging/community/trunk/content/use-the-comdev-issue-tracker-for-gsoc-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>
@@ -183,10 +182,10 @@ above URL, narrow down to the comdev pro
<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>
