community-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r1008118 [1/2] - in /websites/staging/community/trunk/content: ./ about/ apache-way/ calendars/ committers/ contributors/ events/ gettingStarted/ mentoring/ newcomers/ proposals/ speakers/
Date Sat, 11 Mar 2017 00:37:54 GMT
Author: buildbot
Date: Sat Mar 11 00:37:54 2017
New Revision: 1008118

Log:
Staging update by buildbot for community

Modified:
    websites/staging/community/trunk/content/   (props changed)
    websites/staging/community/trunk/content/TEMPLATE.html
    websites/staging/community/trunk/content/about/index.html
    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/committer.html
    websites/staging/community/trunk/content/mentoring/experiences.html
    websites/staging/community/trunk/content/mentoring/firstpatch.html
    websites/staging/community/trunk/content/mentoring/index.html
    websites/staging/community/trunk/content/mentoring/mentor.html
    websites/staging/community/trunk/content/mentoring/pmc.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 Sat Mar 11 00:37:54 2017
@@ -1 +1 @@
-1786479
+1786480

Modified: websites/staging/community/trunk/content/TEMPLATE.html
==============================================================================
--- websites/staging/community/trunk/content/TEMPLATE.html (original)
+++ websites/staging/community/trunk/content/TEMPLATE.html Sat Mar 11 00:37:54 2017
@@ -114,7 +114,7 @@
                   <li class="nav-header">Additional Resources</li>
                   <li><a href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a></li>
                   <li><a href="/mentor-request-mail.html">Mentor Request Email Example</a></li>
-                  <li><a href="/localmentors.html">Mentors Near You</a></li>
+                  <!-- <li><a href="/localmentors.html">Mentors Near You</a></li> -->
                 </ul>
               </li>
               <li class="dropdown">
@@ -123,6 +123,7 @@
                   <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://apachecon.com/">ApacheCon - conference of everything Apache</a></li>
                 </ul>
               </li>
               <li class="dropdown">
@@ -172,10 +173,8 @@ h2:hover > .headerlink, h3:hover > .head
   <footer class="footer" align="center">
     <div class="container">
       <p>
-        Copyright &copy; 2013-2017 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&reg;, 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.
+		Copyright&copy; 2017, the Apache Software Foundation. Licensed under the <a rel="license" href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a><br/>
+		Apache&reg;, the names of Apache projects, and the multicolor feather logo are <a href="https://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/about/index.html
==============================================================================
--- websites/staging/community/trunk/content/about/index.html (original)
+++ websites/staging/community/trunk/content/about/index.html Sat Mar 11 00:37:54 2017
@@ -114,7 +114,7 @@
                   <li class="nav-header">Additional Resources</li>
                   <li><a href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a></li>
                   <li><a href="/mentor-request-mail.html">Mentor Request Email Example</a></li>
-                  <li><a href="/localmentors.html">Mentors Near You</a></li>
+                  <!-- <li><a href="/localmentors.html">Mentors Near You</a></li> -->
                 </ul>
               </li>
               <li class="dropdown">
@@ -123,6 +123,7 @@
                   <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://apachecon.com/">ApacheCon - conference of everything Apache</a></li>
                 </ul>
               </li>
               <li class="dropdown">
@@ -230,10 +231,8 @@ the Apache Software Foundation.</p>
   <footer class="footer" align="center">
     <div class="container">
       <p>
-        Copyright &copy; 2013-2017 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&reg;, 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.
+		Copyright&copy; 2017, the Apache Software Foundation. Licensed under the <a rel="license" href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a><br/>
+		Apache&reg;, the names of Apache projects, and the multicolor feather logo are <a href="https://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/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 Sat Mar 11 00:37:54 2017
@@ -114,7 +114,7 @@
                   <li class="nav-header">Additional Resources</li>
                   <li><a href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a></li>
                   <li><a href="/mentor-request-mail.html">Mentor Request Email Example</a></li>
-                  <li><a href="/localmentors.html">Mentors Near You</a></li>
+                  <!-- <li><a href="/localmentors.html">Mentors Near You</a></li> -->
                 </ul>
               </li>
               <li class="dropdown">
@@ -123,6 +123,7 @@
                   <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://apachecon.com/">ApacheCon - conference of everything Apache</a></li>
                 </ul>
               </li>
               <li class="dropdown">
@@ -533,10 +534,8 @@ with no hidden agendas.
   <footer class="footer" align="center">
     <div class="container">
       <p>
-        Copyright &copy; 2013-2017 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&reg;, 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.
+		Copyright&copy; 2017, the Apache Software Foundation. Licensed under the <a rel="license" href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a><br/>
+		Apache&reg;, the names of Apache projects, and the multicolor feather logo are <a href="https://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 Sat Mar 11 00:37:54 2017
@@ -114,7 +114,7 @@
                   <li class="nav-header">Additional Resources</li>
                   <li><a href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a></li>
                   <li><a href="/mentor-request-mail.html">Mentor Request Email Example</a></li>
-                  <li><a href="/localmentors.html">Mentors Near You</a></li>
+                  <!-- <li><a href="/localmentors.html">Mentors Near You</a></li> -->
                 </ul>
               </li>
               <li class="dropdown">
@@ -123,6 +123,7 @@
                   <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://apachecon.com/">ApacheCon - conference of everything Apache</a></li>
                 </ul>
               </li>
               <li class="dropdown">
@@ -236,10 +237,8 @@ the first of the month)</li>
   <footer class="footer" align="center">
     <div class="container">
       <p>
-        Copyright &copy; 2013-2017 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&reg;, 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.
+		Copyright&copy; 2017, the Apache Software Foundation. Licensed under the <a rel="license" href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a><br/>
+		Apache&reg;, the names of Apache projects, and the multicolor feather logo are <a href="https://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 Sat Mar 11 00:37:54 2017
@@ -114,7 +114,7 @@
                   <li class="nav-header">Additional Resources</li>
                   <li><a href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a></li>
                   <li><a href="/mentor-request-mail.html">Mentor Request Email Example</a></li>
-                  <li><a href="/localmentors.html">Mentors Near You</a></li>
+                  <!-- <li><a href="/localmentors.html">Mentors Near You</a></li> -->
                 </ul>
               </li>
               <li class="dropdown">
@@ -123,6 +123,7 @@
                   <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://apachecon.com/">ApacheCon - conference of everything Apache</a></li>
                 </ul>
               </li>
               <li class="dropdown">
@@ -253,10 +254,8 @@ function render(data) {
   <footer class="footer" align="center">
     <div class="container">
       <p>
-        Copyright &copy; 2013-2017 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&reg;, 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.
+		Copyright&copy; 2017, the Apache Software Foundation. Licensed under the <a rel="license" href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a><br/>
+		Apache&reg;, the names of Apache projects, and the multicolor feather logo are <a href="https://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 Sat Mar 11 00:37:54 2017
@@ -114,7 +114,7 @@
                   <li class="nav-header">Additional Resources</li>
                   <li><a href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a></li>
                   <li><a href="/mentor-request-mail.html">Mentor Request Email Example</a></li>
-                  <li><a href="/localmentors.html">Mentors Near You</a></li>
+                  <!-- <li><a href="/localmentors.html">Mentors Near You</a></li> -->
                 </ul>
               </li>
               <li class="dropdown">
@@ -123,6 +123,7 @@
                   <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://apachecon.com/">ApacheCon - conference of everything Apache</a></li>
                 </ul>
               </li>
               <li class="dropdown">
@@ -200,10 +201,8 @@ Apache project related events there.</p>
   <footer class="footer" align="center">
     <div class="container">
       <p>
-        Copyright &copy; 2013-2017 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&reg;, 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.
+		Copyright&copy; 2017, the Apache Software Foundation. Licensed under the <a rel="license" href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a><br/>
+		Apache&reg;, the names of Apache projects, and the multicolor feather logo are <a href="https://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 Sat Mar 11 00:37:54 2017
@@ -114,7 +114,7 @@
                   <li class="nav-header">Additional Resources</li>
                   <li><a href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a></li>
                   <li><a href="/mentor-request-mail.html">Mentor Request Email Example</a></li>
-                  <li><a href="/localmentors.html">Mentors Near You</a></li>
+                  <!-- <li><a href="/localmentors.html">Mentors Near You</a></li> -->
                 </ul>
               </li>
               <li class="dropdown">
@@ -123,6 +123,7 @@
                   <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://apachecon.com/">ApacheCon - conference of everything Apache</a></li>
                 </ul>
               </li>
               <li class="dropdown">
@@ -895,10 +896,8 @@ Main items for next period
   <footer class="footer" align="center">
     <div class="container">
       <p>
-        Copyright &copy; 2013-2017 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&reg;, 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.
+		Copyright&copy; 2017, the Apache Software Foundation. Licensed under the <a rel="license" href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a><br/>
+		Apache&reg;, the names of Apache projects, and the multicolor feather logo are <a href="https://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 Sat Mar 11 00:37:54 2017
@@ -114,7 +114,7 @@
                   <li class="nav-header">Additional Resources</li>
                   <li><a href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a></li>
                   <li><a href="/mentor-request-mail.html">Mentor Request Email Example</a></li>
-                  <li><a href="/localmentors.html">Mentors Near You</a></li>
+                  <!-- <li><a href="/localmentors.html">Mentors Near You</a></li> -->
                 </ul>
               </li>
               <li class="dropdown">
@@ -123,6 +123,7 @@
                   <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://apachecon.com/">ApacheCon - conference of everything Apache</a></li>
                 </ul>
               </li>
               <li class="dropdown">
@@ -228,10 +229,8 @@ Project,
   <footer class="footer" align="center">
     <div class="container">
       <p>
-        Copyright &copy; 2013-2017 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&reg;, 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.
+		Copyright&copy; 2017, the Apache Software Foundation. Licensed under the <a rel="license" href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a><br/>
+		Apache&reg;, the names of Apache projects, and the multicolor feather logo are <a href="https://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 Sat Mar 11 00:37:54 2017
@@ -114,7 +114,7 @@
                   <li class="nav-header">Additional Resources</li>
                   <li><a href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a></li>
                   <li><a href="/mentor-request-mail.html">Mentor Request Email Example</a></li>
-                  <li><a href="/localmentors.html">Mentors Near You</a></li>
+                  <!-- <li><a href="/localmentors.html">Mentors Near You</a></li> -->
                 </ul>
               </li>
               <li class="dropdown">
@@ -123,6 +123,7 @@
                   <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://apachecon.com/">ApacheCon - conference of everything Apache</a></li>
                 </ul>
               </li>
               <li class="dropdown">
@@ -213,10 +214,8 @@ the work under the <a href="/committers/
   <footer class="footer" align="center">
     <div class="container">
       <p>
-        Copyright &copy; 2013-2017 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&reg;, 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.
+		Copyright&copy; 2017, the Apache Software Foundation. Licensed under the <a rel="license" href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a><br/>
+		Apache&reg;, the names of Apache projects, and the multicolor feather logo are <a href="https://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 Sat Mar 11 00:37:54 2017
@@ -114,7 +114,7 @@
                   <li class="nav-header">Additional Resources</li>
                   <li><a href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a></li>
                   <li><a href="/mentor-request-mail.html">Mentor Request Email Example</a></li>
-                  <li><a href="/localmentors.html">Mentors Near You</a></li>
+                  <!-- <li><a href="/localmentors.html">Mentors Near You</a></li> -->
                 </ul>
               </li>
               <li class="dropdown">
@@ -123,6 +123,7 @@
                   <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://apachecon.com/">ApacheCon - conference of everything Apache</a></li>
                 </ul>
               </li>
               <li class="dropdown">
@@ -196,10 +197,8 @@ to approve a release. </p>
   <footer class="footer" align="center">
     <div class="container">
       <p>
-        Copyright &copy; 2013-2017 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&reg;, 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.
+		Copyright&copy; 2017, the Apache Software Foundation. Licensed under the <a rel="license" href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a><br/>
+		Apache&reg;, the names of Apache projects, and the multicolor feather logo are <a href="https://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 Sat Mar 11 00:37:54 2017
@@ -114,7 +114,7 @@
                   <li class="nav-header">Additional Resources</li>
                   <li><a href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a></li>
                   <li><a href="/mentor-request-mail.html">Mentor Request Email Example</a></li>
-                  <li><a href="/localmentors.html">Mentors Near You</a></li>
+                  <!-- <li><a href="/localmentors.html">Mentors Near You</a></li> -->
                 </ul>
               </li>
               <li class="dropdown">
@@ -123,6 +123,7 @@
                   <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://apachecon.com/">ApacheCon - conference of everything Apache</a></li>
                 </ul>
               </li>
               <li class="dropdown">
@@ -190,10 +191,8 @@ campaign.</p>
   <footer class="footer" align="center">
     <div class="container">
       <p>
-        Copyright &copy; 2013-2017 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&reg;, 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.
+		Copyright&copy; 2017, the Apache Software Foundation. Licensed under the <a rel="license" href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a><br/>
+		Apache&reg;, the names of Apache projects, and the multicolor feather logo are <a href="https://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 Sat Mar 11 00:37:54 2017
@@ -114,7 +114,7 @@
                   <li class="nav-header">Additional Resources</li>
                   <li><a href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a></li>
                   <li><a href="/mentor-request-mail.html">Mentor Request Email Example</a></li>
-                  <li><a href="/localmentors.html">Mentors Near You</a></li>
+                  <!-- <li><a href="/localmentors.html">Mentors Near You</a></li> -->
                 </ul>
               </li>
               <li class="dropdown">
@@ -123,6 +123,7 @@
                   <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://apachecon.com/">ApacheCon - conference of everything Apache</a></li>
                 </ul>
               </li>
               <li class="dropdown">
@@ -260,10 +261,8 @@ here are a few you might want to take a
   <footer class="footer" align="center">
     <div class="container">
       <p>
-        Copyright &copy; 2013-2017 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&reg;, 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.
+		Copyright&copy; 2017, the Apache Software Foundation. Licensed under the <a rel="license" href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a><br/>
+		Apache&reg;, the names of Apache projects, and the multicolor feather logo are <a href="https://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 Sat Mar 11 00:37:54 2017
@@ -114,7 +114,7 @@
                   <li class="nav-header">Additional Resources</li>
                   <li><a href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a></li>
                   <li><a href="/mentor-request-mail.html">Mentor Request Email Example</a></li>
-                  <li><a href="/localmentors.html">Mentors Near You</a></li>
+                  <!-- <li><a href="/localmentors.html">Mentors Near You</a></li> -->
                 </ul>
               </li>
               <li class="dropdown">
@@ -123,6 +123,7 @@
                   <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://apachecon.com/">ApacheCon - conference of everything Apache</a></li>
                 </ul>
               </li>
               <li class="dropdown">
@@ -214,10 +215,8 @@ can take some time to get used to.</p>
   <footer class="footer" align="center">
     <div class="container">
       <p>
-        Copyright &copy; 2013-2017 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&reg;, 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.
+		Copyright&copy; 2017, the Apache Software Foundation. Licensed under the <a rel="license" href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a><br/>
+		Apache&reg;, the names of Apache projects, and the multicolor feather logo are <a href="https://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 Sat Mar 11 00:37:54 2017
@@ -114,7 +114,7 @@
                   <li class="nav-header">Additional Resources</li>
                   <li><a href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a></li>
                   <li><a href="/mentor-request-mail.html">Mentor Request Email Example</a></li>
-                  <li><a href="/localmentors.html">Mentors Near You</a></li>
+                  <!-- <li><a href="/localmentors.html">Mentors Near You</a></li> -->
                 </ul>
               </li>
               <li class="dropdown">
@@ -123,6 +123,7 @@
                   <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://apachecon.com/">ApacheCon - conference of everything Apache</a></li>
                 </ul>
               </li>
               <li class="dropdown">
@@ -195,10 +196,8 @@ of action that you are willing and able
   <footer class="footer" align="center">
     <div class="container">
       <p>
-        Copyright &copy; 2013-2017 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&reg;, 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.
+		Copyright&copy; 2017, the Apache Software Foundation. Licensed under the <a rel="license" href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a><br/>
+		Apache&reg;, the names of Apache projects, and the multicolor feather logo are <a href="https://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 Sat Mar 11 00:37:54 2017
@@ -114,7 +114,7 @@
                   <li class="nav-header">Additional Resources</li>
                   <li><a href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a></li>
                   <li><a href="/mentor-request-mail.html">Mentor Request Email Example</a></li>
-                  <li><a href="/localmentors.html">Mentors Near You</a></li>
+                  <!-- <li><a href="/localmentors.html">Mentors Near You</a></li> -->
                 </ul>
               </li>
               <li class="dropdown">
@@ -123,6 +123,7 @@
                   <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://apachecon.com/">ApacheCon - conference of everything Apache</a></li>
                 </ul>
               </li>
               <li class="dropdown">
@@ -198,10 +199,8 @@ response from the ASF's legal counsel to
   <footer class="footer" align="center">
     <div class="container">
       <p>
-        Copyright &copy; 2013-2017 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&reg;, 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.
+		Copyright&copy; 2017, the Apache Software Foundation. Licensed under the <a rel="license" href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a><br/>
+		Apache&reg;, the names of Apache projects, and the multicolor feather logo are <a href="https://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 Sat Mar 11 00:37:54 2017
@@ -114,7 +114,7 @@
                   <li class="nav-header">Additional Resources</li>
                   <li><a href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a></li>
                   <li><a href="/mentor-request-mail.html">Mentor Request Email Example</a></li>
-                  <li><a href="/localmentors.html">Mentors Near You</a></li>
+                  <!-- <li><a href="/localmentors.html">Mentors Near You</a></li> -->
                 </ul>
               </li>
               <li class="dropdown">
@@ -123,6 +123,7 @@
                   <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://apachecon.com/">ApacheCon - conference of everything Apache</a></li>
                 </ul>
               </li>
               <li class="dropdown">
@@ -270,10 +271,8 @@ comment before closing out the issue.</p
   <footer class="footer" align="center">
     <div class="container">
       <p>
-        Copyright &copy; 2013-2017 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&reg;, 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.
+		Copyright&copy; 2017, the Apache Software Foundation. Licensed under the <a rel="license" href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a><br/>
+		Apache&reg;, the names of Apache projects, and the multicolor feather logo are <a href="https://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 Sat Mar 11 00:37:54 2017
@@ -114,7 +114,7 @@
                   <li class="nav-header">Additional Resources</li>
                   <li><a href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a></li>
                   <li><a href="/mentor-request-mail.html">Mentor Request Email Example</a></li>
-                  <li><a href="/localmentors.html">Mentors Near You</a></li>
+                  <!-- <li><a href="/localmentors.html">Mentors Near You</a></li> -->
                 </ul>
               </li>
               <li class="dropdown">
@@ -123,6 +123,7 @@
                   <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://apachecon.com/">ApacheCon - conference of everything Apache</a></li>
                 </ul>
               </li>
               <li class="dropdown">
@@ -239,10 +240,8 @@ list by sending a mail to
   <footer class="footer" align="center">
     <div class="container">
       <p>
-        Copyright &copy; 2013-2017 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&reg;, 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.
+		Copyright&copy; 2017, the Apache Software Foundation. Licensed under the <a rel="license" href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a><br/>
+		Apache&reg;, the names of Apache projects, and the multicolor feather logo are <a href="https://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 Sat Mar 11 00:37:54 2017
@@ -114,7 +114,7 @@
                   <li class="nav-header">Additional Resources</li>
                   <li><a href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a></li>
                   <li><a href="/mentor-request-mail.html">Mentor Request Email Example</a></li>
-                  <li><a href="/localmentors.html">Mentors Near You</a></li>
+                  <!-- <li><a href="/localmentors.html">Mentors Near You</a></li> -->
                 </ul>
               </li>
               <li class="dropdown">
@@ -123,6 +123,7 @@
                   <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://apachecon.com/">ApacheCon - conference of everything Apache</a></li>
                 </ul>
               </li>
               <li class="dropdown">
@@ -188,10 +189,8 @@ dev@community.apache.org so that it can
   <footer class="footer" align="center">
     <div class="container">
       <p>
-        Copyright &copy; 2013-2017 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&reg;, 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.
+		Copyright&copy; 2017, the Apache Software Foundation. Licensed under the <a rel="license" href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a><br/>
+		Apache&reg;, the names of Apache projects, and the multicolor feather logo are <a href="https://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 Sat Mar 11 00:37:54 2017
@@ -114,7 +114,7 @@
                   <li class="nav-header">Additional Resources</li>
                   <li><a href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a></li>
                   <li><a href="/mentor-request-mail.html">Mentor Request Email Example</a></li>
-                  <li><a href="/localmentors.html">Mentors Near You</a></li>
+                  <!-- <li><a href="/localmentors.html">Mentors Near You</a></li> -->
                 </ul>
               </li>
               <li class="dropdown">
@@ -123,6 +123,7 @@
                   <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://apachecon.com/">ApacheCon - conference of everything Apache</a></li>
                 </ul>
               </li>
               <li class="dropdown">
@@ -225,10 +226,8 @@ foundations <a href="http://apache.org/f
   <footer class="footer" align="center">
     <div class="container">
       <p>
-        Copyright &copy; 2013-2017 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&reg;, 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.
+		Copyright&copy; 2017, the Apache Software Foundation. Licensed under the <a rel="license" href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a><br/>
+		Apache&reg;, the names of Apache projects, and the multicolor feather logo are <a href="https://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 Sat Mar 11 00:37:54 2017
@@ -114,7 +114,7 @@
                   <li class="nav-header">Additional Resources</li>
                   <li><a href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a></li>
                   <li><a href="/mentor-request-mail.html">Mentor Request Email Example</a></li>
-                  <li><a href="/localmentors.html">Mentors Near You</a></li>
+                  <!-- <li><a href="/localmentors.html">Mentors Near You</a></li> -->
                 </ul>
               </li>
               <li class="dropdown">
@@ -123,6 +123,7 @@
                   <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://apachecon.com/">ApacheCon - conference of everything Apache</a></li>
                 </ul>
               </li>
               <li class="dropdown">
@@ -339,10 +340,8 @@ http://www.oanda.com/currency/historical
   <footer class="footer" align="center">
     <div class="container">
       <p>
-        Copyright &copy; 2013-2017 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&reg;, 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.
+		Copyright&copy; 2017, the Apache Software Foundation. Licensed under the <a rel="license" href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a><br/>
+		Apache&reg;, the names of Apache projects, and the multicolor feather logo are <a href="https://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 Sat Mar 11 00:37:54 2017
@@ -114,7 +114,7 @@
                   <li class="nav-header">Additional Resources</li>
                   <li><a href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a></li>
                   <li><a href="/mentor-request-mail.html">Mentor Request Email Example</a></li>
-                  <li><a href="/localmentors.html">Mentors Near You</a></li>
+                  <!-- <li><a href="/localmentors.html">Mentors Near You</a></li> -->
                 </ul>
               </li>
               <li class="dropdown">
@@ -123,6 +123,7 @@
                   <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://apachecon.com/">ApacheCon - conference of everything Apache</a></li>
                 </ul>
               </li>
               <li class="dropdown">
@@ -311,10 +312,8 @@ date indicated.</p>
   <footer class="footer" align="center">
     <div class="container">
       <p>
-        Copyright &copy; 2013-2017 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&reg;, 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.
+		Copyright&copy; 2017, the Apache Software Foundation. Licensed under the <a rel="license" href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a><br/>
+		Apache&reg;, the names of Apache projects, and the multicolor feather logo are <a href="https://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 Sat Mar 11 00:37:54 2017
@@ -114,7 +114,7 @@
                   <li class="nav-header">Additional Resources</li>
                   <li><a href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a></li>
                   <li><a href="/mentor-request-mail.html">Mentor Request Email Example</a></li>
-                  <li><a href="/localmentors.html">Mentors Near You</a></li>
+                  <!-- <li><a href="/localmentors.html">Mentors Near You</a></li> -->
                 </ul>
               </li>
               <li class="dropdown">
@@ -123,6 +123,7 @@
                   <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://apachecon.com/">ApacheCon - conference of everything Apache</a></li>
                 </ul>
               </li>
               <li class="dropdown">
@@ -262,10 +263,8 @@ contribute.</p>
   <footer class="footer" align="center">
     <div class="container">
       <p>
-        Copyright &copy; 2013-2017 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&reg;, 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.
+		Copyright&copy; 2017, the Apache Software Foundation. Licensed under the <a rel="license" href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a><br/>
+		Apache&reg;, the names of Apache projects, and the multicolor feather logo are <a href="https://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/index.html
==============================================================================
--- websites/staging/community/trunk/content/index.html (original)
+++ websites/staging/community/trunk/content/index.html Sat Mar 11 00:37:54 2017
@@ -114,7 +114,7 @@
                   <li class="nav-header">Additional Resources</li>
                   <li><a href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a></li>
                   <li><a href="/mentor-request-mail.html">Mentor Request Email Example</a></li>
-                  <li><a href="/localmentors.html">Mentors Near You</a></li>
+                  <!-- <li><a href="/localmentors.html">Mentors Near You</a></li> -->
                 </ul>
               </li>
               <li class="dropdown">
@@ -123,6 +123,7 @@
                   <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://apachecon.com/">ApacheCon - conference of everything Apache</a></li>
                 </ul>
               </li>
               <li class="dropdown">
@@ -279,10 +280,8 @@ more directly in the specific Apache pro
   <footer class="footer" align="center">
     <div class="container">
       <p>
-        Copyright &copy; 2013-2017 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&reg;, 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.
+		Copyright&copy; 2017, the Apache Software Foundation. Licensed under the <a rel="license" href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a><br/>
+		Apache&reg;, the names of Apache projects, and the multicolor feather logo are <a href="https://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 Sat Mar 11 00:37:54 2017
@@ -114,7 +114,7 @@
                   <li class="nav-header">Additional Resources</li>
                   <li><a href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a></li>
                   <li><a href="/mentor-request-mail.html">Mentor Request Email Example</a></li>
-                  <li><a href="/localmentors.html">Mentors Near You</a></li>
+                  <!-- <li><a href="/localmentors.html">Mentors Near You</a></li> -->
                 </ul>
               </li>
               <li class="dropdown">
@@ -123,6 +123,7 @@
                   <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://apachecon.com/">ApacheCon - conference of everything Apache</a></li>
                 </ul>
               </li>
               <li class="dropdown">
@@ -192,10 +193,8 @@ authors for more information or question
   <footer class="footer" align="center">
     <div class="container">
       <p>
-        Copyright &copy; 2013-2017 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&reg;, 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.
+		Copyright&copy; 2017, the Apache Software Foundation. Licensed under the <a rel="license" href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a><br/>
+		Apache&reg;, the names of Apache projects, and the multicolor feather logo are <a href="https://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 Sat Mar 11 00:37:54 2017
@@ -114,7 +114,7 @@
                   <li class="nav-header">Additional Resources</li>
                   <li><a href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a></li>
                   <li><a href="/mentor-request-mail.html">Mentor Request Email Example</a></li>
-                  <li><a href="/localmentors.html">Mentors Near You</a></li>
+                  <!-- <li><a href="/localmentors.html">Mentors Near You</a></li> -->
                 </ul>
               </li>
               <li class="dropdown">
@@ -123,6 +123,7 @@
                   <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://apachecon.com/">ApacheCon - conference of everything Apache</a></li>
                 </ul>
               </li>
               <li class="dropdown">
@@ -216,10 +217,8 @@ offer useful search or sending functiona
   <footer class="footer" align="center">
     <div class="container">
       <p>
-        Copyright &copy; 2013-2017 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&reg;, 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.
+		Copyright&copy; 2017, the Apache Software Foundation. Licensed under the <a rel="license" href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a><br/>
+		Apache&reg;, the names of Apache projects, and the multicolor feather logo are <a href="https://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 Sat Mar 11 00:37:54 2017
@@ -114,7 +114,7 @@
                   <li class="nav-header">Additional Resources</li>
                   <li><a href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a></li>
                   <li><a href="/mentor-request-mail.html">Mentor Request Email Example</a></li>
-                  <li><a href="/localmentors.html">Mentors Near You</a></li>
+                  <!-- <li><a href="/localmentors.html">Mentors Near You</a></li> -->
                 </ul>
               </li>
               <li class="dropdown">
@@ -123,6 +123,7 @@
                   <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://apachecon.com/">ApacheCon - conference of everything Apache</a></li>
                 </ul>
               </li>
               <li class="dropdown">
@@ -262,10 +263,8 @@ application! Head over to <a href="http:
   <footer class="footer" align="center">
     <div class="container">
       <p>
-        Copyright &copy; 2013-2017 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&reg;, 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.
+		Copyright&copy; 2017, the Apache Software Foundation. Licensed under the <a rel="license" href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a><br/>
+		Apache&reg;, the names of Apache projects, and the multicolor feather logo are <a href="https://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 Sat Mar 11 00:37:54 2017
@@ -114,7 +114,7 @@
                   <li class="nav-header">Additional Resources</li>
                   <li><a href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a></li>
                   <li><a href="/mentor-request-mail.html">Mentor Request Email Example</a></li>
-                  <li><a href="/localmentors.html">Mentors Near You</a></li>
+                  <!-- <li><a href="/localmentors.html">Mentors Near You</a></li> -->
                 </ul>
               </li>
               <li class="dropdown">
@@ -123,6 +123,7 @@
                   <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://apachecon.com/">ApacheCon - conference of everything Apache</a></li>
                 </ul>
               </li>
               <li class="dropdown">
@@ -356,10 +357,8 @@ fast during this meeting.</p>
   <footer class="footer" align="center">
     <div class="container">
       <p>
-        Copyright &copy; 2013-2017 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&reg;, 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.
+		Copyright&copy; 2017, the Apache Software Foundation. Licensed under the <a rel="license" href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a><br/>
+		Apache&reg;, the names of Apache projects, and the multicolor feather logo are <a href="https://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 Sat Mar 11 00:37:54 2017
@@ -114,7 +114,7 @@
                   <li class="nav-header">Additional Resources</li>
                   <li><a href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a></li>
                   <li><a href="/mentor-request-mail.html">Mentor Request Email Example</a></li>
-                  <li><a href="/localmentors.html">Mentors Near You</a></li>
+                  <!-- <li><a href="/localmentors.html">Mentors Near You</a></li> -->
                 </ul>
               </li>
               <li class="dropdown">
@@ -123,6 +123,7 @@
                   <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://apachecon.com/">ApacheCon - conference of everything Apache</a></li>
                 </ul>
               </li>
               <li class="dropdown">
@@ -249,10 +250,8 @@ consistently.</p>
   <footer class="footer" align="center">
     <div class="container">
       <p>
-        Copyright &copy; 2013-2017 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&reg;, 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.
+		Copyright&copy; 2017, the Apache Software Foundation. Licensed under the <a rel="license" href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a><br/>
+		Apache&reg;, the names of Apache projects, and the multicolor feather logo are <a href="https://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/committer.html
==============================================================================
--- websites/staging/community/trunk/content/mentoring/committer.html (original)
+++ websites/staging/community/trunk/content/mentoring/committer.html Sat Mar 11 00:37:54 2017
@@ -114,7 +114,7 @@
                   <li class="nav-header">Additional Resources</li>
                   <li><a href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a></li>
                   <li><a href="/mentor-request-mail.html">Mentor Request Email Example</a></li>
-                  <li><a href="/localmentors.html">Mentors Near You</a></li>
+                  <!-- <li><a href="/localmentors.html">Mentors Near You</a></li> -->
                 </ul>
               </li>
               <li class="dropdown">
@@ -123,6 +123,7 @@
                   <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://apachecon.com/">ApacheCon - conference of everything Apache</a></li>
                 </ul>
               </li>
               <li class="dropdown">
@@ -180,10 +181,8 @@ them for your particular project is crit
   <footer class="footer" align="center">
     <div class="container">
       <p>
-        Copyright &copy; 2013-2017 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&reg;, 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.
+		Copyright&copy; 2017, the Apache Software Foundation. Licensed under the <a rel="license" href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a><br/>
+		Apache&reg;, the names of Apache projects, and the multicolor feather logo are <a href="https://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 Sat Mar 11 00:37:54 2017
@@ -114,7 +114,7 @@
                   <li class="nav-header">Additional Resources</li>
                   <li><a href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a></li>
                   <li><a href="/mentor-request-mail.html">Mentor Request Email Example</a></li>
-                  <li><a href="/localmentors.html">Mentors Near You</a></li>
+                  <!-- <li><a href="/localmentors.html">Mentors Near You</a></li> -->
                 </ul>
               </li>
               <li class="dropdown">
@@ -123,6 +123,7 @@
                   <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://apachecon.com/">ApacheCon - conference of everything Apache</a></li>
                 </ul>
               </li>
               <li class="dropdown">
@@ -206,10 +207,8 @@ Wookie, OpenMeetings, Nuvem, Hama, VXQue
   <footer class="footer" align="center">
     <div class="container">
       <p>
-        Copyright &copy; 2013-2017 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&reg;, 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.
+		Copyright&copy; 2017, the Apache Software Foundation. Licensed under the <a rel="license" href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a><br/>
+		Apache&reg;, the names of Apache projects, and the multicolor feather logo are <a href="https://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/firstpatch.html
==============================================================================
--- websites/staging/community/trunk/content/mentoring/firstpatch.html (original)
+++ websites/staging/community/trunk/content/mentoring/firstpatch.html Sat Mar 11 00:37:54 2017
@@ -114,7 +114,7 @@
                   <li class="nav-header">Additional Resources</li>
                   <li><a href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a></li>
                   <li><a href="/mentor-request-mail.html">Mentor Request Email Example</a></li>
-                  <li><a href="/localmentors.html">Mentors Near You</a></li>
+                  <!-- <li><a href="/localmentors.html">Mentors Near You</a></li> -->
                 </ul>
               </li>
               <li class="dropdown">
@@ -123,6 +123,7 @@
                   <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://apachecon.com/">ApacheCon - conference of everything Apache</a></li>
                 </ul>
               </li>
               <li class="dropdown">
@@ -179,10 +180,8 @@ second patch.</p>
   <footer class="footer" align="center">
     <div class="container">
       <p>
-        Copyright &copy; 2013-2017 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&reg;, 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.
+		Copyright&copy; 2017, the Apache Software Foundation. Licensed under the <a rel="license" href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a><br/>
+		Apache&reg;, the names of Apache projects, and the multicolor feather logo are <a href="https://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/index.html
==============================================================================
--- websites/staging/community/trunk/content/mentoring/index.html (original)
+++ websites/staging/community/trunk/content/mentoring/index.html Sat Mar 11 00:37:54 2017
@@ -114,7 +114,7 @@
                   <li class="nav-header">Additional Resources</li>
                   <li><a href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a></li>
                   <li><a href="/mentor-request-mail.html">Mentor Request Email Example</a></li>
-                  <li><a href="/localmentors.html">Mentors Near You</a></li>
+                  <!-- <li><a href="/localmentors.html">Mentors Near You</a></li> -->
                 </ul>
               </li>
               <li class="dropdown">
@@ -123,6 +123,7 @@
                   <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://apachecon.com/">ApacheCon - conference of everything Apache</a></li>
                 </ul>
               </li>
               <li class="dropdown">
@@ -188,10 +189,8 @@ your community.</p>
   <footer class="footer" align="center">
     <div class="container">
       <p>
-        Copyright &copy; 2013-2017 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&reg;, 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.
+		Copyright&copy; 2017, the Apache Software Foundation. Licensed under the <a rel="license" href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a><br/>
+		Apache&reg;, the names of Apache projects, and the multicolor feather logo are <a href="https://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/mentor.html
==============================================================================
--- websites/staging/community/trunk/content/mentoring/mentor.html (original)
+++ websites/staging/community/trunk/content/mentoring/mentor.html Sat Mar 11 00:37:54 2017
@@ -114,7 +114,7 @@
                   <li class="nav-header">Additional Resources</li>
                   <li><a href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a></li>
                   <li><a href="/mentor-request-mail.html">Mentor Request Email Example</a></li>
-                  <li><a href="/localmentors.html">Mentors Near You</a></li>
+                  <!-- <li><a href="/localmentors.html">Mentors Near You</a></li> -->
                 </ul>
               </li>
               <li class="dropdown">
@@ -123,6 +123,7 @@
                   <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://apachecon.com/">ApacheCon - conference of everything Apache</a></li>
                 </ul>
               </li>
               <li class="dropdown">
@@ -182,10 +183,8 @@ themselves. Here's some ways you can do
   <footer class="footer" align="center">
     <div class="container">
       <p>
-        Copyright &copy; 2013-2017 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&reg;, 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.
+		Copyright&copy; 2017, the Apache Software Foundation. Licensed under the <a rel="license" href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a><br/>
+		Apache&reg;, the names of Apache projects, and the multicolor feather logo are <a href="https://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/pmc.html
==============================================================================
--- websites/staging/community/trunk/content/mentoring/pmc.html (original)
+++ websites/staging/community/trunk/content/mentoring/pmc.html Sat Mar 11 00:37:54 2017
@@ -114,7 +114,7 @@
                   <li class="nav-header">Additional Resources</li>
                   <li><a href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a></li>
                   <li><a href="/mentor-request-mail.html">Mentor Request Email Example</a></li>
-                  <li><a href="/localmentors.html">Mentors Near You</a></li>
+                  <!-- <li><a href="/localmentors.html">Mentors Near You</a></li> -->
                 </ul>
               </li>
               <li class="dropdown">
@@ -123,6 +123,7 @@
                   <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://apachecon.com/">ApacheCon - conference of everything Apache</a></li>
                 </ul>
               </li>
               <li class="dropdown">
@@ -183,10 +184,8 @@ can help them in their new job.</p>
   <footer class="footer" align="center">
     <div class="container">
       <p>
-        Copyright &copy; 2013-2017 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&reg;, 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.
+		Copyright&copy; 2017, the Apache Software Foundation. Licensed under the <a rel="license" href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a><br/>
+		Apache&reg;, the names of Apache projects, and the multicolor feather logo are <a href="https://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 Sat Mar 11 00:37:54 2017
@@ -114,7 +114,7 @@
                   <li class="nav-header">Additional Resources</li>
                   <li><a href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a></li>
                   <li><a href="/mentor-request-mail.html">Mentor Request Email Example</a></li>
-                  <li><a href="/localmentors.html">Mentors Near You</a></li>
+                  <!-- <li><a href="/localmentors.html">Mentors Near You</a></li> -->
                 </ul>
               </li>
               <li class="dropdown">
@@ -123,6 +123,7 @@
                   <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://apachecon.com/">ApacheCon - conference of everything Apache</a></li>
                 </ul>
               </li>
               <li class="dropdown">
@@ -228,10 +229,8 @@ for yourself.</p>
   <footer class="footer" align="center">
     <div class="container">
       <p>
-        Copyright &copy; 2013-2017 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&reg;, 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.
+		Copyright&copy; 2017, the Apache Software Foundation. Licensed under the <a rel="license" href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a><br/>
+		Apache&reg;, the names of Apache projects, and the multicolor feather logo are <a href="https://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 Sat Mar 11 00:37:54 2017
@@ -114,7 +114,7 @@
                   <li class="nav-header">Additional Resources</li>
                   <li><a href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a></li>
                   <li><a href="/mentor-request-mail.html">Mentor Request Email Example</a></li>
-                  <li><a href="/localmentors.html">Mentors Near You</a></li>
+                  <!-- <li><a href="/localmentors.html">Mentors Near You</a></li> -->
                 </ul>
               </li>
               <li class="dropdown">
@@ -123,6 +123,7 @@
                   <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://apachecon.com/">ApacheCon - conference of everything Apache</a></li>
                 </ul>
               </li>
               <li class="dropdown">
@@ -375,10 +376,8 @@ assessments/etc if the project community
   <footer class="footer" align="center">
     <div class="container">
       <p>
-        Copyright &copy; 2013-2017 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&reg;, 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.
+		Copyright&copy; 2017, the Apache Software Foundation. Licensed under the <a rel="license" href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a><br/>
+		Apache&reg;, the names of Apache projects, and the multicolor feather logo are <a href="https://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>



Mime
View raw message