You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@community.apache.org by gi...@apache.org on 2023/03/17 23:50:24 UTC

[comdev-site] branch asf-site updated: Updated asf-site from master at 87caf1d243b1b314cff8d539ff3a1fa04371d569 using https://ci-builds.apache.org/job/Community%20Development/job/site/job/master/206/

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

git-site-role pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/comdev-site.git


The following commit(s) were added to refs/heads/asf-site by this push:
     new 8574258  Updated asf-site from master at 87caf1d243b1b314cff8d539ff3a1fa04371d569 using https://ci-builds.apache.org/job/Community%20Development/job/site/job/master/206/
8574258 is described below

commit 8574258ff1035a1869b498e6a37a5b49b530d853
Author: jenkins <bu...@apache.org>
AuthorDate: Fri Mar 17 23:50:17 2023 +0000

    Updated asf-site from master at 87caf1d243b1b314cff8d539ff3a1fa04371d569 using https://ci-builds.apache.org/job/Community%20Development/job/site/job/master/206/
---
 content/about.html                                 |  15 -
 content/about/index.html                           |  15 -
 content/apache-way.html                            |  15 -
 .../apache-way/apache-project-maturity-model.html  |  15 -
 content/boardreport.html                           |  15 -
 content/calendars.html                             |  15 -
 content/calendars/conferences.html                 |  15 -
 content/calendars/index.html                       |  15 -
 content/comdevboardreports.html                    |  15 -
 content/committers.html                            |  15 -
 content/committers/consensusBuilding.html          |  15 -
 content/committers/decisionMaking.html             |  23 +-
 content/committers/funding-disclaimer.html         |  37 +-
 content/committers/index.html                      |  17 +-
 content/committers/index.xml                       |   6 +-
 content/committers/lazyConsensus.html              |  15 -
 content/committers/voting.html                     |  15 -
 content/contactpoints.html                         |  15 -
 content/contributors.html                          |  15 -
 content/contributors/etiquette.html                |  15 -
 content/contributors/index.html                    |  15 -
 content/events.html                                |  15 -
 content/events/small-events.html                   |  15 -
 content/gettingStarted.html                        |  15 -
 content/gettingStarted/101.html                    |  23 +-
 content/gsoc-admin-tasks.html                      |  15 -
 content/gsoc.html                                  |  15 -
 content/guide-to-being-a-mentor.html               |  22 +-
 content/{about.html => history.html}               |  23 +-
 .../boardresolution.html}                          |  27 +-
 content/history/index.xml                          |  35 ++
 .../mentoringprogramme-icfoss-pilot.html           |  28 +-
 content/index.html                                 |  15 -
 content/index.xml                                  |  72 +---
 content/links.html                                 |  15 -
 content/lists.html                                 |  15 -
 content/localmentors.html                          | 330 ---------------
 content/mentee-ranking-process.html                |  15 -
 content/mentor-request-mail.html                   |  15 -
 content/mentoring.html                             |  15 -
 content/mentoring/committer.html                   |  27 +-
 content/mentoring/experiences.html                 |  23 +-
 content/mentoring/firstpatch.html                  |  35 +-
 content/mentoring/index.html                       |  17 +-
 content/mentoring/index.xml                        |  11 +-
 content/mentoring/mentor.html                      |  15 -
 content/mentoring/pmc.html                         |  25 +-
 content/mentoringprogramme.html                    | 448 ---------------------
 content/mentorprogrammeapplication.html            | 323 ---------------
 content/mentorprogrammeformaleducation.html        | 294 --------------
 content/newbiefaq.html                             |  51 +--
 content/newcomers.html                             |  15 -
 content/newcomers/index.html                       |  25 +-
 content/newcomers/index.xml                        |   2 +-
 content/newcommitter.html                          |  15 -
 content/newsletter.html                            |  15 -
 content/newsletter/2017-04.html                    |  15 -
 content/newsletter/2017-05.html                    |  15 -
 content/newsletter/index.html                      |  15 -
 content/projectIndependence.html                   |  15 -
 content/proposals.html                             |  15 -
 content/proposals/ZestProposal.html                |  15 -
 content/sitemap.xml                                |  63 ++-
 content/speakers.html                              |  15 -
 content/speakers/index.html                        |  15 -
 content/speakers/slides.html                       |  15 -
 content/speakers/speakers.html                     |  15 -
 ...se-the-comdev-issue-tracker-for-gsoc-tasks.html |  15 -
 68 files changed, 180 insertions(+), 2452 deletions(-)

diff --git a/content/about.html b/content/about.html
index 78ef8a8..c52835d 100644
--- a/content/about.html
+++ b/content/about.html
@@ -112,21 +112,6 @@
                 <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
               </div>
             </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
             <li class="nav-item dropdown">
               <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 Events
diff --git a/content/about/index.html b/content/about/index.html
index 1b2c648..c06e207 100644
--- a/content/about/index.html
+++ b/content/about/index.html
@@ -113,21 +113,6 @@
                 <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
               </div>
             </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
             <li class="nav-item dropdown">
               <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 Events
diff --git a/content/apache-way.html b/content/apache-way.html
index 19e0ebb..97eb7a6 100644
--- a/content/apache-way.html
+++ b/content/apache-way.html
@@ -112,21 +112,6 @@
                 <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
               </div>
             </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
             <li class="nav-item dropdown">
               <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 Events
diff --git a/content/apache-way/apache-project-maturity-model.html b/content/apache-way/apache-project-maturity-model.html
index d64021c..8272957 100644
--- a/content/apache-way/apache-project-maturity-model.html
+++ b/content/apache-way/apache-project-maturity-model.html
@@ -113,21 +113,6 @@ Overview The goals of this maturity model are to describe how Apache projects op
                 <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
               </div>
             </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
             <li class="nav-item dropdown">
               <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 Events
diff --git a/content/boardreport.html b/content/boardreport.html
index 1dbc16d..b66e314 100644
--- a/content/boardreport.html
+++ b/content/boardreport.html
@@ -115,21 +115,6 @@ Reports need not be exhaustive, unless you are asking for assistance." />
                 <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
               </div>
             </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
             <li class="nav-item dropdown">
               <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 Events
diff --git a/content/calendars.html b/content/calendars.html
index 9fb8689..476e774 100644
--- a/content/calendars.html
+++ b/content/calendars.html
@@ -112,21 +112,6 @@
                 <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
               </div>
             </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
             <li class="nav-item dropdown">
               <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 Events
diff --git a/content/calendars/conferences.html b/content/calendars/conferences.html
index 4d851dd..58999ef 100644
--- a/content/calendars/conferences.html
+++ b/content/calendars/conferences.html
@@ -114,21 +114,6 @@ Upcoming events  List loading   This Calendar is also available as an iCal feed"
                 <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
               </div>
             </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
             <li class="nav-item dropdown">
               <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 Events
diff --git a/content/calendars/index.html b/content/calendars/index.html
index 549339e..ceac41e 100644
--- a/content/calendars/index.html
+++ b/content/calendars/index.html
@@ -113,21 +113,6 @@ This Calendar is maintained by Apache Community Development volunteers (ComDev);
                 <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
               </div>
             </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
             <li class="nav-item dropdown">
               <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 Events
diff --git a/content/comdevboardreports.html b/content/comdevboardreports.html
index fcc50d4..f553e85 100644
--- a/content/comdevboardreports.html
+++ b/content/comdevboardreports.html
@@ -115,21 +115,6 @@ DRAFT November 2012 Status report for the Apache Community Development Project T
                 <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
               </div>
             </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
             <li class="nav-item dropdown">
               <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 Events
diff --git a/content/committers.html b/content/committers.html
index 34ba646..50b8e0b 100644
--- a/content/committers.html
+++ b/content/committers.html
@@ -112,21 +112,6 @@
                 <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
               </div>
             </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
             <li class="nav-item dropdown">
               <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 Events
diff --git a/content/committers/consensusBuilding.html b/content/committers/consensusBuilding.html
index ba383de..7a11c99 100644
--- a/content/committers/consensusBuilding.html
+++ b/content/committers/consensusBuilding.html
@@ -113,21 +113,6 @@ Constructive discussion is the lifeblood of a successful project. However, we wa
                 <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
               </div>
             </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
             <li class="nav-item dropdown">
               <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 Events
diff --git a/content/committers/decisionMaking.html b/content/committers/decisionMaking.html
index 9ea0542..c6609f7 100644
--- a/content/committers/decisionMaking.html
+++ b/content/committers/decisionMaking.html
@@ -12,7 +12,7 @@ To some, the idea of having to establish consensus in a large and distributed te
 <meta property="og:type" content="article" />
 <meta property="og:url" content="https://community.apache.org/committers/decisionMaking.html" />
 <meta property="og:image" content="https://community.apache.org/images/aceu19_1.jpg"/>
-<meta property="article:modified_time" content="2020-12-02T11:27:28-04:00" /><meta property="og:site_name" content="Apache Community Development" />
+<meta property="article:modified_time" content="2021-01-15T09:22:16-04:00" /><meta property="og:site_name" content="Apache Community Development" />
 
 
   <title>Apache Community Development - Decision-Making</title>
@@ -113,21 +113,6 @@ To some, the idea of having to establish consensus in a large and distributed te
                 <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
               </div>
             </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
             <li class="nav-item dropdown">
               <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 Events
@@ -211,15 +196,15 @@ tool we have. Essentially lazy consensus means that you don&rsquo;t need to get
 approval to proceed, but you need to be prepared to listen if someone objects.</p>
 <h2 id="consensus-building">Consensus Building</h2>
 <p>Sometimes lazy consensus is not appropriate. In such cases it is necessary to
-make a proposal to the mailing list and discuss options. There are mechanisms
+make a proposal to the email list and discuss options. There are mechanisms
 for quickly showing your support or otherwise for a proposal and
 <a href="/committers/consensusBuilding.html">building consensus</a> within the community.</p>
 <p>Once there is consensus to approve a proposal, people can proceed with the work under the <a href="/committers/lazyConsensus.html">lazy
 consensus</a> model.</p>
 <h2 id="voting">Voting</h2>
 <p>Occasionally a &ldquo;feel&rdquo; for consensus is not enough. Sometimes we need to
-have a measurable vote, as when we <a href="/committers/voting.html">voted</a> in new committers or
-approve a release.</p>
+have a measurable consensus, for example, when <a href="/committers/voting.html">voting</a> to add committers or
+to approve a release.</p>
 
 
     </div>
diff --git a/content/committers/funding-disclaimer.html b/content/committers/funding-disclaimer.html
index f251962..02d4607 100644
--- a/content/committers/funding-disclaimer.html
+++ b/content/committers/funding-disclaimer.html
@@ -7,9 +7,9 @@
   <meta name="keywords" content="apache, apache community, community development, opensource"/>
   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
   <meta property="og:title" content="Funding campaign disclaimer" />
-<meta property="og:description" content="Some Apache committers have successfully run funding campaigns to support work on their favorite Apache projects.
-This is ok in principle, but you have to make clear that the campaign is your own thing, and avoid any confusion about the role of the ASF and how its projects work.
-This page gives a few examples of that.
+<meta property="og:description" content="Some Apache committers have successfully run funding campaigns to support their work on their favorite Apache projects.
+This is ok in principle, but you have to make it clear that the campaign is your own thing, and avoid any confusion about the role of the ASF and how its projects work.
+This page gives a few examples of how to do that.
 If you have any question about this, feel free to ask on our dev@community." />
 <meta property="og:type" content="article" />
 <meta property="og:url" content="https://community.apache.org/committers/funding-disclaimer.html" />
@@ -115,21 +115,6 @@ If you have any question about this, feel free to ask on our dev@community." />
                 <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
               </div>
             </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
             <li class="nav-item dropdown">
               <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 Events
@@ -198,14 +183,14 @@ If you have any question about this, feel free to ask on our dev@community." />
 
       <hr>
       
-	<p>Some Apache committers have successfully run funding campaigns to support work on their favorite Apache projects.</p>
-<p>This is ok in principle, but you have to make clear that the campaign is your own thing, and avoid any confusion about the role of the
+	<p>Some Apache committers have successfully run funding campaigns to support their work on their favorite Apache projects.</p>
+<p>This is ok in principle, but you have to make it clear that the campaign is your own thing, and avoid any confusion about the role of the
 ASF and how its projects work.</p>
-<p>This page gives a few examples of that.</p>
+<p>This page gives a few examples of how to do that.</p>
 <p>If you have any question about this, feel free to ask on our
 <a href="https://lists.apache.org/list.html?dev@community.apache.org">dev@community.apache.org</a> mailing list.</p>
 <h2 id="example-disclaimer-for-a-personal-crowdfunding-campaign">Example disclaimer for a personal crowdfunding campaign</h2>
-<p>Here&rsquo;s a nice example disclaimer used by one of our committers:</p>
+<p>Here&rsquo;s a nice example, based on a disclaimer one committer has used:</p>
 <div class="highlight"><pre style="background-color:#f8f8f8;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-text" data-lang="text">    Disclaimers: This campaign is done by me, FOO, as an independent individual, not
     by the Apache Software Foundation nor the Apache BAR project. I&#39;m not representing
     the Foundation in any way in this campaign, nor does Apache endorse it. The
@@ -216,10 +201,10 @@ ASF and how its projects work.</p>
 </code></pre></div><p>See also the <a href="https://mail-archives.apache.org/mod_mbox/community-dev/201310.mbox/%3Cop.w4fwv6ewovlrp5%40arsmachina%3E">discussion thread</a> about this
 campaign.</p>
 <h2 id="friends-of-apache-groovy">Friends of Apache Groovy</h2>
-<p><a href="https://opencollective.com/friends-of-groovy">Friends of Apache Groovy</a> is another good example which supports activities
-in the Apache Groovy community:</p>
-<p>The <a href="https://opencollective.com/friends-of-groovy#section-about">explanation in their about section</a> makes it clear that that
-initiative is <em>not</em> affiliated or driven by the ASF, and also that any code or documentation contributions, funded or not, have to go
+<p><a href="https://opencollective.com/friends-of-groovy">Friends of Apache Groovy</a> has another good example which supports activities
+in the Apache Groovy community.</p>
+<p>The <a href="https://opencollective.com/friends-of-groovy#section-about">explanation in their &lsquo;about&rsquo; section</a> makes it clear that the
+initiative is <em>not</em> affiliated with or driven by the ASF, and also that any contributions, funded or not, have to go
 through the usual Apache Groovy acceptance process.</p>
 
 
diff --git a/content/committers/index.html b/content/committers/index.html
index fd9d17f..84742d5 100644
--- a/content/committers/index.html
+++ b/content/committers/index.html
@@ -14,7 +14,7 @@ Decision making Decisions in Apache projects result from:" />
 <meta property="og:type" content="article" />
 <meta property="og:url" content="https://community.apache.org/committers/" />
 <meta property="og:image" content="https://community.apache.org/images/aceu19_1.jpg"/>
-<meta property="article:modified_time" content="2023-03-17T09:35:59-04:00" /><meta property="og:site_name" content="Apache Community Development" />
+<meta property="article:modified_time" content="2023-03-17T12:26:02-04:00" /><meta property="og:site_name" content="Apache Community Development" />
 
 
   <title>Apache Community Development - Committer resources</title>
@@ -115,21 +115,6 @@ Decision making Decisions in Apache projects result from:" />
                 <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
               </div>
             </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
             <li class="nav-item dropdown">
               <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 Events
diff --git a/content/committers/index.xml b/content/committers/index.xml
index 8a34d2a..06800fc 100644
--- a/content/committers/index.xml
+++ b/content/committers/index.xml
@@ -48,9 +48,9 @@ To some, the idea of having to establish consensus in a large and distributed te
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
       <guid>https://community.apache.org/committers/funding-disclaimer.html</guid>
-      <description>Some Apache committers have successfully run funding campaigns to support work on their favorite Apache projects.
-This is ok in principle, but you have to make clear that the campaign is your own thing, and avoid any confusion about the role of the ASF and how its projects work.
-This page gives a few examples of that.
+      <description>Some Apache committers have successfully run funding campaigns to support their work on their favorite Apache projects.
+This is ok in principle, but you have to make it clear that the campaign is your own thing, and avoid any confusion about the role of the ASF and how its projects work.
+This page gives a few examples of how to do that.
 If you have any question about this, feel free to ask on our dev@community.</description>
     </item>
     
diff --git a/content/committers/lazyConsensus.html b/content/committers/lazyConsensus.html
index 9afa820..3b600f2 100644
--- a/content/committers/lazyConsensus.html
+++ b/content/committers/lazyConsensus.html
@@ -112,21 +112,6 @@
                 <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
               </div>
             </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
             <li class="nav-item dropdown">
               <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 Events
diff --git a/content/committers/voting.html b/content/committers/voting.html
index 6330e19..42b923f 100644
--- a/content/committers/voting.html
+++ b/content/committers/voting.html
@@ -113,21 +113,6 @@ Preparing for a Vote It is important to ensure that the community has time to di
                 <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
               </div>
             </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
             <li class="nav-item dropdown">
               <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 Events
diff --git a/content/contactpoints.html b/content/contactpoints.html
index c320512..be23a32 100644
--- a/content/contactpoints.html
+++ b/content/contactpoints.html
@@ -115,21 +115,6 @@ Technical Questions If you have a technical question about this website, or one
                 <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
               </div>
             </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
             <li class="nav-item dropdown">
               <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 Events
diff --git a/content/contributors.html b/content/contributors.html
index 69c9000..70c9db4 100644
--- a/content/contributors.html
+++ b/content/contributors.html
@@ -112,21 +112,6 @@
                 <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
               </div>
             </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
             <li class="nav-item dropdown">
               <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 Events
diff --git a/content/contributors/etiquette.html b/content/contributors/etiquette.html
index 1a7a3f9..abde1b4 100644
--- a/content/contributors/etiquette.html
+++ b/content/contributors/etiquette.html
@@ -113,21 +113,6 @@ Code of Conduct The ASF has adopted a Code of Conduct which covers interactions
                 <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
               </div>
             </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
             <li class="nav-item dropdown">
               <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 Events
diff --git a/content/contributors/index.html b/content/contributors/index.html
index b839a87..e67bd22 100644
--- a/content/contributors/index.html
+++ b/content/contributors/index.html
@@ -113,21 +113,6 @@ Project Independence And Policies While not all ASF projects practice all aspect
                 <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
               </div>
             </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
             <li class="nav-item dropdown">
               <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 Events
diff --git a/content/events.html b/content/events.html
index 6d92b51..68bcdbc 100644
--- a/content/events.html
+++ b/content/events.html
@@ -112,21 +112,6 @@
                 <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
               </div>
             </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
             <li class="nav-item dropdown">
               <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 Events
diff --git a/content/events/small-events.html b/content/events/small-events.html
index 22a10b0..0bda884 100644
--- a/content/events/small-events.html
+++ b/content/events/small-events.html
@@ -117,21 +117,6 @@ c) Once brand use is approved by the respective PMCs, inform the community devel
                 <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
               </div>
             </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
             <li class="nav-item dropdown">
               <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 Events
diff --git a/content/gettingStarted.html b/content/gettingStarted.html
index 7de7a5f..564e223 100644
--- a/content/gettingStarted.html
+++ b/content/gettingStarted.html
@@ -112,21 +112,6 @@
                 <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
               </div>
             </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
             <li class="nav-item dropdown">
               <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 Events
diff --git a/content/gettingStarted/101.html b/content/gettingStarted/101.html
index b121580..bdaaabb 100644
--- a/content/gettingStarted/101.html
+++ b/content/gettingStarted/101.html
@@ -12,7 +12,7 @@ Finding the right project The key to working on projects at Apache (and on any o
 <meta property="og:type" content="article" />
 <meta property="og:url" content="https://community.apache.org/gettingStarted/101.html" />
 <meta property="og:image" content="https://community.apache.org/images/aceu19_1.jpg"/>
-<meta property="article:modified_time" content="2022-02-21T08:46:37-04:00" /><meta property="og:site_name" content="Apache Community Development" />
+<meta property="article:modified_time" content="2023-03-17T12:26:02-04:00" /><meta property="og:site_name" content="Apache Community Development" />
 
 
   <title>Apache Community Development - Getting started</title>
@@ -113,21 +113,6 @@ Finding the right project The key to working on projects at Apache (and on any o
                 <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
               </div>
             </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
             <li class="nav-item dropdown">
               <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 Events
@@ -227,9 +212,7 @@ requests the project is considering. This should give you some
 inspiration about how you might be able to help the project community. If
 you are looking for a beginner-level issue, try searching JIRA for issues
 with the label &ldquo;GSoC&rdquo; or &ldquo;mentor&rdquo;; these are issues the community feels are
-manageable for someone new to the ASF and their project. The community has
-also indicated that they are willing to help someone work on those issues
-through our <a href="/newbiefaq.html#NewbieFAQ-AbouttheApacheMentoringProgramme">mentoring program</a>.</p>
+manageable for someone new to the ASF and their project.</p>
 <h2 id="joining-the-community">Joining the community</h2>
 <p>Once you have identified an issue you would like to tackle, it&rsquo;s time to join the
 project&rsquo;s mailing list (if you haven&rsquo;t already) and get started.</p>
@@ -238,8 +221,6 @@ in return. The community needs to believe that you intend to contribute positive
 to their work. There is a limit to how much &ldquo;hand-holding&rdquo; you will get, so be ready
 to do some work if you expect to continue to be helped in your first foray into
 open source.</p>
-<p>At this point you might want to ask if someone in the community can
-mentor you. See our <a href="/mentorprogrammeapplication.html">mentoring programme</a> for guidance on how to do this.</p>
 <p>Alternatively you can dive straight in and work with the community. Since you&rsquo;ve
 been lurking on the lists for a while, you
 should have a feel for how to get involved, so go for it.</p>
diff --git a/content/gsoc-admin-tasks.html b/content/gsoc-admin-tasks.html
index 49a0ed0..fedc5ee 100644
--- a/content/gsoc-admin-tasks.html
+++ b/content/gsoc-admin-tasks.html
@@ -114,21 +114,6 @@ List of duties:
                 <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
               </div>
             </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
             <li class="nav-item dropdown">
               <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 Events
diff --git a/content/gsoc.html b/content/gsoc.html
index a0c9413..165da60 100644
--- a/content/gsoc.html
+++ b/content/gsoc.html
@@ -114,21 +114,6 @@ Students: read this  Learn about GSoC Decide if you are eligible for GSoC?" />
                 <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
               </div>
             </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
             <li class="nav-item dropdown">
               <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 Events
diff --git a/content/guide-to-being-a-mentor.html b/content/guide-to-being-a-mentor.html
index 2d46b6f..bb36008 100644
--- a/content/guide-to-being-a-mentor.html
+++ b/content/guide-to-being-a-mentor.html
@@ -13,7 +13,7 @@ Important Steps  Add an issue to JIRA (if your project does not use JIRA you can
 <meta property="og:type" content="article" />
 <meta property="og:url" content="https://community.apache.org/guide-to-being-a-mentor.html" />
 <meta property="og:image" content="https://community.apache.org/images/aceu19_1.jpg"/>
-<meta property="article:modified_time" content="2023-02-27T12:47:39+05:30" /><meta property="og:site_name" content="Apache Community Development" />
+<meta property="article:modified_time" content="2023-03-17T12:26:02-04:00" /><meta property="og:site_name" content="Apache Community Development" />
 
 
   <title>Apache Community Development - guide to being a mentor</title>
@@ -114,21 +114,6 @@ Important Steps  Add an issue to JIRA (if your project does not use JIRA you can
                 <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
               </div>
             </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
             <li class="nav-item dropdown">
               <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 Events
@@ -191,7 +176,10 @@ Important Steps  Add an issue to JIRA (if your project does not use JIRA you can
 
       <hr>
       
-	<p><a name="guidetobeingamentor-Submittingideastothementoringprogramme"></a></p>
+	<!--
+Note: This document is bout GSoC, not about a generic Mentoring Program.
+-->
+<p><a name="guidetobeingamentor-Submittingideastothementoringprogramme"></a></p>
 <h1 id="submitting-ideas-to-the-mentoring-programme">Submitting ideas to the mentoring programme</h1>
 <p>We invite all ASF projects to submit their ideas for consideration in the
 ASF mentoring programme. Any Apache member and experienced committers can
diff --git a/content/about.html b/content/history.html
similarity index 89%
copy from content/about.html
copy to content/history.html
index 78ef8a8..cf43bdb 100644
--- a/content/about.html
+++ b/content/history.html
@@ -6,15 +6,15 @@
   <meta name="description" content="Apache Community Development"/>
   <meta name="keywords" content="apache, apache community, community development, opensource"/>
   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
-  <meta property="og:title" content="Abouts" />
+  <meta property="og:title" content="Histories" />
 <meta property="og:description" content="The Community Development project creates and provides tools, processes, and advice to help open-source software projects improve their own community health." />
 <meta property="og:type" content="website" />
-<meta property="og:url" content="https://community.apache.org/about.html" />
+<meta property="og:url" content="https://community.apache.org/history.html" />
 <meta property="og:image" content="https://community.apache.org/images/aceu19_1.jpg"/>
 <meta property="og:site_name" content="Apache Community Development" />
 
 
-  <title>Apache Community Development - Abouts</title>
+  <title>Apache Community Development - Histories</title>
   <link rel="shortcut icon" href="images/favicon.ico">
 
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
@@ -112,21 +112,6 @@
                 <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
               </div>
             </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
             <li class="nav-item dropdown">
               <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 Events
@@ -179,7 +164,7 @@
     
         
         
-            <li class="breadcrumb-item"><a href='/about.html'>About</a></li>
+            <li class="breadcrumb-item"><a href='/history.html'>History</a></li>
             
         
     
diff --git a/content/comdevboardresolution.html b/content/history/boardresolution.html
similarity index 91%
rename from content/comdevboardresolution.html
rename to content/history/boardresolution.html
index 0a1b89c..5e4f915 100644
--- a/content/comdevboardresolution.html
+++ b/content/history/boardresolution.html
@@ -10,9 +10,9 @@
 <meta property="og:description" content="The Apache Community Development Project was created in November 2009.
 Board Resolution Creating the Apache Community Development ProjectEstablish the Apache Community Development Project  WHEREAS, the Board of Directors deems it to be in the best interests of the Foundation and consistent with the Foundation&#39;s purpose to establish a Project Management Committee charged with coordinating community development efforts. NOW, THEREFORE, BE IT RESOLVED, that a Project Management Committee (PMC), to be known as the &quot;Apache Community Development Project& [...]
 <meta property="og:type" content="article" />
-<meta property="og:url" content="https://community.apache.org/comdevboardresolution.html" />
+<meta property="og:url" content="https://community.apache.org/history/boardresolution.html" />
 <meta property="og:image" content="https://community.apache.org/images/aceu19_1.jpg"/>
-<meta property="article:modified_time" content="2020-03-24T15:03:46+01:00" /><meta property="og:site_name" content="Apache Community Development" />
+<meta property="article:modified_time" content="2023-03-17T12:26:02-04:00" /><meta property="og:site_name" content="Apache Community Development" />
 
 
   <title>Apache Community Development - ComDevBoardResolution</title>
@@ -113,21 +113,6 @@ Board Resolution Creating the Apache Community Development ProjectEstablish the
                 <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
               </div>
             </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
             <li class="nav-item dropdown">
               <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 Events
@@ -180,7 +165,13 @@ Board Resolution Creating the Apache Community Development ProjectEstablish the
     
         
         
-            <li class="breadcrumb-item"><a href='/comdevboardresolution.html'>Comdevboardresolution</a></li>
+            <li class="breadcrumb-item"><a href='/history'>History</a></li>
+            
+        
+    
+        
+        
+            <li class="breadcrumb-item"><a href='/history/boardresolution.html'>Boardresolution</a></li>
             
         
     
diff --git a/content/history/index.xml b/content/history/index.xml
new file mode 100644
index 0000000..28dced7
--- /dev/null
+++ b/content/history/index.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
+  <channel>
+    <title>Histories on Apache Comdev</title>
+    <link>https://community.apache.org/history.html</link>
+    <description>Recent content in Histories on Apache Comdev</description>
+    <generator>Hugo -- gohugo.io</generator>
+    <language>en</language>
+    
+	<atom:link href="https://community.apache.org/history/index.xml" rel="self" type="application/rss+xml" />
+    
+    
+    <item>
+      <title>ComDevBoardResolution</title>
+      <link>https://community.apache.org/history/boardresolution.html</link>
+      <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
+      
+      <guid>https://community.apache.org/history/boardresolution.html</guid>
+      <description>The Apache Community Development Project was created in November 2009.
+Board Resolution Creating the Apache Community Development ProjectEstablish the Apache Community Development Project  WHEREAS, the Board of Directors deems it to be in the best interests of the Foundation and consistent with the Foundation&#39;s purpose to establish a Project Management Committee charged with coordinating community development efforts. NOW, THEREFORE, BE IT RESOLVED, that a Project Management Committee (PMC), to be known as the &amp;quot;Apache Community Development Proj [...]
+    </item>
+    
+    <item>
+      <title>Pilot Mentoring Programme with India ICFOSS</title>
+      <link>https://community.apache.org/history/mentoringprogramme-icfoss-pilot.html</link>
+      <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
+      
+      <guid>https://community.apache.org/history/mentoringprogramme-icfoss-pilot.html</guid>
+      <description>Note that this information is about a pilot program that happened back in 2013.
+ The ASF has been participating in many mentoring initiatives, and it&amp;rsquo;s now partnering in a pilot project with India ICFOSS to provide mentoring for undergraduate and graduate students that have interest in learning how to participate in open source communities at ASF.
+The mentoring programme is not here to teach you to write documentation or code.</description>
+    </item>
+    
+  </channel>
+</rss>
\ No newline at end of file
diff --git a/content/mentoringprogramme-icfoss-pilot.html b/content/history/mentoringprogramme-icfoss-pilot.html
similarity index 91%
rename from content/mentoringprogramme-icfoss-pilot.html
rename to content/history/mentoringprogramme-icfoss-pilot.html
index 74d2c00..915fb99 100644
--- a/content/mentoringprogramme-icfoss-pilot.html
+++ b/content/history/mentoringprogramme-icfoss-pilot.html
@@ -11,9 +11,9 @@
  The ASF has been participating in many mentoring initiatives, and it&rsquo;s now partnering in a pilot project with India ICFOSS to provide mentoring for undergraduate and graduate students that have interest in learning how to participate in open source communities at ASF.
 The mentoring programme is not here to teach you to write documentation or code." />
 <meta property="og:type" content="article" />
-<meta property="og:url" content="https://community.apache.org/mentoringprogramme-icfoss-pilot.html" />
+<meta property="og:url" content="https://community.apache.org/history/mentoringprogramme-icfoss-pilot.html" />
 <meta property="og:image" content="https://community.apache.org/images/aceu19_1.jpg"/>
-<meta property="article:modified_time" content="2020-09-23T03:12:58+02:00" /><meta property="og:site_name" content="Apache Community Development" />
+<meta property="article:modified_time" content="2023-03-17T12:26:02-04:00" /><meta property="og:site_name" content="Apache Community Development" />
 
 
   <title>Apache Community Development - Pilot Mentoring Programme with India ICFOSS</title>
@@ -114,21 +114,6 @@ The mentoring programme is not here to teach you to write documentation or code.
                 <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
               </div>
             </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
             <li class="nav-item dropdown">
               <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 Events
@@ -181,7 +166,13 @@ The mentoring programme is not here to teach you to write documentation or code.
     
         
         
-            <li class="breadcrumb-item"><a href='/mentoringprogramme-icfoss-pilot.html'>Mentoringprogramme icfoss pilot</a></li>
+            <li class="breadcrumb-item"><a href='/history'>History</a></li>
+            
+        
+    
+        
+        
+            <li class="breadcrumb-item"><a href='/history/mentoringprogramme-icfoss-pilot.html'>Mentoringprogramme icfoss pilot</a></li>
             
         
     
@@ -207,7 +198,6 @@ your chosen project. You cannot expect your mentor to be a &ldquo;teacher&rdquo;
 will provide enough information for you to progress within the project. You
 need to bring the confidence to take their guidance and discover the detail
 for yourself.</p>
-<p>More information on the <a href="mentoringprogramme.html">Mentoring Programme</a> page.</p>
 <p><a name="Schedule"></a></p>
 <h2 id="proposed-schedule">Proposed Schedule</h2>
 <table>
diff --git a/content/index.html b/content/index.html
index 5871367..a81f954 100644
--- a/content/index.html
+++ b/content/index.html
@@ -113,21 +113,6 @@
                 <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
               </div>
             </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
             <li class="nav-item dropdown">
               <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 Events
diff --git a/content/index.xml b/content/index.xml
index b2947fd..1b2a9ec 100644
--- a/content/index.xml
+++ b/content/index.xml
@@ -48,7 +48,8 @@ Upcoming events  List loading   This Calendar is also available as an iCal feed<
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
       <guid>https://community.apache.org/mentoring/experiences.html</guid>
-      <description>This is a place for collecting information about GSoC activities each year for historical tracking. It was started in 2012 so is missing plenty of detail in the early years. Your help filling it out would be appreciated.
+      <description>This should be in the GSoC directory
+This is a place for collecting information about GSoC activities each year for historical tracking. It was started in 2012 so is missing plenty of detail in the early years. Your help filling it out would be appreciated.
 2018 Overview  Students accepted: ? Students who passed final: 29  2017 Overview  Students accepted: ? Students who passed final: 27  2016 Overview  Students accepted: 49 Students who passed final: 35  2015 Overview  Students accepted: 56 Students who passed final: 47  2014 Overview  Students accepted: 42 Students who passed final: 35  2013 Overview  Students accepted: 51 Students who passed final: 44  2012 Overview  Students accepted: 41 Students who passed midterm: 40 26 projects mento [...]
     </item>
     
@@ -60,7 +61,7 @@ Upcoming events  List loading   This Calendar is also available as an iCal feed<
       <guid>https://community.apache.org/newbiefaq.html</guid>
       <description>These answers to frequently asked questions may help newcomers to The Apache Software Foundation (ASF) and our many Apache projects understand how we work.
 Index of Questions
- About The Apache Software Foundation  How do I find projects or technologies at the ASF? How are projects managed at the ASF? How do I learn about the way Apache Projects work? How do I ask a question about the ASF in general?</description>
+ About The Apache Software Foundation  How do I find projects or technologies at the ASF? How are projects managed at the ASF? How do I ask a question about the ASF in general? How do I get user support for an Apache project?</description>
     </item>
     
     <item>
@@ -132,10 +133,10 @@ DRAFT November 2012 Status report for the Apache Community Development Project T
     
     <item>
       <title>ComDevBoardResolution</title>
-      <link>https://community.apache.org/comdevboardresolution.html</link>
+      <link>https://community.apache.org/history/boardresolution.html</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
-      <guid>https://community.apache.org/comdevboardresolution.html</guid>
+      <guid>https://community.apache.org/history/boardresolution.html</guid>
       <description>The Apache Community Development Project was created in November 2009.
 Board Resolution Creating the Apache Community Development ProjectEstablish the Apache Community Development Project  WHEREAS, the Board of Directors deems it to be in the best interests of the Foundation and consistent with the Foundation&#39;s purpose to establish a Project Management Committee charged with coordinating community development efforts. NOW, THEREFORE, BE IT RESOLVED, that a Project Management Committee (PMC), to be known as the &amp;quot;Apache Community Development Proj [...]
     </item>
@@ -219,9 +220,9 @@ To some, the idea of having to establish consensus in a large and distributed te
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
       <guid>https://community.apache.org/committers/funding-disclaimer.html</guid>
-      <description>Some Apache committers have successfully run funding campaigns to support work on their favorite Apache projects.
-This is ok in principle, but you have to make clear that the campaign is your own thing, and avoid any confusion about the role of the ASF and how its projects work.
-This page gives a few examples of that.
+      <description>Some Apache committers have successfully run funding campaigns to support their work on their favorite Apache projects.
+This is ok in principle, but you have to make it clear that the campaign is your own thing, and avoid any confusion about the role of the ASF and how its projects work.
+This page gives a few examples of how to do that.
 If you have any question about this, feel free to ask on our dev@community.</description>
     </item>
     
@@ -309,17 +310,6 @@ Finding Speakers If you are organising an event and looking for speakers, see th
 Listing yourself as a potential speaker To list yourself as someone interested in being an Apache speaker, there are two steps.</description>
     </item>
     
-    <item>
-      <title>LocalMentors</title>
-      <link>https://community.apache.org/localmentors.html</link>
-      <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
-      <guid>https://community.apache.org/localmentors.html</guid>
-      <description>The Local Mentors project aims to allow people getting started in Apache (both within the Formal Mentoring Program , and everyone else) to meet up with existing Apache developers in their area.
-
-Why? When you&amp;rsquo;re getting involved in a new open source project, it can be a little daunting. You engage in the mailing lists with people from all around the world. You solve bugs with people in different time zones.</description>
-    </item>
-    
     <item>
       <title>May 2017 Community Newsletter</title>
       <link>https://community.apache.org/newsletter/2017-05.html</link>
@@ -342,17 +332,6 @@ The ranking process makes sure the most promising applicants get a mentor with a
 Remember, mentoring is all about the mentee and open source as a whole. It is not about the mentors or their projects.</description>
     </item>
     
-    <item>
-      <title>Mentor Programme Application</title>
-      <link>https://community.apache.org/mentorprogrammeapplication.html</link>
-      <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
-      <guid>https://community.apache.org/mentorprogrammeapplication.html</guid>
-      <description>Mentoring Programme Application Procedure Applying for the Apache Mentoring Programme is simple. This page will take you through the steps:
-
-Creating a proposal and finding a mentor  Find the project you are interested in (see our FAQ for some guidance on how to do this) Examine the projects issue tracker to find bugs that need fixing or features that need implementing that you feel you can tackle Join the projects mailing list and post an introduction mail (something like this mentor request mail will do nicely).</description>
-    </item>
-    
     <item>
       <title>Mentoring</title>
       <link>https://community.apache.org/mentoring/</link>
@@ -373,7 +352,9 @@ Here&amp;rsquo;s some concrete ways you can provide mentoring to other members o
       <description>Mentoring a new committer So I&amp;rsquo;m a committer now. What&amp;rsquo;s next? What rights do I have now that I didn&amp;rsquo;t have before? What are the social conventions around making a commit?
 These things vary from one project to another, so clearly documenting them for your particular project is critical.
 Here&amp;rsquo;s the basics that are true across (almost) all Apache projects.
-TODO</description>
+TODO
+Outline:
+ Encouraging other contributors Good commit messages Becoming a PMC member  </description>
     </item>
     
     <item>
@@ -403,28 +384,9 @@ These things vary a little from one project to another, so clearly documenting t
       
       <guid>https://community.apache.org/mentoring/firstpatch.html</guid>
       <description>Mentoring: First Patch A beginner&amp;rsquo;s first patch on a project can be an intimidating and frustrating experience. Clearly documenting the entire process from checkout to accepted patch greatly lowers the barrier for a new contributor, and makes it more likely that they&amp;rsquo;ll come back for their second patch.
-Here&amp;rsquo;s some tips on how to do that.</description>
-    </item>
-    
-    <item>
-      <title>MentoringProgramme</title>
-      <link>https://community.apache.org/mentoringprogramme.html</link>
-      <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
-      <guid>https://community.apache.org/mentoringprogramme.html</guid>
-      <description>Many projects in the ASF are able to provide mentors for newcomers. In fact, most projects are happy to assist newcomers to their projects as part of their normal operations. However, some people are looking for more structure. The Mentor Programme of the The Apache Software Foundation provides additional support and structure for people looking to make an initial contribution to an ASF project.
-The mentoring programme is not here to teach you to write documentation or code.</description>
-    </item>
-    
-    <item>
-      <title>MentorProgrammeFormalEducation</title>
-      <link>https://community.apache.org/mentorprogrammeformaleducation.html</link>
-      <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
-      <guid>https://community.apache.org/mentorprogrammeformaleducation.html</guid>
-      <description>Mentoring in Formal Education Some mentees will wish to participate in the Mentoring Programme as part of a formal education course. In these cases there will be additional requirements and process steps to ensure that the mentees can be evaluated by their tutor. This section describes these additional requirements and process.
-
-Overview Projects are defined by the students tutor in consultation with the TLP community/mentors and the student. They will need to be isolated enough from other ongoing work to ensure that success/failure to deliver is not dependent on someone else.</description>
+Here&amp;rsquo;s some tips on how to do that.
+Outline:
+ Talk to the project first  Make sure it&amp;rsquo;s wanted/welcome See if there&amp;rsquo;s already work in progress, or suggestions Find someone to be your advocate   Finding the source Writing a good commit message Following up on your pull request Learning from your struggle: Improving the documentation  </description>
     </item>
     
     <item>
@@ -450,10 +412,10 @@ Each project has a different approach to managing new committers. This page desc
     
     <item>
       <title>Pilot Mentoring Programme with India ICFOSS</title>
-      <link>https://community.apache.org/mentoringprogramme-icfoss-pilot.html</link>
+      <link>https://community.apache.org/history/mentoringprogramme-icfoss-pilot.html</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
-      <guid>https://community.apache.org/mentoringprogramme-icfoss-pilot.html</guid>
+      <guid>https://community.apache.org/history/mentoringprogramme-icfoss-pilot.html</guid>
       <description>Note that this information is about a pilot program that happened back in 2013.
  The ASF has been participating in many mentoring initiatives, and it&amp;rsquo;s now partnering in a pilot project with India ICFOSS to provide mentoring for undergraduate and graduate students that have interest in learning how to participate in open source communities at ASF.
 The mentoring programme is not here to teach you to write documentation or code.</description>
@@ -521,7 +483,7 @@ Preparing for a Vote It is important to ensure that the community has time to di
       
       <guid>https://community.apache.org/newcomers/</guid>
       <description>In this section we&amp;rsquo;ll help you take your first steps as an open source developer in one of our many Apache project communities. As an all-volunteer run organization, Apache and the many Apache projects rely on people like you stepping up to help out.
- Where do I start? - a guide to your first engagement with an Apache project How should I behave? - etiquette and codes of conduct at Apache Mentoring Programme - an introduction to our mentoring programme  Mentoring in formal education - how to engage your students in open source Local Mentors Programme - Find ASF people who live near you   Newbie FAQ - some commonly asked questions (and their answers) How many projects are at Apache?</description>
+ Where do I start? - a guide to your first engagement with an Apache project How should I behave? - etiquette and codes of conduct at Apache Newbie FAQ - some commonly asked questions (and their answers) How many projects are at Apache?</description>
     </item>
     
   </channel>
diff --git a/content/links.html b/content/links.html
index 9725503..264e9f4 100644
--- a/content/links.html
+++ b/content/links.html
@@ -114,21 +114,6 @@ Books  Producing Open Source Software - by Karl Fogel  Blog posts  Apache - the
                 <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
               </div>
             </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
             <li class="nav-item dropdown">
               <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 Events
diff --git a/content/lists.html b/content/lists.html
index 540734f..d42d12c 100644
--- a/content/lists.html
+++ b/content/lists.html
@@ -112,21 +112,6 @@
                 <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
               </div>
             </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
             <li class="nav-item dropdown">
               <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 Events
diff --git a/content/localmentors.html b/content/localmentors.html
deleted file mode 100644
index 218a6bf..0000000
--- a/content/localmentors.html
+++ /dev/null
@@ -1,330 +0,0 @@
-<!DOCTYPE html>
-
-
-<html>
-<head>
-  <meta name="description" content="Apache Community Development"/>
-  <meta name="keywords" content="apache, apache community, community development, opensource"/>
-  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
-  <meta property="og:title" content="LocalMentors" />
-<meta property="og:description" content="The Local Mentors project aims to allow people getting started in Apache (both within the Formal Mentoring Program , and everyone else) to meet up with existing Apache developers in their area.
-
-Why? When you&rsquo;re getting involved in a new open source project, it can be a little daunting. You engage in the mailing lists with people from all around the world. You solve bugs with people in different time zones." />
-<meta property="og:type" content="article" />
-<meta property="og:url" content="https://community.apache.org/localmentors.html" />
-<meta property="og:image" content="https://community.apache.org/images/aceu19_1.jpg"/>
-<meta property="article:modified_time" content="2020-07-20T20:22:04+02:00" /><meta property="og:site_name" content="Apache Community Development" />
-
-
-  <title>Apache Community Development - LocalMentors</title>
-  <link rel="shortcut icon" href="images/favicon.ico">
-
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-  <link href="/css/main.css" rel="stylesheet" media="screen">
-  <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
-  <style type="text/css">
-       
-      .gsc-search-box input.gsc-input, .gcse-search-box input.gsc-input:focus {
-          -webkit-box-shadow:none;
-          box-shadow:none;
-          -moz-box-shadow:none;
-          border-radius:0px;
-      }
-
-      .footer {
-          text-align:center;
-          color:grey;
-          font-size:80%;
-          border-top: solid #ddd 1px;
-          margin-top:1em;
-      }
-      .navbar-brand img {
-          height: 50px;
-      }
-  </style>
-</head>
-
-<body>
-  <header class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
-    <div class="container">
-      <a class="navbar-brand" href="/">
-        <img src="https://svn.apache.org/repos/asf/comdev/project-logos/originals/foundation.svg" alt="Apache Software Foundation">
-      </a>
-      <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#mainNavbar" aria-controls="mainNavbar" aria-expanded="false" aria-label="Toggle navigation">
-        <span class="navbar-toggler-icon"></span>
-      </button>
-
-      <div class="collapse navbar-collapse" id="mainNavbar">
-        <div class="container"> 
-          <ul class="navbar-nav mr-auto">
-            <li class="nav-item"><a class="nav-link" href="/">Home</a></li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="aboutDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                About
-              </a>
-              <div class="dropdown-menu" aria-labelledby="aboutDropdown">
-                <a class="dropdown-item" href="/about/">What We Do</a>
-                <a class="dropdown-item" href="/newbiefaq.html">Frequently Asked Questions</a>
-                <a class="dropdown-item" href="/projectIndependence.html">Apache Project Independence</a>
-                <a class="dropdown-item" href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a>
-                <a class="dropdown-item" href="/contactpoints.html">Contact Points Within the ASF</a>
-                <a class="dropdown-item" href="/comdevboardresolution.html">ComDev Original Board Resolution</a>
-                <a class="dropdown-item" href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a>
-                <a class="dropdown-item" href="/links.html">Links to additional material</a>
-                <a class="dropdown-item" href="https://issues.apache.org/jira/projects/COMDEV">Community Development JIRA</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">About Apache</a>
-                <a class="dropdown-item" href="https://www.apache.org/">The Apache Software Foundation</a>
-                <a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship">Sponsor Apache</a>
-                <a class="dropdown-item" href="https://www.apache.org/foundation/thanks">Thanks to our Sponsors</a>
-                <a class="dropdown-item" href="https://www.apache.org/licenses">License</a>
-                <a class="dropdown-item" href="https://www.apache.org/security">Security</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="contribDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                For Contributors
-              </a>
-              <div class="dropdown-menu" aria-labelledby="contribDropdown">
-                <a class="dropdown-item" href="/newcomers/">Newcomers</a>
-                <a class="dropdown-item" href="/gettingStarted/101.html">Getting Started</a>
-                <a class="dropdown-item" href="/contributors/">Finding Your Way Around The Apache Software Foundation</a>
-                <a class="dropdown-item" href="https://www.apache.org/dev/">Technical Developer FAQs</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Google Summer of Code</a>
-                <a class="dropdown-item" href="/gsoc.html">Google Summer Of Code Information</a>
-                <a class="dropdown-item" href="/mentee-ranking-process.html">Mentee Ranking Process</a>
-                <a class="dropdown-item" href="/mentoring/experiences.html">Past GSoC Experiences</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/use-the-comdev-issue-tracker-for-gsoc-tasks.html">Using ComDev's JIRA for GSoC Ideas</a>
-                <a class="dropdown-item" href="/gsoc-admin-tasks.html">Tasks of a GSoC Admin at the ASF</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="commitDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                For Committers/PMCs
-              </a>
-              <div class="dropdown-menu" aria-labelledby="commitDropdown">
-                <a class="dropdown-item" href="/newcommitter.html">Recruiting New Committers</a>
-                <a class="dropdown-item" href="/committers/">Useful Information for Committers</a>
-                <a class="dropdown-item" href="/committers/consensusBuilding.html">Consensus Building</a>
-                <a class="dropdown-item" href="/committers/lazyConsensus.html">Lazy Consensus</a>
-                <a class="dropdown-item" href="/committers/decisionMaking.html">Decision Making</a>
-                <a class="dropdown-item" href="/committers/voting.html">Voting</a>
-                <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Events
-              </a>
-              <div class="dropdown-menu" aria-labelledby="eventDropdown">
-                <a class="dropdown-item" href="https://apachecon.com/">ApacheCon - The official event of the ASF</a>
-                <a class="dropdown-item" href="/calendars/">Major Apache-related Events</a>
-                <a class="dropdown-item" href="https://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a>
-                <a class="dropdown-item" href="https://www.apache.org/foundation/marks/events">Apache event branding policies</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Speakers</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Sample presentations</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="conversDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Join the Conversation
-              </a>
-              <div class="dropdown-menu" aria-labelledby="conversDropdown">
-                <a class="dropdown-item" href="https://www.facebook.com/ApacheSoftwareFoundation">Facebook</a>
-                <a class="dropdown-item" href="https://twitter.com/ApacheCommunity">Twitter</a>
-                <a class="dropdown-item" href="/lists.html">Mailing List</a>
-              </div>
-            </li>
-          </ul>
-        </div>
-      </div>
-    </div>
-  </header>
-
-  <main class="cd-main" id="content" role="main">
-    <div class="container">
-      <section id="content" class="row">
-        <div class="col-md-9">
-          <h3 class="mt-3 text-muted">The Apache Software Foundation</h3>
-        </div>
-        <div class="col-md-3 pull-right">
-          <div class="gcse-search"></div>
-        </div>
-        <div class="col-md-12"><h4 class="text-muted">Community &gt; Code</h4></div>
-      </section>
-      
-
-<nav aria-label="breadcrumb">
-  <ol class="breadcrumb">
-    <li class="breadcrumb-item"><a href="/">Home</a></li>
-    
-        
-        
-    
-        
-        
-            <li class="breadcrumb-item"><a href='/localmentors.html'>Localmentors</a></li>
-            
-        
-    
-  </ol>
-</nav>
-
-
-      <hr>
-      
-	<p>The Local Mentors project aims to allow people getting started in Apache
-(both within the <a href="mentoringprogramme.html">Formal Mentoring Program</a>
-, and everyone else) to meet up with existing Apache developers in their
-area.</p>
-<p><a name="LocalMentors-Why?"></a></p>
-<h1 id="why">Why?</h1>
-<p>When you&rsquo;re getting involved in a new open source project, it can be a little daunting. You engage in the mailing lists with people from all around the world. You solve bugs with people in different time zones. You develop patches with people from different languages and cultures. Perhaps you have a mentor (<a href="mentoringprogramme.html">Formal</a>
-or informal) from your project, but the chances area, they&rsquo;re a thousand
-miles away.</p>
-<p>This global reach is some of where open source derives its power from.
-However, for many people approaching it for the first time, it can present
-an odd challenge.</p>
-<p>No matter which project you&rsquo;re involved in, there may well be some things
-that you&rsquo;re finding a little different or difficult that are specific to
-where you are. Perhaps you&rsquo;d like some tips on making the best use of the
-time zone difference between yourself and a couple of the main developers
-on the project? Perhaps English isn&rsquo;t your first language, and you&rsquo;d like
-to double check some points of technical language that are leading to
-confusion? Perhaps you&rsquo;d like to chat over some of the cultural differences
-that you&rsquo;ve spotted? Or maybe you&rsquo;ve just spent a lot of time communicating
-about open source electronically, and you&rsquo;d really like to see a real face
-for once!</p>
-<p>That&rsquo;s where the local mentor project steps in. Find an existing Apache
-committer near you, head to a cafe or pub, grab a coffee or a beer, and
-have a chat. They probably won&rsquo;t know your project, but they&rsquo;ll hopefully
-know the rest!</p>
-<p><a name="LocalMentors-Ifyou'relookingforalocalmentor"></a></p>
-<h1 id="if-youre-looking-for-a-local-mentor">If you&rsquo;re looking for a local mentor</h1>
-<p>First up, make sure a local mentor&rsquo;s the right thing for you. The Local
-Mentoring project has different aims to the <a href="mentoringprogramme.html">Formal Mentoring Program</a>
-. If you&rsquo;re after someone who knows your project, or someone who&rsquo;s
-available over a prolonged period of time, then the
-<a href="mentoringprogramme.html">Formal Mentoring Program</a> is a better fit.</p>
-<p>However, if you&rsquo;d like to meet up with someone to put a friendly face on
-the ASF, and discuss open source and Apache from where you are, hopefully
-in your own language, then this might be the right thing for you.</p>
-<p>To find a local mentor, please visit <a href="https://community.zones.apache.org/">https://community.zones.apache.org/</a></p>
-<p>Using <a href="https://community.zones.apache.org/">https://community.zones.apache.org/</a>
-, you simply need to enter your location, and search for Apache committers
-willing to act as local mentors near you. Drop them an email to introduce
-yourself. However, please remember that they will be giving up their time
-to meet and help you, so you&rsquo;ll almost certainly need to work to their
-location and availability!</p>
-<p>While Apache has committers in almost all corners of the world, not all of
-them are currently part of the local mentoring program. As such, you might
-discover that you can&rsquo;t find anyone near you. In that case, either look for
-people near where you might visit in the future, or failing that, see if
-any other open source foundations or local groups have anything near you.</p>
-<p><a name="LocalMentors-HowexistingApacheCommitterscangetinvolved"></a></p>
-<h1 id="how-existing-apache-committers-can-get-involved">How existing Apache Committers can get involved</h1>
-<p>If you think you could spare the odd hour everyone once in a while, to sit
-down over a beer or a coffee and chat about Open Source and the Apache Way,
-then we&rsquo;d love you to get involved! You&rsquo;re not signing up to a long-term
-mentoring relationship (see the <a href="mentoringprogramme.html">Formal Mentoring Program</a>
-if you&rsquo;re interested in that though) Just every so often, helping out
-someone who lives near you.</p>
-<p>Firstly, you&rsquo;ll need a FOAF entry on people.apache.org. Take a look at <a href="https://people.apache.org/foaf/">https://people.apache.org/foaf/</a>
-for instructions on setting this up if you haven&rsquo;t already done so. Next,
-ensure that you have listed your location - we need that to be able to let
-people search for you.</p>
-<p>Now, if you haven&rsquo;t already done so, checkout the committers directory from
-svn:</p>
-<pre><code>svn co https://svn.apache.org/repos/private/committers/
-</code></pre>
-<p>Edit <em>local-outreach/CommunityDevelopment.rdf</em> and add yourself in as a
-helper. If your FOAF file is in svn and showing up on people.apache.org,
-add in:</p>
-<pre><code> &lt;helper&gt;
-   &lt;foaf:Person rdf:resource=&quot;urn:org:apache:[your username].rdf&quot; /&gt;
- &lt;/helper&gt;
-</code></pre>
-<p>If you have your FOAF file externally hosted, then the <strong>rdf:resource</strong>
-should point to the URL of the file.</p>
-<p>For an apache committer with username &ldquo;foo&rdquo;, your entry would be one of:</p>
-<pre><code> &lt;helper&gt;
-   &lt;foaf:Person rdf:resource=&quot;urn:org:apache:foo.rdf&quot; /&gt;
- &lt;/helper&gt;
- &lt;helper&gt;
-   &lt;foaf:Person rdf:resource=&quot;https://www.example.com/foaf/foo.rdf&quot; /&gt;
- &lt;/helper&gt;
-</code></pre>
-<p>Within 24 hours of committing your addition to
-<em>local-outreach/CommunityDevelopment.rdf</em>, you should appear in the web
-application! Head over to <a href="https://community.zones.apache.org/">https://community.zones.apache.org/</a>
-a day later a check you&rsquo;re listed properly</p>
-
-
-    </div>
-  </main>
-
-  <footer class="page-footer bg-secondary mt-4 pt-3">
-    <div class="container text-center text-md-left mb-3">
-      <div class="row">
-        <div class="col-md-6 mt-md-0 mt-3">
-          <h5 class="text-uppercase">Trademarks</h5>
-          <p>
-            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>
-
-        <hr class="clearfix w-100 d-md-none pb-3">
-
-        <div class="col-md-6 mb-md-0 mb-3">
-          <h5 class="text-uppercase">Website sources</h5>
-
-          <p>
-            This website is generated from the <a href="https://github.com/apache/comdev-site">comdev-site repository</a>.<br>
-            Patches are welcome!
-          </p>
-        </div>
-      </div>
-    </div>
-
-    <div class="footer-copyright text-center py-3">
-      <em>Copyright &copy; 2023, <a href="https://www.apache.org/">the Apache Software Foundation</a>. Licensed under the
-      <a rel="license" href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a></em>
-    </div>
-  </footer>
-
-  <script src="/js/jquery-1.9.1.min.js"></script>
-  <script src="/js/bootstrap.min.js"></script>
-  <script>
-    (function() {
-      var cx = '012254517474945470291:vhsfv7eokdc';
-      var gcse = document.createElement('script');
-      gcse.type = 'text/javascript';
-      gcse.async = true;
-      gcse.src = (document.location.protocol == 'https:' ? 'https:' : 'http:') +
-          '//www.google.com/cse/cse.js?cx=' + cx;
-      var s = document.getElementsByTagName('script')[0];
-      s.parentNode.insertBefore(gcse, s);
-    })();
-  </script>
-</body>
-</html>
diff --git a/content/mentee-ranking-process.html b/content/mentee-ranking-process.html
index 9b25ef5..7ddb759 100644
--- a/content/mentee-ranking-process.html
+++ b/content/mentee-ranking-process.html
@@ -114,21 +114,6 @@ Remember, mentoring is all about the mentee and open source as a whole. It is no
                 <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
               </div>
             </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
             <li class="nav-item dropdown">
               <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 Events
diff --git a/content/mentor-request-mail.html b/content/mentor-request-mail.html
index 47a0cdd..d8ebbbb 100644
--- a/content/mentor-request-mail.html
+++ b/content/mentor-request-mail.html
@@ -113,21 +113,6 @@ Here&rsquo;s an example of what your first email might look like:" />
                 <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
               </div>
             </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
             <li class="nav-item dropdown">
               <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 Events
diff --git a/content/mentoring.html b/content/mentoring.html
index 422c64c..656241f 100644
--- a/content/mentoring.html
+++ b/content/mentoring.html
@@ -112,21 +112,6 @@
                 <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
               </div>
             </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
             <li class="nav-item dropdown">
               <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 Events
diff --git a/content/mentoring/committer.html b/content/mentoring/committer.html
index 9aec0f1..e6310d6 100644
--- a/content/mentoring/committer.html
+++ b/content/mentoring/committer.html
@@ -10,11 +10,13 @@
 <meta property="og:description" content="Mentoring a new committer So I&rsquo;m a committer now. What&rsquo;s next? What rights do I have now that I didn&rsquo;t have before? What are the social conventions around making a commit?
 These things vary from one project to another, so clearly documenting them for your particular project is critical.
 Here&rsquo;s the basics that are true across (almost) all Apache projects.
-TODO" />
+TODO
+Outline:
+ Encouraging other contributors Good commit messages Becoming a PMC member  " />
 <meta property="og:type" content="article" />
 <meta property="og:url" content="https://community.apache.org/mentoring/committer.html" />
 <meta property="og:image" content="https://community.apache.org/images/aceu19_1.jpg"/>
-<meta property="article:modified_time" content="2020-03-24T15:03:46+01:00" /><meta property="og:site_name" content="Apache Community Development" />
+<meta property="article:modified_time" content="2023-03-17T12:26:02-04:00" /><meta property="og:site_name" content="Apache Community Development" />
 
 
   <title>Apache Community Development - Mentoring a new committer</title>
@@ -115,21 +117,6 @@ TODO" />
                 <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
               </div>
             </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
             <li class="nav-item dropdown">
               <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 Events
@@ -206,6 +193,12 @@ commit?</p>
 them for your particular project is critical.</p>
 <p>Here&rsquo;s the basics that are true across (almost) all Apache projects.</p>
 <p>TODO</p>
+<p>Outline:</p>
+<ul>
+<li>Encouraging other contributors</li>
+<li>Good commit messages</li>
+<li>Becoming a PMC member</li>
+</ul>
 
 
     </div>
diff --git a/content/mentoring/experiences.html b/content/mentoring/experiences.html
index c09b0a3..eaebb2c 100644
--- a/content/mentoring/experiences.html
+++ b/content/mentoring/experiences.html
@@ -7,12 +7,13 @@
   <meta name="keywords" content="apache, apache community, community development, opensource"/>
   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
   <meta property="og:title" content="Apache in GSoC" />
-<meta property="og:description" content="This is a place for collecting information about GSoC activities each year for historical tracking. It was started in 2012 so is missing plenty of detail in the early years. Your help filling it out would be appreciated.
+<meta property="og:description" content="This should be in the GSoC directory
+This is a place for collecting information about GSoC activities each year for historical tracking. It was started in 2012 so is missing plenty of detail in the early years. Your help filling it out would be appreciated.
 2018 Overview  Students accepted: ? Students who passed final: 29  2017 Overview  Students accepted: ? Students who passed final: 27  2016 Overview  Students accepted: 49 Students who passed final: 35  2015 Overview  Students accepted: 56 Students who passed final: 47  2014 Overview  Students accepted: 42 Students who passed final: 35  2013 Overview  Students accepted: 51 Students who passed final: 44  2012 Overview  Students accepted: 41 Students who passed midterm: 40 26 projects mento [...]
 <meta property="og:type" content="article" />
 <meta property="og:url" content="https://community.apache.org/mentoring/experiences.html" />
 <meta property="og:image" content="https://community.apache.org/images/aceu19_1.jpg"/>
-<meta property="article:modified_time" content="2020-12-07T09:47:52-04:00" /><meta property="og:site_name" content="Apache Community Development" />
+<meta property="article:modified_time" content="2023-03-17T12:26:02-04:00" /><meta property="og:site_name" content="Apache Community Development" />
 
 
   <title>Apache Community Development - Apache in GSoC</title>
@@ -113,21 +114,6 @@
                 <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
               </div>
             </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
             <li class="nav-item dropdown">
               <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 Events
@@ -196,7 +182,8 @@
 
       <hr>
       
-	<p>This is a place for
+	<p><em>This should be in the GSoC directory</em></p>
+<p>This is a place for
 collecting information about GSoC activities each year for historical tracking. It
 was started in 2012 so is missing plenty of detail in the early years. Your help
 filling it out would be appreciated.</p>
diff --git a/content/mentoring/firstpatch.html b/content/mentoring/firstpatch.html
index dcd0edc..dc7f3a2 100644
--- a/content/mentoring/firstpatch.html
+++ b/content/mentoring/firstpatch.html
@@ -8,11 +8,13 @@
   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
   <meta property="og:title" content="Mentoring: First Patch" />
 <meta property="og:description" content="Mentoring: First Patch A beginner&rsquo;s first patch on a project can be an intimidating and frustrating experience. Clearly documenting the entire process from checkout to accepted patch greatly lowers the barrier for a new contributor, and makes it more likely that they&rsquo;ll come back for their second patch.
-Here&rsquo;s some tips on how to do that." />
+Here&rsquo;s some tips on how to do that.
+Outline:
+ Talk to the project first  Make sure it&rsquo;s wanted/welcome See if there&rsquo;s already work in progress, or suggestions Find someone to be your advocate   Finding the source Writing a good commit message Following up on your pull request Learning from your struggle: Improving the documentation  " />
 <meta property="og:type" content="article" />
 <meta property="og:url" content="https://community.apache.org/mentoring/firstpatch.html" />
 <meta property="og:image" content="https://community.apache.org/images/aceu19_1.jpg"/>
-<meta property="article:modified_time" content="2020-03-24T15:03:46+01:00" /><meta property="og:site_name" content="Apache Community Development" />
+<meta property="article:modified_time" content="2023-03-17T12:26:02-04:00" /><meta property="og:site_name" content="Apache Community Development" />
 
 
   <title>Apache Community Development - Mentoring: First Patch</title>
@@ -113,21 +115,6 @@ Here&rsquo;s some tips on how to do that." />
                 <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
               </div>
             </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
             <li class="nav-item dropdown">
               <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 Events
@@ -203,6 +190,20 @@ checkout to accepted patch greatly lowers the barrier for a new
 contributor, and makes it more likely that they&rsquo;ll come back for their
 second patch.</p>
 <p>Here&rsquo;s some tips on how to do that.</p>
+<p>Outline:</p>
+<ul>
+<li>Talk to the project first
+<ul>
+<li>Make sure it&rsquo;s wanted/welcome</li>
+<li>See if there&rsquo;s already work in progress, or suggestions</li>
+<li>Find someone to be your advocate</li>
+</ul>
+</li>
+<li>Finding the source</li>
+<li>Writing a good commit message</li>
+<li>Following up on your pull request</li>
+<li>Learning from your struggle: Improving the documentation</li>
+</ul>
 
 
     </div>
diff --git a/content/mentoring/index.html b/content/mentoring/index.html
index 9887d7b..256cab5 100644
--- a/content/mentoring/index.html
+++ b/content/mentoring/index.html
@@ -13,7 +13,7 @@ Here&rsquo;s some concrete ways you can provide mentoring to other members of yo
 <meta property="og:type" content="article" />
 <meta property="og:url" content="https://community.apache.org/mentoring/" />
 <meta property="og:image" content="https://community.apache.org/images/aceu19_1.jpg"/>
-<meta property="article:modified_time" content="2020-07-20T20:22:04+02:00" /><meta property="og:site_name" content="Apache Community Development" />
+<meta property="article:modified_time" content="2023-03-17T12:26:02-04:00" /><meta property="og:site_name" content="Apache Community Development" />
 
 
   <title>Apache Community Development - Mentoring</title>
@@ -114,21 +114,6 @@ Here&rsquo;s some concrete ways you can provide mentoring to other members of yo
                 <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
               </div>
             </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
             <li class="nav-item dropdown">
               <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 Events
diff --git a/content/mentoring/index.xml b/content/mentoring/index.xml
index 062e060..b802b04 100644
--- a/content/mentoring/index.xml
+++ b/content/mentoring/index.xml
@@ -16,7 +16,8 @@
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
       <guid>https://community.apache.org/mentoring/experiences.html</guid>
-      <description>This is a place for collecting information about GSoC activities each year for historical tracking. It was started in 2012 so is missing plenty of detail in the early years. Your help filling it out would be appreciated.
+      <description>This should be in the GSoC directory
+This is a place for collecting information about GSoC activities each year for historical tracking. It was started in 2012 so is missing plenty of detail in the early years. Your help filling it out would be appreciated.
 2018 Overview  Students accepted: ? Students who passed final: 29  2017 Overview  Students accepted: ? Students who passed final: 27  2016 Overview  Students accepted: 49 Students who passed final: 35  2015 Overview  Students accepted: 56 Students who passed final: 47  2014 Overview  Students accepted: 42 Students who passed final: 35  2013 Overview  Students accepted: 51 Students who passed final: 44  2012 Overview  Students accepted: 41 Students who passed midterm: 40 26 projects mento [...]
     </item>
     
@@ -40,7 +41,9 @@ Here&amp;rsquo;s some concrete ways you can provide mentoring to other members o
       <description>Mentoring a new committer So I&amp;rsquo;m a committer now. What&amp;rsquo;s next? What rights do I have now that I didn&amp;rsquo;t have before? What are the social conventions around making a commit?
 These things vary from one project to another, so clearly documenting them for your particular project is critical.
 Here&amp;rsquo;s the basics that are true across (almost) all Apache projects.
-TODO</description>
+TODO
+Outline:
+ Encouraging other contributors Good commit messages Becoming a PMC member  </description>
     </item>
     
     <item>
@@ -70,7 +73,9 @@ These things vary a little from one project to another, so clearly documenting t
       
       <guid>https://community.apache.org/mentoring/firstpatch.html</guid>
       <description>Mentoring: First Patch A beginner&amp;rsquo;s first patch on a project can be an intimidating and frustrating experience. Clearly documenting the entire process from checkout to accepted patch greatly lowers the barrier for a new contributor, and makes it more likely that they&amp;rsquo;ll come back for their second patch.
-Here&amp;rsquo;s some tips on how to do that.</description>
+Here&amp;rsquo;s some tips on how to do that.
+Outline:
+ Talk to the project first  Make sure it&amp;rsquo;s wanted/welcome See if there&amp;rsquo;s already work in progress, or suggestions Find someone to be your advocate   Finding the source Writing a good commit message Following up on your pull request Learning from your struggle: Improving the documentation  </description>
     </item>
     
   </channel>
diff --git a/content/mentoring/mentor.html b/content/mentoring/mentor.html
index 6cd7441..e2d8618 100644
--- a/content/mentoring/mentor.html
+++ b/content/mentoring/mentor.html
@@ -113,21 +113,6 @@
                 <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
               </div>
             </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
             <li class="nav-item dropdown">
               <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 Events
diff --git a/content/mentoring/pmc.html b/content/mentoring/pmc.html
index 79f833a..3c86d15 100644
--- a/content/mentoring/pmc.html
+++ b/content/mentoring/pmc.html
@@ -12,7 +12,7 @@ These things vary a little from one project to another, so clearly documenting t
 <meta property="og:type" content="article" />
 <meta property="og:url" content="https://community.apache.org/mentoring/pmc.html" />
 <meta property="og:image" content="https://community.apache.org/images/aceu19_1.jpg"/>
-<meta property="article:modified_time" content="2020-03-24T15:03:46+01:00" /><meta property="og:site_name" content="Apache Community Development" />
+<meta property="article:modified_time" content="2023-03-17T12:26:02-04:00" /><meta property="og:site_name" content="Apache Community Development" />
 
 
   <title>Apache Community Development - Mentoring a new PMC member</title>
@@ -113,21 +113,6 @@ These things vary a little from one project to another, so clearly documenting t
                 <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
               </div>
             </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
             <li class="nav-item dropdown">
               <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 Events
@@ -207,6 +192,14 @@ that new member get up to speed, and prevent problems in the future.</p>
 <p>Here&rsquo;s the basic things that a new PMC member needs to know, and how you
 can help them in their new job.</p>
 <p>TODO</p>
+<p>Outline:</p>
+<ul>
+<li>The PMC chair is not the project lead</li>
+<li>Any PMC member can nominate committers, PMC members</li>
+<li>Reporting</li>
+<li>Responding to the Board</li>
+<li>A word about vendor neutrality</li>
+</ul>
 
 
     </div>
diff --git a/content/mentoringprogramme.html b/content/mentoringprogramme.html
deleted file mode 100644
index ff34dcf..0000000
--- a/content/mentoringprogramme.html
+++ /dev/null
@@ -1,448 +0,0 @@
-<!DOCTYPE html>
-
-
-<html>
-<head>
-  <meta name="description" content="Apache Community Development"/>
-  <meta name="keywords" content="apache, apache community, community development, opensource"/>
-  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
-  <meta property="og:title" content="MentoringProgramme" />
-<meta property="og:description" content="Many projects in the ASF are able to provide mentors for newcomers. In fact, most projects are happy to assist newcomers to their projects as part of their normal operations. However, some people are looking for more structure. The Mentor Programme of the The Apache Software Foundation provides additional support and structure for people looking to make an initial contribution to an ASF project.
-The mentoring programme is not here to teach you to write documentation or code." />
-<meta property="og:type" content="article" />
-<meta property="og:url" content="https://community.apache.org/mentoringprogramme.html" />
-<meta property="og:image" content="https://community.apache.org/images/aceu19_1.jpg"/>
-<meta property="article:modified_time" content="2020-09-23T00:32:47+02:00" /><meta property="og:site_name" content="Apache Community Development" />
-
-
-  <title>Apache Community Development - MentoringProgramme</title>
-  <link rel="shortcut icon" href="images/favicon.ico">
-
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-  <link href="/css/main.css" rel="stylesheet" media="screen">
-  <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
-  <style type="text/css">
-       
-      .gsc-search-box input.gsc-input, .gcse-search-box input.gsc-input:focus {
-          -webkit-box-shadow:none;
-          box-shadow:none;
-          -moz-box-shadow:none;
-          border-radius:0px;
-      }
-
-      .footer {
-          text-align:center;
-          color:grey;
-          font-size:80%;
-          border-top: solid #ddd 1px;
-          margin-top:1em;
-      }
-      .navbar-brand img {
-          height: 50px;
-      }
-  </style>
-</head>
-
-<body>
-  <header class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
-    <div class="container">
-      <a class="navbar-brand" href="/">
-        <img src="https://svn.apache.org/repos/asf/comdev/project-logos/originals/foundation.svg" alt="Apache Software Foundation">
-      </a>
-      <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#mainNavbar" aria-controls="mainNavbar" aria-expanded="false" aria-label="Toggle navigation">
-        <span class="navbar-toggler-icon"></span>
-      </button>
-
-      <div class="collapse navbar-collapse" id="mainNavbar">
-        <div class="container"> 
-          <ul class="navbar-nav mr-auto">
-            <li class="nav-item"><a class="nav-link" href="/">Home</a></li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="aboutDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                About
-              </a>
-              <div class="dropdown-menu" aria-labelledby="aboutDropdown">
-                <a class="dropdown-item" href="/about/">What We Do</a>
-                <a class="dropdown-item" href="/newbiefaq.html">Frequently Asked Questions</a>
-                <a class="dropdown-item" href="/projectIndependence.html">Apache Project Independence</a>
-                <a class="dropdown-item" href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a>
-                <a class="dropdown-item" href="/contactpoints.html">Contact Points Within the ASF</a>
-                <a class="dropdown-item" href="/comdevboardresolution.html">ComDev Original Board Resolution</a>
-                <a class="dropdown-item" href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a>
-                <a class="dropdown-item" href="/links.html">Links to additional material</a>
-                <a class="dropdown-item" href="https://issues.apache.org/jira/projects/COMDEV">Community Development JIRA</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">About Apache</a>
-                <a class="dropdown-item" href="https://www.apache.org/">The Apache Software Foundation</a>
-                <a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship">Sponsor Apache</a>
-                <a class="dropdown-item" href="https://www.apache.org/foundation/thanks">Thanks to our Sponsors</a>
-                <a class="dropdown-item" href="https://www.apache.org/licenses">License</a>
-                <a class="dropdown-item" href="https://www.apache.org/security">Security</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="contribDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                For Contributors
-              </a>
-              <div class="dropdown-menu" aria-labelledby="contribDropdown">
-                <a class="dropdown-item" href="/newcomers/">Newcomers</a>
-                <a class="dropdown-item" href="/gettingStarted/101.html">Getting Started</a>
-                <a class="dropdown-item" href="/contributors/">Finding Your Way Around The Apache Software Foundation</a>
-                <a class="dropdown-item" href="https://www.apache.org/dev/">Technical Developer FAQs</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Google Summer of Code</a>
-                <a class="dropdown-item" href="/gsoc.html">Google Summer Of Code Information</a>
-                <a class="dropdown-item" href="/mentee-ranking-process.html">Mentee Ranking Process</a>
-                <a class="dropdown-item" href="/mentoring/experiences.html">Past GSoC Experiences</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/use-the-comdev-issue-tracker-for-gsoc-tasks.html">Using ComDev's JIRA for GSoC Ideas</a>
-                <a class="dropdown-item" href="/gsoc-admin-tasks.html">Tasks of a GSoC Admin at the ASF</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="commitDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                For Committers/PMCs
-              </a>
-              <div class="dropdown-menu" aria-labelledby="commitDropdown">
-                <a class="dropdown-item" href="/newcommitter.html">Recruiting New Committers</a>
-                <a class="dropdown-item" href="/committers/">Useful Information for Committers</a>
-                <a class="dropdown-item" href="/committers/consensusBuilding.html">Consensus Building</a>
-                <a class="dropdown-item" href="/committers/lazyConsensus.html">Lazy Consensus</a>
-                <a class="dropdown-item" href="/committers/decisionMaking.html">Decision Making</a>
-                <a class="dropdown-item" href="/committers/voting.html">Voting</a>
-                <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Events
-              </a>
-              <div class="dropdown-menu" aria-labelledby="eventDropdown">
-                <a class="dropdown-item" href="https://apachecon.com/">ApacheCon - The official event of the ASF</a>
-                <a class="dropdown-item" href="/calendars/">Major Apache-related Events</a>
-                <a class="dropdown-item" href="https://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a>
-                <a class="dropdown-item" href="https://www.apache.org/foundation/marks/events">Apache event branding policies</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Speakers</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Sample presentations</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="conversDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Join the Conversation
-              </a>
-              <div class="dropdown-menu" aria-labelledby="conversDropdown">
-                <a class="dropdown-item" href="https://www.facebook.com/ApacheSoftwareFoundation">Facebook</a>
-                <a class="dropdown-item" href="https://twitter.com/ApacheCommunity">Twitter</a>
-                <a class="dropdown-item" href="/lists.html">Mailing List</a>
-              </div>
-            </li>
-          </ul>
-        </div>
-      </div>
-    </div>
-  </header>
-
-  <main class="cd-main" id="content" role="main">
-    <div class="container">
-      <section id="content" class="row">
-        <div class="col-md-9">
-          <h3 class="mt-3 text-muted">The Apache Software Foundation</h3>
-        </div>
-        <div class="col-md-3 pull-right">
-          <div class="gcse-search"></div>
-        </div>
-        <div class="col-md-12"><h4 class="text-muted">Community &gt; Code</h4></div>
-      </section>
-      
-
-<nav aria-label="breadcrumb">
-  <ol class="breadcrumb">
-    <li class="breadcrumb-item"><a href="/">Home</a></li>
-    
-        
-        
-    
-        
-        
-            <li class="breadcrumb-item"><a href='/mentoringprogramme.html'>Mentoringprogramme</a></li>
-            
-        
-    
-  </ol>
-</nav>
-
-
-      <hr>
-      
-	<p>Many projects in the ASF are able to provide mentors for newcomers. In
-fact, most projects are happy to assist newcomers to their projects as part
-of their normal operations. However, some people are looking for more
-structure. The Mentor Programme of the The Apache Software Foundation
-provides additional support and structure for people looking to make an
-initial contribution to an ASF project.</p>
-<p>The mentoring programme is not here to teach you to write documentation or
-code. It is here to help you understand how to make a valuable contribution
-to an Apache project. You can expect to be guided through our contribution
-processes. You can also expect to get technical support with respect to
-your chosen project. You cannot expect your mentor to be a &ldquo;teacher&rdquo;, they
-will provide enough information for you to progress within the project. You
-need to bring the confidence to take their guidance and discover the detail
-for yourself.</p>
-<p>This page is a description of the Mentoring Programme. The program is open
-for business, but, like many other things at the Foundation, it under
-constant improvement and revision. Therefore, the description below is
-marked &lsquo;draft.&rsquo;</p>
-<p><a name="MentoringProgramme-QuickDefinitions"></a></p>
-<h1 id="quick-definitions">Quick Definitions</h1>
-<p>The ASF believes that the best way for people (and, indeed, entire
-projects) to join the community is with the help of committed members of
-the community. A community member who makes a commitment to help a new
-contributor get started is a <em>mentor</em>. The new person, on the other hand,
-is a <em>mentee</em>. Believe it or not, that is the word in the dictionary for
-this role.</p>
-<p>The Foundation is organized into a series of Top Level Projects, or TLPs.
-The document uses &lsquo;TLP&rsquo; when it is referring to an ASF project. It uses the
-word &lsquo;project&rsquo; to refer to a the work a mentee does under the Mentoring
-Programme.</p>
-<p><a name="MentoringProgramme-Whocanbeamentee?"></a></p>
-<h1 id="who-can-be-a-mentee">Who can be a mentee?</h1>
-<p>The Mentor Programme is intended to assist people in becoming contributors
-to ASF projects. Thus, anyone interested in contributing effort to an ASF
-project is a potential mentee. You need to be a self starter, your mentor
-will not take responsibility for &ldquo;managing&rdquo; your work here. Everyone who
-contributes to an Apache project does so on a voluntary basis, there are no
-managers here - only helpful peers.</p>
-<p>Mentoring is a significant volunteer effort, over and above what the mentor
-is already doing for the project. Therefore, the programme asks mentees to
-make a material commitment of time to the process. There are no legally
-binding commitments involved, but a mentee must, as described below, submit
-a plan for a significant effort and show ongoing progress.</p>
-<p>It is important to reiterate that all work on ASF projects is on a
-volunteer basis. The Foundation does not pay anyone to mentor or
-contribute.</p>
-<p><a name="MentoringProgramme-ApplyingfortheMentorProgramme"></a></p>
-<h2 id="applying-for-the-mentor-programme">Applying for the Mentor Programme</h2>
-<p>There are two simple steps to apply:</p>
-<ol>
-<li>Review the content below to learn about the details of the requirements.</li>
-<li><a href="mentorprogrammeapplication.html">Fill out the application form</a></li>
-</ol>
-<p>If you are a student and wish to apply to the mentoring programme as part
-of your formal education there are some <a href="mentorprogrammeformaleducation.html">additional requirements</a>
-that you must fulfill, along with your tutor.</p>
-<p><a name="MentoringProgramme-Draft:TheASFMentoringProgramme"></a></p>
-<h1 id="draft-the-asf-mentoring-programme">Draft: The ASF Mentoring Programme</h1>
-<p>The Mentoring Programme is structured around mentee projects. Each mentee
-project is a coherent task contributing to one of the ASF&rsquo;s ongoing TLPs.</p>
-<p>The Mentoring Programme does not work on a fixed calendar. Project start as
-mentees and mentors are matched. Typically a project will last around three
-months, but mentors and mentees are free to negotiate longer or shorter
-periods of work.</p>
-<p>The work of a mentee project can be code or documentation, so long as it
-contributes to an existing Foundation project. Individual research or
-prototyping projects are not acceptable &ndash; working with an ASF project
-community is an essential part of the process.</p>
-<p><a name="MentoringProgramme-SettingupaMentoringProject"></a></p>
-<h2 id="setting-up-a-mentoring-project">Setting up a Mentoring Project</h2>
-<p>The first step is for a potential mentee to make contact with the Mentoring
-Programme. Several of the following steps call for interactions with
-potential mentors and target projects, and the Mentoring Programme mailing
-list is the appropriate forum.</p>
-<p>Next, a potential mentee should identify a Foundation TLP that he or she
-would like to contribute to, and seek out a suitable project. The mentee
-can propose an idea for a project, or ask the community for suggestions, or
-ask the mentors for suggestions.</p>
-<p>Given a target project and a rough idea for a task, the proposed mentee
-must create a written proposal for the task, send it to the project&rsquo;s
-development list for review, to ask for a sponsoring mentor. The sponsoring
-mentor will be a member of the TLP.</p>
-<p>This will lead to some negotiations with the project and a potential
-mentor. If these negotiations succeed, the mentor and mentee agree to a
-schedule and time commitment.</p>
-<p>The plan must include a mid-project checkpoint as described below.</p>
-<p>The mentor submits the agreed plan to the Programme, gets an acknowledgment
-from the Apache Mentoring Programme admin,
-and adds the project to the Mentoring Wiki as an &ldquo;In Progress&rdquo; Project.</p>
-<p>The mentee sets up a wiki page for the project on the development Wiki,
-linked from the Mentoring page.</p>
-<p>The mentee joins the development community of the TLP and sets to work.</p>
-<p><a name="MentoringProgramme-WorkingontheProject"></a></p>
-<h2 id="working-on-the-project">Working on the Project</h2>
-<p>During the course of the project, the mentee is a member of the TLP
-community. This has implications for both the mentee and the
-TLP.</p>
-<p>All Apache Software Foundation TLPs share some basic rules and conventions
-for their operations. Each TLP has its own specific
-conventions. The details of the ASF&rsquo;s conventions are beyond the scope of
-this document, but a few principles bear repeating:</p>
-<ul>
-<li>Polite, respectful discourse.</li>
-<li>Open, transparent, discussions and decision-making.</li>
-<li>Open Source!</li>
-</ul>
-<p>During the course of the work, the mentor is responsible for helping the
-mentee navigate the process. If the mentee has questions, the
-mentor answers or helps extract an answer from the community. If the mentee
-has any problem in working with the community, the
-mentor is available via email for private consultation. On the other hand,
-The mentor is not intended to replace mentee background work.
-Mentees must still read code, read email archive, and do any other work
-needed.</p>
-<p>Mentees have one additional responsibility over and above the usual work of
-a contributor to a TLP: to give back to the Mentor Programme.
-Mentees must document their work and experiences on the Mentor Programme
-wiki, to help the programme improve the process.</p>
-<p>In particular, mentees should document their code changes for possible
-review. This can come in the form of subversion revision numbers or JIRAs.
-For projects that are set up with FishEye, the Mentor Programme may set up
-a JIRA project, and open a JIRA for each mentee. The
-mentee can then ask committers to include their JIRA in commit comments and
-thus set up automatic tracking.</p>
-<p><a name="MentoringProgramme-TheMid-ProjectReview"></a></p>
-<h2 id="the-mid-project-review">The Mid-Project Review</h2>
-<p>The Mentoring Programme reviews all projects at the half-way point. The
-input to the programme review is a pair of reports: one  from the mentor
-and from the mentee. These are public documents.</p>
-<p>The mentor&rsquo;s report must summarize progress and make a recommendation for
-the
-disposition of the project: continue to completion, or stop. The report
-must also describe any changes to the project&rsquo;s scope.</p>
-<p><a name="MentoringProgramme-ScopeandScheduleChanges"></a></p>
-<h2 id="scope-and-schedule-changes">Scope and Schedule Changes</h2>
-<p>Inevitably, ugly facts will conflict with plans and intentions. Mentors and
-mentees can agree to change the scope of a project and document the change
-on the wiki and, as appropriate, on reports. The programme does not
-encourage scope changes as a solution if the mentee is
-unwilling to put in the time and effort to carry out the project. In such a
-case, it is preferable to terminate the project. However,
-nothing is completely black and white.</p>
-<p>Similarly, the programme prefers that projects end on their original
-schedule, rather than drag out indefinitely.
-If a mentee has made good progress on a substantial project over several
-months, all while participating in the TLP community,
-it is very likely that they are ready to continue without the help of a
-mentor. Their Mentor Programme project can end in good
-order even though coding continues.</p>
-<p><a name="MentoringProgramme-FinishuptheProject"></a></p>
-<h2 id="finish-up-the-project">Finish up the Project</h2>
-<p>Every project ends, either when the work is done. or when the agree time
-period is over. At the end, the mentee updates the Wiki page with a final
-summary of their work.</p>
-<p>The mentor submits a final progress report and determination of whether the
-project should be marked complete or incomplete.
-The admin acks the review and moves the project to completed or incomplete
-as appropriate on the Mentoring Wiki.</p>
-<p>Relevant certification is issued to both the mentor and mentee by the admin
-team.</p>
-<p><a name="MentoringProgramme-RolesandExpectations"></a></p>
-<h2 id="roles-and-expectations">Roles and Expectations</h2>
-<p><a name="MentoringProgramme-Mentee"></a></p>
-<h3 id="mentee">Mentee</h3>
-<ul>
-<li>The mentee is any individual interested in getting involved in open
-source.</li>
-<li>The mentee is expected to dedicate a pre-agreed amount of time each week
-to the project. Failure to
-commit the agreed time is likely to result in failure on the programme,</li>
-<li>The mentee is expected to complete the project as described in the
-proposal or make necessary scope adjustments with their mentor.</li>
-<li>The mentee is expected to maintain a Wiki page recording their progress,
-which upon completion will present a final summary of their work with links
-to code changes.</li>
-<li>The mentee is responsible for submitting progress reports at the half way
-and completion points of the programme.</li>
-</ul>
-<p><a name="MentoringProgramme-Mentor"></a></p>
-<h3 id="mentor">Mentor</h3>
-<ul>
-<li>The mentor must be a committer on the project accepting the mentees
-contributions.</li>
-<li>The mentor is expected to dedicate at least 1/4 of the mentee time per
-week to support.</li>
-<li>The mentor is expected to process supplied patches within reasonable
-timeframes.</li>
-<li>The mentor is expected to ensure appropriate assistance is available from
-the project community.</li>
-<li>The mentor is responsible for submitting progress reports at the half way
-and completion points of the programme.</li>
-</ul>
-<p><a name="MentoringProgramme-Admin"></a></p>
-<h3 id="admin">Admin</h3>
-<ul>
-<li>The Apache Mentoring Program admin(s) will liaise with ASF projects to
-maintain a JIRA list of projects that are available and in progress.</li>
-<li>The admin(s) will assist with matching mentees with mentors</li>
-<li>The admin(s) will approve proposals and progress reports, but generally
-won&rsquo;t do an in depth technical review but will rely on the mentor&rsquo;s
-assessment.</li>
-<li>The admin(s) will mediate any dispute between mentee and mentor regarding
-assessments/etc if the project community is unable to reach a resolution</li>
-</ul>
-
-
-    </div>
-  </main>
-
-  <footer class="page-footer bg-secondary mt-4 pt-3">
-    <div class="container text-center text-md-left mb-3">
-      <div class="row">
-        <div class="col-md-6 mt-md-0 mt-3">
-          <h5 class="text-uppercase">Trademarks</h5>
-          <p>
-            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>
-
-        <hr class="clearfix w-100 d-md-none pb-3">
-
-        <div class="col-md-6 mb-md-0 mb-3">
-          <h5 class="text-uppercase">Website sources</h5>
-
-          <p>
-            This website is generated from the <a href="https://github.com/apache/comdev-site">comdev-site repository</a>.<br>
-            Patches are welcome!
-          </p>
-        </div>
-      </div>
-    </div>
-
-    <div class="footer-copyright text-center py-3">
-      <em>Copyright &copy; 2023, <a href="https://www.apache.org/">the Apache Software Foundation</a>. Licensed under the
-      <a rel="license" href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a></em>
-    </div>
-  </footer>
-
-  <script src="/js/jquery-1.9.1.min.js"></script>
-  <script src="/js/bootstrap.min.js"></script>
-  <script>
-    (function() {
-      var cx = '012254517474945470291:vhsfv7eokdc';
-      var gcse = document.createElement('script');
-      gcse.type = 'text/javascript';
-      gcse.async = true;
-      gcse.src = (document.location.protocol == 'https:' ? 'https:' : 'http:') +
-          '//www.google.com/cse/cse.js?cx=' + cx;
-      var s = document.getElementsByTagName('script')[0];
-      s.parentNode.insertBefore(gcse, s);
-    })();
-  </script>
-</body>
-</html>
diff --git a/content/mentorprogrammeapplication.html b/content/mentorprogrammeapplication.html
deleted file mode 100644
index e42fe21..0000000
--- a/content/mentorprogrammeapplication.html
+++ /dev/null
@@ -1,323 +0,0 @@
-<!DOCTYPE html>
-
-
-<html>
-<head>
-  <meta name="description" content="Apache Community Development"/>
-  <meta name="keywords" content="apache, apache community, community development, opensource"/>
-  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
-  <meta property="og:title" content="Mentor Programme Application" />
-<meta property="og:description" content="Mentoring Programme Application Procedure Applying for the Apache Mentoring Programme is simple. This page will take you through the steps:
-
-Creating a proposal and finding a mentor  Find the project you are interested in (see our FAQ for some guidance on how to do this) Examine the projects issue tracker to find bugs that need fixing or features that need implementing that you feel you can tackle Join the projects mailing list and post an introduction mail (something like this mentor request mail will do nicely)." />
-<meta property="og:type" content="article" />
-<meta property="og:url" content="https://community.apache.org/mentorprogrammeapplication.html" />
-<meta property="og:image" content="https://community.apache.org/images/aceu19_1.jpg"/>
-<meta property="article:modified_time" content="2021-02-14T15:36:48+04:00" /><meta property="og:site_name" content="Apache Community Development" />
-
-
-  <title>Apache Community Development - Mentor Programme Application</title>
-  <link rel="shortcut icon" href="images/favicon.ico">
-
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-  <link href="/css/main.css" rel="stylesheet" media="screen">
-  <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
-  <style type="text/css">
-       
-      .gsc-search-box input.gsc-input, .gcse-search-box input.gsc-input:focus {
-          -webkit-box-shadow:none;
-          box-shadow:none;
-          -moz-box-shadow:none;
-          border-radius:0px;
-      }
-
-      .footer {
-          text-align:center;
-          color:grey;
-          font-size:80%;
-          border-top: solid #ddd 1px;
-          margin-top:1em;
-      }
-      .navbar-brand img {
-          height: 50px;
-      }
-  </style>
-</head>
-
-<body>
-  <header class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
-    <div class="container">
-      <a class="navbar-brand" href="/">
-        <img src="https://svn.apache.org/repos/asf/comdev/project-logos/originals/foundation.svg" alt="Apache Software Foundation">
-      </a>
-      <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#mainNavbar" aria-controls="mainNavbar" aria-expanded="false" aria-label="Toggle navigation">
-        <span class="navbar-toggler-icon"></span>
-      </button>
-
-      <div class="collapse navbar-collapse" id="mainNavbar">
-        <div class="container"> 
-          <ul class="navbar-nav mr-auto">
-            <li class="nav-item"><a class="nav-link" href="/">Home</a></li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="aboutDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                About
-              </a>
-              <div class="dropdown-menu" aria-labelledby="aboutDropdown">
-                <a class="dropdown-item" href="/about/">What We Do</a>
-                <a class="dropdown-item" href="/newbiefaq.html">Frequently Asked Questions</a>
-                <a class="dropdown-item" href="/projectIndependence.html">Apache Project Independence</a>
-                <a class="dropdown-item" href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a>
-                <a class="dropdown-item" href="/contactpoints.html">Contact Points Within the ASF</a>
-                <a class="dropdown-item" href="/comdevboardresolution.html">ComDev Original Board Resolution</a>
-                <a class="dropdown-item" href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a>
-                <a class="dropdown-item" href="/links.html">Links to additional material</a>
-                <a class="dropdown-item" href="https://issues.apache.org/jira/projects/COMDEV">Community Development JIRA</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">About Apache</a>
-                <a class="dropdown-item" href="https://www.apache.org/">The Apache Software Foundation</a>
-                <a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship">Sponsor Apache</a>
-                <a class="dropdown-item" href="https://www.apache.org/foundation/thanks">Thanks to our Sponsors</a>
-                <a class="dropdown-item" href="https://www.apache.org/licenses">License</a>
-                <a class="dropdown-item" href="https://www.apache.org/security">Security</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="contribDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                For Contributors
-              </a>
-              <div class="dropdown-menu" aria-labelledby="contribDropdown">
-                <a class="dropdown-item" href="/newcomers/">Newcomers</a>
-                <a class="dropdown-item" href="/gettingStarted/101.html">Getting Started</a>
-                <a class="dropdown-item" href="/contributors/">Finding Your Way Around The Apache Software Foundation</a>
-                <a class="dropdown-item" href="https://www.apache.org/dev/">Technical Developer FAQs</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Google Summer of Code</a>
-                <a class="dropdown-item" href="/gsoc.html">Google Summer Of Code Information</a>
-                <a class="dropdown-item" href="/mentee-ranking-process.html">Mentee Ranking Process</a>
-                <a class="dropdown-item" href="/mentoring/experiences.html">Past GSoC Experiences</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/use-the-comdev-issue-tracker-for-gsoc-tasks.html">Using ComDev's JIRA for GSoC Ideas</a>
-                <a class="dropdown-item" href="/gsoc-admin-tasks.html">Tasks of a GSoC Admin at the ASF</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="commitDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                For Committers/PMCs
-              </a>
-              <div class="dropdown-menu" aria-labelledby="commitDropdown">
-                <a class="dropdown-item" href="/newcommitter.html">Recruiting New Committers</a>
-                <a class="dropdown-item" href="/committers/">Useful Information for Committers</a>
-                <a class="dropdown-item" href="/committers/consensusBuilding.html">Consensus Building</a>
-                <a class="dropdown-item" href="/committers/lazyConsensus.html">Lazy Consensus</a>
-                <a class="dropdown-item" href="/committers/decisionMaking.html">Decision Making</a>
-                <a class="dropdown-item" href="/committers/voting.html">Voting</a>
-                <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Events
-              </a>
-              <div class="dropdown-menu" aria-labelledby="eventDropdown">
-                <a class="dropdown-item" href="https://apachecon.com/">ApacheCon - The official event of the ASF</a>
-                <a class="dropdown-item" href="/calendars/">Major Apache-related Events</a>
-                <a class="dropdown-item" href="https://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a>
-                <a class="dropdown-item" href="https://www.apache.org/foundation/marks/events">Apache event branding policies</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Speakers</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Sample presentations</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="conversDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Join the Conversation
-              </a>
-              <div class="dropdown-menu" aria-labelledby="conversDropdown">
-                <a class="dropdown-item" href="https://www.facebook.com/ApacheSoftwareFoundation">Facebook</a>
-                <a class="dropdown-item" href="https://twitter.com/ApacheCommunity">Twitter</a>
-                <a class="dropdown-item" href="/lists.html">Mailing List</a>
-              </div>
-            </li>
-          </ul>
-        </div>
-      </div>
-    </div>
-  </header>
-
-  <main class="cd-main" id="content" role="main">
-    <div class="container">
-      <section id="content" class="row">
-        <div class="col-md-9">
-          <h3 class="mt-3 text-muted">The Apache Software Foundation</h3>
-        </div>
-        <div class="col-md-3 pull-right">
-          <div class="gcse-search"></div>
-        </div>
-        <div class="col-md-12"><h4 class="text-muted">Community &gt; Code</h4></div>
-      </section>
-      
-
-<nav aria-label="breadcrumb">
-  <ol class="breadcrumb">
-    <li class="breadcrumb-item"><a href="/">Home</a></li>
-    
-        
-        
-    
-        
-        
-            <li class="breadcrumb-item"><a href='/mentorprogrammeapplication.html'>Mentorprogrammeapplication</a></li>
-            
-        
-    
-  </ol>
-</nav>
-
-
-      <hr>
-      
-	<p><a name="MentorProgrammeApplication-MentoringProgrammeApplicationProcedure"></a></p>
-<h1 id="mentoring-programme-application-procedure">Mentoring Programme Application Procedure</h1>
-<p>Applying for the Apache Mentoring Programme is simple. This page will take
-you through the steps:</p>
-<p><a name="MentorProgrammeApplication-Creatingaproposalandfindingamentor"></a></p>
-<h2 id="creating-a-proposal-and-finding-a-mentor">Creating a proposal and finding a mentor</h2>
-<ol>
-<li>Find the project you are interested in (see our <a href="newbiefaq.html">FAQ</a>
-for some guidance on how to do this)</li>
-<li>Examine the projects issue tracker to find bugs that need fixing or
-features that need implementing that you feel you can tackle</li>
-<li>Join the projects mailing list and post an introduction mail (something
-like this <a href="mentor-request-mail.html">mentor request mail</a>
-will do nicely).</li>
-<li>Liaise with the project mailing list to refine your proposal</li>
-<li>Write up your project proposal (see next section) and submit it to the
-project mailing list asking for someone to be your mentor.</li>
-</ol>
-<p><a name="MentorProgrammeApplication-Projectproposal"></a></p>
-<h3 id="project-proposal">Project proposal</h3>
-<p>Your project proposal should include:</p>
-<ul>
-<li>Your full name</li>
-<li>Apache Project of interest</li>
-<li>Name of mentor</li>
-<li>Planned  start date</li>
-<li>Expected mid-term evaluation date</li>
-<li>End date</li>
-<li>Expected deliverables</li>
-<li>Expected benefits to the Apache Community as a result of your work</li>
-<li>Detailed description and high level design for your proposed solution</li>
-<li>Approximate number of hours you intend to work on the project each week
-and the number of weeks you expect it to take</li>
-<li>A description of why you want to undertake this project and what you
-hope to gain from it and the mentor programme</li>
-<li>A brief CV of your skills</li>
-</ul>
-<p>Note, we do not expect people to come to our mentor programme with a full
-armoury of skills, however mentors are not there to teach you, but only to guide
-you. You must be willing and able to put in the effort to learn any new
-skills needed. This programme is designed to help people engage with Apache
-projects. However, we do expect people to have sufficient technical skills
-to understand the guidance that the mentor and project community will
-provide. We are not here to teach basic programming skills, rather we are
-here to teach the application of those skills to an Apache Project.</p>
-<p><a name="MentorProgrammeApplication-Applyingtothementoringprogramme"></a></p>
-<h2 id="applying-to-the-mentoring-programme">Applying to the mentoring programme</h2>
-<p>At this point you will probably want to apply to the Community Development
-mentoring programme, however, you are not required to do so. If you so
-desire you can just get on with your work within the project community,
-after all, you already generated enough interest in your work to have the
-community offer to mentor you.</p>
-<p>The advantage of joining the mentoring programme formally is that you have
-access to a growing community of people who have recently done exactly what
-you are doing. That is you are trying to figure out how to efficiently
-participate in a community developed software project.</p>
-<p>Whilst the project the project community are there to help you with project
-specific issues you may face they are sometimes less willing to help guide
-you through the processes and tools available to you within the broader
-Apache community. That&rsquo;s where the Community Development project comes in.
-We are here to help with issues that are not project specific.</p>
-<p>To make us aware of your work in the ASF we request that you formally
-become a part of the mentoring programme. To do so all you need to do is:</p>
-<ol>
-<li>Join the Community development mailing list at <a href="mailto:dev@community.apache.org">dev@community.apache.org</a>
-mailing list by sending a mail to <a href="mailto:dev-subscribe@community.apache.org">mailto:dev-subscribe@community.apache.org</a>
-(this is where we coordinate all mentoring efforts)</li>
-<li>Submit your project proposal (see above) to the community development <a href="https://issues.apache.org/jira/browse/COMDEV">issue tracker</a></li>
-<li>Have your mentor &ldquo;sign off&rdquo; the proposal (i.e. indicate in a comment
-that they are willing to mentor the proposal)</li>
-<li>That&rsquo;s it, you are ready to go. Start work under the guidance of your
-mentor.</li>
-</ol>
-<p>If you have any problems during the application process or during the
-mentoring programme simply ask for advice on the project mailing list
-first, if that doesn&rsquo;t solve your problem then ask on the
-<a href="mailto:dev@community.apache.org">dev@community.apache.org</a> list (note project specific issues should be kept
-to the project list).</p>
-
-
-    </div>
-  </main>
-
-  <footer class="page-footer bg-secondary mt-4 pt-3">
-    <div class="container text-center text-md-left mb-3">
-      <div class="row">
-        <div class="col-md-6 mt-md-0 mt-3">
-          <h5 class="text-uppercase">Trademarks</h5>
-          <p>
-            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>
-
-        <hr class="clearfix w-100 d-md-none pb-3">
-
-        <div class="col-md-6 mb-md-0 mb-3">
-          <h5 class="text-uppercase">Website sources</h5>
-
-          <p>
-            This website is generated from the <a href="https://github.com/apache/comdev-site">comdev-site repository</a>.<br>
-            Patches are welcome!
-          </p>
-        </div>
-      </div>
-    </div>
-
-    <div class="footer-copyright text-center py-3">
-      <em>Copyright &copy; 2023, <a href="https://www.apache.org/">the Apache Software Foundation</a>. Licensed under the
-      <a rel="license" href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a></em>
-    </div>
-  </footer>
-
-  <script src="/js/jquery-1.9.1.min.js"></script>
-  <script src="/js/bootstrap.min.js"></script>
-  <script>
-    (function() {
-      var cx = '012254517474945470291:vhsfv7eokdc';
-      var gcse = document.createElement('script');
-      gcse.type = 'text/javascript';
-      gcse.async = true;
-      gcse.src = (document.location.protocol == 'https:' ? 'https:' : 'http:') +
-          '//www.google.com/cse/cse.js?cx=' + cx;
-      var s = document.getElementsByTagName('script')[0];
-      s.parentNode.insertBefore(gcse, s);
-    })();
-  </script>
-</body>
-</html>
diff --git a/content/mentorprogrammeformaleducation.html b/content/mentorprogrammeformaleducation.html
deleted file mode 100644
index 476e3b3..0000000
--- a/content/mentorprogrammeformaleducation.html
+++ /dev/null
@@ -1,294 +0,0 @@
-<!DOCTYPE html>
-
-
-<html>
-<head>
-  <meta name="description" content="Apache Community Development"/>
-  <meta name="keywords" content="apache, apache community, community development, opensource"/>
-  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
-  <meta property="og:title" content="MentorProgrammeFormalEducation" />
-<meta property="og:description" content="Mentoring in Formal Education Some mentees will wish to participate in the Mentoring Programme as part of a formal education course. In these cases there will be additional requirements and process steps to ensure that the mentees can be evaluated by their tutor. This section describes these additional requirements and process.
-
-Overview Projects are defined by the students tutor in consultation with the TLP community/mentors and the student. They will need to be isolated enough from other ongoing work to ensure that success/failure to deliver is not dependent on someone else." />
-<meta property="og:type" content="article" />
-<meta property="og:url" content="https://community.apache.org/mentorprogrammeformaleducation.html" />
-<meta property="og:image" content="https://community.apache.org/images/aceu19_1.jpg"/>
-<meta property="article:modified_time" content="2020-12-11T09:53:54-04:00" /><meta property="og:site_name" content="Apache Community Development" />
-
-
-  <title>Apache Community Development - MentorProgrammeFormalEducation</title>
-  <link rel="shortcut icon" href="images/favicon.ico">
-
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-  <link href="/css/main.css" rel="stylesheet" media="screen">
-  <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
-  <style type="text/css">
-       
-      .gsc-search-box input.gsc-input, .gcse-search-box input.gsc-input:focus {
-          -webkit-box-shadow:none;
-          box-shadow:none;
-          -moz-box-shadow:none;
-          border-radius:0px;
-      }
-
-      .footer {
-          text-align:center;
-          color:grey;
-          font-size:80%;
-          border-top: solid #ddd 1px;
-          margin-top:1em;
-      }
-      .navbar-brand img {
-          height: 50px;
-      }
-  </style>
-</head>
-
-<body>
-  <header class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
-    <div class="container">
-      <a class="navbar-brand" href="/">
-        <img src="https://svn.apache.org/repos/asf/comdev/project-logos/originals/foundation.svg" alt="Apache Software Foundation">
-      </a>
-      <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#mainNavbar" aria-controls="mainNavbar" aria-expanded="false" aria-label="Toggle navigation">
-        <span class="navbar-toggler-icon"></span>
-      </button>
-
-      <div class="collapse navbar-collapse" id="mainNavbar">
-        <div class="container"> 
-          <ul class="navbar-nav mr-auto">
-            <li class="nav-item"><a class="nav-link" href="/">Home</a></li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="aboutDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                About
-              </a>
-              <div class="dropdown-menu" aria-labelledby="aboutDropdown">
-                <a class="dropdown-item" href="/about/">What We Do</a>
-                <a class="dropdown-item" href="/newbiefaq.html">Frequently Asked Questions</a>
-                <a class="dropdown-item" href="/projectIndependence.html">Apache Project Independence</a>
-                <a class="dropdown-item" href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a>
-                <a class="dropdown-item" href="/contactpoints.html">Contact Points Within the ASF</a>
-                <a class="dropdown-item" href="/comdevboardresolution.html">ComDev Original Board Resolution</a>
-                <a class="dropdown-item" href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a>
-                <a class="dropdown-item" href="/links.html">Links to additional material</a>
-                <a class="dropdown-item" href="https://issues.apache.org/jira/projects/COMDEV">Community Development JIRA</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">About Apache</a>
-                <a class="dropdown-item" href="https://www.apache.org/">The Apache Software Foundation</a>
-                <a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship">Sponsor Apache</a>
-                <a class="dropdown-item" href="https://www.apache.org/foundation/thanks">Thanks to our Sponsors</a>
-                <a class="dropdown-item" href="https://www.apache.org/licenses">License</a>
-                <a class="dropdown-item" href="https://www.apache.org/security">Security</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="contribDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                For Contributors
-              </a>
-              <div class="dropdown-menu" aria-labelledby="contribDropdown">
-                <a class="dropdown-item" href="/newcomers/">Newcomers</a>
-                <a class="dropdown-item" href="/gettingStarted/101.html">Getting Started</a>
-                <a class="dropdown-item" href="/contributors/">Finding Your Way Around The Apache Software Foundation</a>
-                <a class="dropdown-item" href="https://www.apache.org/dev/">Technical Developer FAQs</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Google Summer of Code</a>
-                <a class="dropdown-item" href="/gsoc.html">Google Summer Of Code Information</a>
-                <a class="dropdown-item" href="/mentee-ranking-process.html">Mentee Ranking Process</a>
-                <a class="dropdown-item" href="/mentoring/experiences.html">Past GSoC Experiences</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/use-the-comdev-issue-tracker-for-gsoc-tasks.html">Using ComDev's JIRA for GSoC Ideas</a>
-                <a class="dropdown-item" href="/gsoc-admin-tasks.html">Tasks of a GSoC Admin at the ASF</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="commitDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                For Committers/PMCs
-              </a>
-              <div class="dropdown-menu" aria-labelledby="commitDropdown">
-                <a class="dropdown-item" href="/newcommitter.html">Recruiting New Committers</a>
-                <a class="dropdown-item" href="/committers/">Useful Information for Committers</a>
-                <a class="dropdown-item" href="/committers/consensusBuilding.html">Consensus Building</a>
-                <a class="dropdown-item" href="/committers/lazyConsensus.html">Lazy Consensus</a>
-                <a class="dropdown-item" href="/committers/decisionMaking.html">Decision Making</a>
-                <a class="dropdown-item" href="/committers/voting.html">Voting</a>
-                <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Events
-              </a>
-              <div class="dropdown-menu" aria-labelledby="eventDropdown">
-                <a class="dropdown-item" href="https://apachecon.com/">ApacheCon - The official event of the ASF</a>
-                <a class="dropdown-item" href="/calendars/">Major Apache-related Events</a>
-                <a class="dropdown-item" href="https://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a>
-                <a class="dropdown-item" href="https://www.apache.org/foundation/marks/events">Apache event branding policies</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Speakers</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Sample presentations</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="conversDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Join the Conversation
-              </a>
-              <div class="dropdown-menu" aria-labelledby="conversDropdown">
-                <a class="dropdown-item" href="https://www.facebook.com/ApacheSoftwareFoundation">Facebook</a>
-                <a class="dropdown-item" href="https://twitter.com/ApacheCommunity">Twitter</a>
-                <a class="dropdown-item" href="/lists.html">Mailing List</a>
-              </div>
-            </li>
-          </ul>
-        </div>
-      </div>
-    </div>
-  </header>
-
-  <main class="cd-main" id="content" role="main">
-    <div class="container">
-      <section id="content" class="row">
-        <div class="col-md-9">
-          <h3 class="mt-3 text-muted">The Apache Software Foundation</h3>
-        </div>
-        <div class="col-md-3 pull-right">
-          <div class="gcse-search"></div>
-        </div>
-        <div class="col-md-12"><h4 class="text-muted">Community &gt; Code</h4></div>
-      </section>
-      
-
-<nav aria-label="breadcrumb">
-  <ol class="breadcrumb">
-    <li class="breadcrumb-item"><a href="/">Home</a></li>
-    
-        
-        
-    
-        
-        
-            <li class="breadcrumb-item"><a href='/mentorprogrammeformaleducation.html'>Mentorprogrammeformaleducation</a></li>
-            
-        
-    
-  </ol>
-</nav>
-
-
-      <hr>
-      
-	<p><a name="MentorProgrammeFormalEducation-MentoringinFormalEducation"></a></p>
-<h1 id="mentoring-in-formal-education">Mentoring in Formal Education</h1>
-<p>Some mentees will wish to participate in the <a href="mentoringprogramme.html">Mentoring Programme</a> as part of a formal education course. In these cases there will be
-additional requirements and process steps to ensure that the mentees can be
-evaluated by their tutor. This section describes these additional
-requirements and process.</p>
-<p><a name="MentorProgrammeFormalEducation-Overview"></a></p>
-<h2 id="overview">Overview</h2>
-<p>Projects are defined by the students tutor in consultation with the TLP
-community/mentors and the student. They will need to be isolated enough
-from other ongoing work to ensure that success/failure to deliver is not
-dependent on someone else. They will also need to be of sufficient
-complexity/simplicity to be a final year project.</p>
-<p>Tutors are responsible for the day-to-day management of the student. If the
-student does not participate in the project it is not a concern of the
-mentor. The mentor must be available for the tutor should a problem arise
-and must be willing to mentor the tutor with respect to how they encourage
-the students to participate.</p>
-<p><a name="MentorProgrammeFormalEducation-RolesandExpectations"></a></p>
-<h2 id="roles-and-expectations">Roles and Expectations</h2>
-<p>In addition to the notes found in the <a href="mentoringprogramme.html">Mentoring Programme</a> documentation, consider the following:</p>
-<p><a name="MentorProgrammeFormalEducation-Tutors"></a></p>
-<h3 id="tutors">Tutors</h3>
-<ul>
-<li>Ensure the mentee is participating in the program.</li>
-<li>Grade the student within their formal education structure (the mentor
-feedback should assist here).</li>
-<li>Take full responsibility for the learner&rsquo;s motivation and progress
-<ul>
-<li>Mentors guide, but are not responsible for motivating, the student.</li>
-</ul>
-</li>
-</ul>
-<p><a name="MentorProgrammeFormalEducation-Mentees"></a></p>
-<h3 id="mentees">Mentees</h3>
-<ul>
-<li>Mentees are typically students in their final year (exceptional students at an earlier point in their program
-may be considered).</li>
-<li>Mentees participate as part of a practical project which forms a formal
-part of their examined work.</li>
-</ul>
-<p><a name="MentorProgrammeFormalEducation-Admins"></a></p>
-<h3 id="admins">Admins</h3>
-<ul>
-<li>Provide assistance interpreting reports to allow tutors to grade student
-participation.</li>
-<li>Provide mediation between student, mentor and tutor in the event of a
-dispute.</li>
-</ul>
-
-
-    </div>
-  </main>
-
-  <footer class="page-footer bg-secondary mt-4 pt-3">
-    <div class="container text-center text-md-left mb-3">
-      <div class="row">
-        <div class="col-md-6 mt-md-0 mt-3">
-          <h5 class="text-uppercase">Trademarks</h5>
-          <p>
-            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>
-
-        <hr class="clearfix w-100 d-md-none pb-3">
-
-        <div class="col-md-6 mb-md-0 mb-3">
-          <h5 class="text-uppercase">Website sources</h5>
-
-          <p>
-            This website is generated from the <a href="https://github.com/apache/comdev-site">comdev-site repository</a>.<br>
-            Patches are welcome!
-          </p>
-        </div>
-      </div>
-    </div>
-
-    <div class="footer-copyright text-center py-3">
-      <em>Copyright &copy; 2023, <a href="https://www.apache.org/">the Apache Software Foundation</a>. Licensed under the
-      <a rel="license" href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a></em>
-    </div>
-  </footer>
-
-  <script src="/js/jquery-1.9.1.min.js"></script>
-  <script src="/js/bootstrap.min.js"></script>
-  <script>
-    (function() {
-      var cx = '012254517474945470291:vhsfv7eokdc';
-      var gcse = document.createElement('script');
-      gcse.type = 'text/javascript';
-      gcse.async = true;
-      gcse.src = (document.location.protocol == 'https:' ? 'https:' : 'http:') +
-          '//www.google.com/cse/cse.js?cx=' + cx;
-      var s = document.getElementsByTagName('script')[0];
-      s.parentNode.insertBefore(gcse, s);
-    })();
-  </script>
-</body>
-</html>
diff --git a/content/newbiefaq.html b/content/newbiefaq.html
index 8753506..9f509ab 100644
--- a/content/newbiefaq.html
+++ b/content/newbiefaq.html
@@ -9,11 +9,11 @@
   <meta property="og:title" content="Apache Newcomer FAQs" />
 <meta property="og:description" content="These answers to frequently asked questions may help newcomers to The Apache Software Foundation (ASF) and our many Apache projects understand how we work.
 Index of Questions
- About The Apache Software Foundation  How do I find projects or technologies at the ASF? How are projects managed at the ASF? How do I learn about the way Apache Projects work? How do I ask a question about the ASF in general?" />
+ About The Apache Software Foundation  How do I find projects or technologies at the ASF? How are projects managed at the ASF? How do I ask a question about the ASF in general? How do I get user support for an Apache project?" />
 <meta property="og:type" content="article" />
 <meta property="og:url" content="https://community.apache.org/newbiefaq.html" />
 <meta property="og:image" content="https://community.apache.org/images/aceu19_1.jpg"/>
-<meta property="article:modified_time" content="2023-03-17T09:35:59-04:00" /><meta property="og:site_name" content="Apache Community Development" />
+<meta property="article:modified_time" content="2023-03-17T12:26:02-04:00" /><meta property="og:site_name" content="Apache Community Development" />
 
 
   <title>Apache Community Development - Apache Newcomer FAQs</title>
@@ -114,21 +114,6 @@ Index of Questions
                 <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
               </div>
             </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
             <li class="nav-item dropdown">
               <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 Events
@@ -199,7 +184,6 @@ The Apache Software Foundation (ASF) and our many Apache projects understand how
 <ul>
 <li><a href="#NewbieFAQ-WhatprojectscanIfindinTheApacheSoftwareFoundation?">How do I find projects or technologies at the ASF?</a></li>
 <li><a href="#NewbieFAQ-HowareprojectsmanagedinTheApacheSoftwareFoundation">How are projects managed at the ASF?</a></li>
-<li><a href="#NewbieFAQ-HowdoIlearnaboutthewayApacheProjectsWork?">How do I learn about the way Apache Projects work?</a></li>
 <li><a href="#NewbieFAQ-HowdoIaskaquestionabouttheASFingeneral?">How do I ask a question about the ASF in general?</a></li>
 <li><a href="#NewbieFAQ-HowdoIgetusersupportforanASFproject?">How do I get user support for an Apache project?</a></li>
 </ul>
@@ -211,12 +195,6 @@ The Apache Software Foundation (ASF) and our many Apache projects understand how
 <li><a href="#NewbieFAQ-IsthereaCodeofConductforApacheprojects?">Is there a Code of Conduct for Apache projects?</a></li>
 </ul>
 </li>
-<li><a href="#NewbieFAQ-AbouttheApacheMentoringProgramme">About the Apache Mentoring Programme</a>
-<ul>
-<li><a href="#NewbieFAQ-WhatistheApacheMentoringProgramme">What is the Apache Mentoring Programme?</a></li>
-<li><a href="#NewbieFAQ-HowdoIApplytotheMentorProgramme?">How do I apply to the Mentor Programme?</a></li>
-</ul>
-</li>
 <li><a href="#websitecms">How do I suggest or make changes to this website?</a></li>
 <li><a href="#comdevweb">What other useful websites about Apache are there?</a></li>
 <li><a href="#comdevbug">How do I report a bug for Comdev websites or tools?</a></li>
@@ -260,12 +238,6 @@ project.</p>
 constructively within them!</p>
 <p>To learn more about &ldquo;The Apache Way&rdquo; in general, see the <a href="https://apache.org/foundation/how-it-works.html">How it Works</a>
 pages. We also have <a href="https://www.apache.org/foundation/governance/">detailed overviews of how the ASF and projects are governed</a>.</p>
-<p><a name="NewbieFAQ-HowdoIlearnaboutthewayApacheProjectsWork?"></a></p>
-<h2 id="how-do-i-learn-about-the-way-apache-projects-work">How do I learn about the way Apache projects work?</h2>
-<p>Consider applying to the <a href="mentoringprogramme.html">Apache Mentor Programme</a>. We will help you find a mentor within the project of your choice. They
-will take you through a semi-formal mentoring programme that will ensure
-you quickly find your feet. There is no cost other than a promise to commit
-some of your time to the goals you set with your mentor.</p>
 <p><a name="NewbieFAQ-HowdoIaskaquestionabouttheASFingeneral?"></a></p>
 <h2 id="generalquestion">How do I ask a question about the ASF in general?</h2>
 <p>The Community Development Project is here for this very purpose. Check out
@@ -351,25 +323,6 @@ projects. This section includes such gems as:</p>
 <li>If it didn&rsquo;t happen on a mailing list, it didn&rsquo;t happen.</li>
 <li>Don&rsquo;t feed the trolls.</li>
 </ul>
-<p><a name="NewbieFAQ-AbouttheApacheMentoringProgramme"></a></p>
-<h2 id="about-the-apache-mentoring-programme">About the Apache Mentoring Programme</h2>
-<p><a name="NewbieFAQ-WhatistheApacheMentoringProgramme"></a></p>
-<h3 id="what-is-the-apache-mentoring-programme">What is the Apache Mentoring Programme?</h3>
-<p>Many projects are happy to assist newcomers learn about how to contribute
-to their specific project. However, some people are looking for more help,
-or are looking for help working across Apache projects. The ASF Mentor Programme provides additional support and structure for people looking to make an
-initial contribution to an ASF project.</p>
-<p>For more information see our <a href="mentoringprogramme.html">mentoring page</a>.</p>
-<p><a name="NewbieFAQ-HowdoIApplytotheMentorProgramme?"></a></p>
-<h3 id="how-do-i-apply-to-the-mentoring-programme">How do I apply to the Mentoring Programme?</h3>
-<p>Take a look at our <a href="mentoringprogramme.html">mentoring page</a>. If you are
-planning on working on an Apache project as part of your formal education, you
-should also read <a href="mentorprogrammeformaleducation.html">mentoring in formal education</a>.</p>
-<p>From the <a href="mentoringprogramme.html">mentoring page</a> you will see that you
-need to complete an <a href="mentorprogrammeapplication.html">application</a>. This
-gives us enough background information to enable us to approach your
-chosen project community and for you to work with prospective mentors in
-defining your mentored activity.</p>
 <h1 id="websitecms">How do I suggest changes to this website?</h1>
 <p>The content for the <code>community.apache.org</code> website is written in Markdown
 and published automatically using a <a href="https://builds.apache.org/job/comdev-site/">Jenkins job</a>.
diff --git a/content/newcomers.html b/content/newcomers.html
index 9a10cf9..c12f4a3 100644
--- a/content/newcomers.html
+++ b/content/newcomers.html
@@ -112,21 +112,6 @@
                 <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
               </div>
             </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
             <li class="nav-item dropdown">
               <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 Events
diff --git a/content/newcomers/index.html b/content/newcomers/index.html
index 16fada4..44f6516 100644
--- a/content/newcomers/index.html
+++ b/content/newcomers/index.html
@@ -8,11 +8,11 @@
   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
   <meta property="og:title" content="Welcome, Apache newcomers!" />
 <meta property="og:description" content="In this section we&rsquo;ll help you take your first steps as an open source developer in one of our many Apache project communities. As an all-volunteer run organization, Apache and the many Apache projects rely on people like you stepping up to help out.
- Where do I start? - a guide to your first engagement with an Apache project How should I behave? - etiquette and codes of conduct at Apache Mentoring Programme - an introduction to our mentoring programme  Mentoring in formal education - how to engage your students in open source Local Mentors Programme - Find ASF people who live near you   Newbie FAQ - some commonly asked questions (and their answers) How many projects are at Apache?" />
+ Where do I start? - a guide to your first engagement with an Apache project How should I behave? - etiquette and codes of conduct at Apache Newbie FAQ - some commonly asked questions (and their answers) How many projects are at Apache?" />
 <meta property="og:type" content="article" />
 <meta property="og:url" content="https://community.apache.org/newcomers/" />
 <meta property="og:image" content="https://community.apache.org/images/aceu19_1.jpg"/>
-<meta property="article:modified_time" content="2023-03-16T11:05:50-04:00" /><meta property="og:site_name" content="Apache Community Development" />
+<meta property="article:modified_time" content="2023-03-17T12:26:02-04:00" /><meta property="og:site_name" content="Apache Community Development" />
 
 
   <title>Apache Community Development - Welcome, Apache newcomers!</title>
@@ -113,21 +113,6 @@
                 <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
               </div>
             </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
             <li class="nav-item dropdown">
               <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 Events
@@ -200,12 +185,6 @@ you stepping up to help out.</p>
 <ul>
 <li><a href="/gettingStarted/101.html">Where do I start?</a> - a guide to your first engagement with an Apache project</li>
 <li><a href="/contributors/etiquette">How should I behave?</a> - etiquette and codes of conduct at Apache</li>
-<li><a href="/mentoringprogramme.html">Mentoring Programme</a> - an introduction to our mentoring programme
-<ul>
-<li><a href="/mentorprogrammeformaleducation.html">Mentoring in formal education</a> - how to engage your students in open source</li>
-<li><a href="/localmentors.html">Local Mentors Programme</a> - Find ASF people who live near you</li>
-</ul>
-</li>
 <li><a href="/newbiefaq.html">Newbie FAQ</a> - some commonly asked questions (and their answers)</li>
 <li><a href="https://projects.apache.org/">How many projects are at Apache?</a> - we have a <strong>LOT</strong> of different project communities!</li>
 <li><a href="https://www.apache.org/dev/">Just show me the code!</a> - site index of technical questions (where&rsquo;s SVN, how to log in, etc.)</li>
diff --git a/content/newcomers/index.xml b/content/newcomers/index.xml
index 36ccb06..e13de5e 100644
--- a/content/newcomers/index.xml
+++ b/content/newcomers/index.xml
@@ -17,7 +17,7 @@
       
       <guid>https://community.apache.org/newcomers/</guid>
       <description>In this section we&amp;rsquo;ll help you take your first steps as an open source developer in one of our many Apache project communities. As an all-volunteer run organization, Apache and the many Apache projects rely on people like you stepping up to help out.
- Where do I start? - a guide to your first engagement with an Apache project How should I behave? - etiquette and codes of conduct at Apache Mentoring Programme - an introduction to our mentoring programme  Mentoring in formal education - how to engage your students in open source Local Mentors Programme - Find ASF people who live near you   Newbie FAQ - some commonly asked questions (and their answers) How many projects are at Apache?</description>
+ Where do I start? - a guide to your first engagement with an Apache project How should I behave? - etiquette and codes of conduct at Apache Newbie FAQ - some commonly asked questions (and their answers) How many projects are at Apache?</description>
     </item>
     
   </channel>
diff --git a/content/newcommitter.html b/content/newcommitter.html
index 652bf84..79e17b5 100644
--- a/content/newcommitter.html
+++ b/content/newcommitter.html
@@ -114,21 +114,6 @@ Each project has a different approach to managing new committers. This page desc
                 <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
               </div>
             </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
             <li class="nav-item dropdown">
               <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 Events
diff --git a/content/newsletter.html b/content/newsletter.html
index 85b101e..77992da 100644
--- a/content/newsletter.html
+++ b/content/newsletter.html
@@ -112,21 +112,6 @@
                 <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
               </div>
             </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
             <li class="nav-item dropdown">
               <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 Events
diff --git a/content/newsletter/2017-04.html b/content/newsletter/2017-04.html
index 6321112..67f9377 100644
--- a/content/newsletter/2017-04.html
+++ b/content/newsletter/2017-04.html
@@ -115,21 +115,6 @@ In our recent community survey, we heard from a lot of you that you want more in
                 <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
               </div>
             </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
             <li class="nav-item dropdown">
               <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 Events
diff --git a/content/newsletter/2017-05.html b/content/newsletter/2017-05.html
index f2aeedd..901e096 100644
--- a/content/newsletter/2017-05.html
+++ b/content/newsletter/2017-05.html
@@ -114,21 +114,6 @@ If you blog about anything Apache related, you might want to know about http://p
                 <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
               </div>
             </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
             <li class="nav-item dropdown">
               <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 Events
diff --git a/content/newsletter/index.html b/content/newsletter/index.html
index 659d20c..4b4b7eb 100644
--- a/content/newsletter/index.html
+++ b/content/newsletter/index.html
@@ -113,21 +113,6 @@
                 <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
               </div>
             </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
             <li class="nav-item dropdown">
               <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 Events
diff --git a/content/projectIndependence.html b/content/projectIndependence.html
index 1814489..1dfbc19 100644
--- a/content/projectIndependence.html
+++ b/content/projectIndependence.html
@@ -113,21 +113,6 @@ A community is not merely a set of rules; it is also a set of behaviors that the
                 <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
               </div>
             </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
             <li class="nav-item dropdown">
               <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 Events
diff --git a/content/proposals.html b/content/proposals.html
index d7bc089..fa06e73 100644
--- a/content/proposals.html
+++ b/content/proposals.html
@@ -112,21 +112,6 @@
                 <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
               </div>
             </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
             <li class="nav-item dropdown">
               <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 Events
diff --git a/content/proposals/ZestProposal.html b/content/proposals/ZestProposal.html
index fc61503..187c197 100644
--- a/content/proposals/ZestProposal.html
+++ b/content/proposals/ZestProposal.html
@@ -114,21 +114,6 @@ Governance of Provisional Top Level Project Provisional Top Level Project is a n
                 <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
               </div>
             </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
             <li class="nav-item dropdown">
               <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 Events
diff --git a/content/sitemap.xml b/content/sitemap.xml
index a730b82..e0ebc37 100644
--- a/content/sitemap.xml
+++ b/content/sitemap.xml
@@ -29,12 +29,12 @@
   
   <url>
     <loc>https://community.apache.org/mentoring/experiences.html</loc>
-    <lastmod>2020-12-07T09:47:52-04:00</lastmod>
+    <lastmod>2023-03-17T12:26:02-04:00</lastmod>
   </url>
   
   <url>
     <loc>https://community.apache.org/newbiefaq.html</loc>
-    <lastmod>2023-03-17T09:35:59-04:00</lastmod>
+    <lastmod>2023-03-17T12:26:02-04:00</lastmod>
   </url>
   
   <url>
@@ -78,18 +78,18 @@
   </url>
   
   <url>
-    <loc>https://community.apache.org/comdevboardresolution.html</loc>
-    <lastmod>2020-03-24T15:03:46+01:00</lastmod>
+    <loc>https://community.apache.org/history/boardresolution.html</loc>
+    <lastmod>2023-03-17T12:26:02-04:00</lastmod>
   </url>
   
   <url>
     <loc>https://community.apache.org/committers/</loc>
-    <lastmod>2023-03-17T09:35:59-04:00</lastmod>
+    <lastmod>2023-03-17T12:26:02-04:00</lastmod>
   </url>
   
   <url>
     <loc>https://community.apache.org/committers.html</loc>
-    <lastmod>2023-03-17T09:35:59-04:00</lastmod>
+    <lastmod>2023-03-17T12:26:02-04:00</lastmod>
   </url>
   
   <url>
@@ -124,7 +124,7 @@
   
   <url>
     <loc>https://community.apache.org/committers/decisionMaking.html</loc>
-    <lastmod>2020-12-02T11:27:28-04:00</lastmod>
+    <lastmod>2021-01-15T09:22:16-04:00</lastmod>
   </url>
   
   <url>
@@ -139,12 +139,12 @@
   
   <url>
     <loc>https://community.apache.org/gettingStarted/101.html</loc>
-    <lastmod>2022-02-21T08:46:37-04:00</lastmod>
+    <lastmod>2023-03-17T12:26:02-04:00</lastmod>
   </url>
   
   <url>
     <loc>https://community.apache.org/gettingStarted.html</loc>
-    <lastmod>2022-02-21T08:46:37-04:00</lastmod>
+    <lastmod>2023-03-17T12:26:02-04:00</lastmod>
   </url>
   
   <url>
@@ -159,7 +159,12 @@
   
   <url>
     <loc>https://community.apache.org/guide-to-being-a-mentor.html</loc>
-    <lastmod>2023-02-27T12:47:39+05:30</lastmod>
+    <lastmod>2023-03-17T12:26:02-04:00</lastmod>
+  </url>
+  
+  <url>
+    <loc>https://community.apache.org/history.html</loc>
+    <lastmod>2023-03-17T12:26:02-04:00</lastmod>
   </url>
   
   <url>
@@ -182,11 +187,6 @@
     <lastmod>2021-07-05T14:07:56-03:00</lastmod>
   </url>
   
-  <url>
-    <loc>https://community.apache.org/localmentors.html</loc>
-    <lastmod>2020-07-20T20:22:04+02:00</lastmod>
-  </url>
-  
   <url>
     <loc>https://community.apache.org/newsletter/2017-05.html</loc>
     <lastmod>2020-07-20T20:22:04+02:00</lastmod>
@@ -197,24 +197,19 @@
     <lastmod>2021-04-30T09:36:56-07:00</lastmod>
   </url>
   
-  <url>
-    <loc>https://community.apache.org/mentorprogrammeapplication.html</loc>
-    <lastmod>2021-02-14T15:36:48+04:00</lastmod>
-  </url>
-  
   <url>
     <loc>https://community.apache.org/mentoring/</loc>
-    <lastmod>2020-07-20T20:22:04+02:00</lastmod>
+    <lastmod>2023-03-17T12:26:02-04:00</lastmod>
   </url>
   
   <url>
     <loc>https://community.apache.org/mentoring/committer.html</loc>
-    <lastmod>2020-03-24T15:03:46+01:00</lastmod>
+    <lastmod>2023-03-17T12:26:02-04:00</lastmod>
   </url>
   
   <url>
     <loc>https://community.apache.org/mentoring/pmc.html</loc>
-    <lastmod>2020-03-24T15:03:46+01:00</lastmod>
+    <lastmod>2023-03-17T12:26:02-04:00</lastmod>
   </url>
   
   <url>
@@ -224,22 +219,12 @@
   
   <url>
     <loc>https://community.apache.org/mentoring/firstpatch.html</loc>
-    <lastmod>2020-03-24T15:03:46+01:00</lastmod>
-  </url>
-  
-  <url>
-    <loc>https://community.apache.org/mentoringprogramme.html</loc>
-    <lastmod>2020-09-23T00:32:47+02:00</lastmod>
+    <lastmod>2023-03-17T12:26:02-04:00</lastmod>
   </url>
   
   <url>
     <loc>https://community.apache.org/mentoring.html</loc>
-    <lastmod>2020-12-07T09:47:52-04:00</lastmod>
-  </url>
-  
-  <url>
-    <loc>https://community.apache.org/mentorprogrammeformaleducation.html</loc>
-    <lastmod>2020-12-11T09:53:54-04:00</lastmod>
+    <lastmod>2023-03-17T12:26:02-04:00</lastmod>
   </url>
   
   <url>
@@ -249,7 +234,7 @@
   
   <url>
     <loc>https://community.apache.org/newcomers.html</loc>
-    <lastmod>2023-03-16T11:05:50-04:00</lastmod>
+    <lastmod>2023-03-17T12:26:02-04:00</lastmod>
   </url>
   
   <url>
@@ -263,8 +248,8 @@
   </url>
   
   <url>
-    <loc>https://community.apache.org/mentoringprogramme-icfoss-pilot.html</loc>
-    <lastmod>2020-09-23T03:12:58+02:00</lastmod>
+    <loc>https://community.apache.org/history/mentoringprogramme-icfoss-pilot.html</loc>
+    <lastmod>2023-03-17T12:26:02-04:00</lastmod>
   </url>
   
   <url>
@@ -303,7 +288,7 @@
   
   <url>
     <loc>https://community.apache.org/newcomers/</loc>
-    <lastmod>2023-03-16T11:05:50-04:00</lastmod>
+    <lastmod>2023-03-17T12:26:02-04:00</lastmod>
   </url>
   
 </urlset>
\ No newline at end of file
diff --git a/content/speakers.html b/content/speakers.html
index 0b6a365..5c7c8fe 100644
--- a/content/speakers.html
+++ b/content/speakers.html
@@ -112,21 +112,6 @@
                 <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
               </div>
             </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
             <li class="nav-item dropdown">
               <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 Events
diff --git a/content/speakers/index.html b/content/speakers/index.html
index f8e55a0..6aa55b9 100644
--- a/content/speakers/index.html
+++ b/content/speakers/index.html
@@ -114,21 +114,6 @@ Finding speakers You can use our &ldquo;Find People&rdquo; application to find s
                 <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
               </div>
             </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
             <li class="nav-item dropdown">
               <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 Events
diff --git a/content/speakers/slides.html b/content/speakers/slides.html
index 8e9c34b..8e1db76 100644
--- a/content/speakers/slides.html
+++ b/content/speakers/slides.html
@@ -114,21 +114,6 @@ Many Apache speakers post their slides to the SlideShare website, and the Feathe
                 <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
               </div>
             </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
             <li class="nav-item dropdown">
               <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 Events
diff --git a/content/speakers/speakers.html b/content/speakers/speakers.html
index 6e9e2b1..c8434e5 100644
--- a/content/speakers/speakers.html
+++ b/content/speakers/speakers.html
@@ -114,21 +114,6 @@ Listing yourself as a potential speaker To list yourself as someone interested i
                 <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
               </div>
             </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
             <li class="nav-item dropdown">
               <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 Events
diff --git a/content/use-the-comdev-issue-tracker-for-gsoc-tasks.html b/content/use-the-comdev-issue-tracker-for-gsoc-tasks.html
index d342b7a..93d33ff 100644
--- a/content/use-the-comdev-issue-tracker-for-gsoc-tasks.html
+++ b/content/use-the-comdev-issue-tracker-for-gsoc-tasks.html
@@ -113,21 +113,6 @@
                 <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
               </div>
             </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
             <li class="nav-item dropdown">
               <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 Events