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 16:38:59 UTC

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

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 7459357  Updated asf-site from master at 56cbbb68f5a6bfd1c76ab8683dfd6e51b51ea740 using https://ci-builds.apache.org/job/Community%20Development/job/site/job/master/204/
7459357 is described below

commit 74593578249390a0d631ce6d7c5d1e21e2d179b4
Author: jenkins <bu...@apache.org>
AuthorDate: Fri Mar 17 16:38:52 2023 +0000

    Updated asf-site from master at 56cbbb68f5a6bfd1c76ab8683dfd6e51b51ea740 using https://ci-builds.apache.org/job/Community%20Development/job/site/job/master/204/
---
 content/about.html                                       |  4 +---
 content/about/index.html                                 |  9 +++------
 content/apache-way.html                                  |  4 +---
 content/apache-way/apache-project-maturity-model.html    |  4 +---
 content/boardreport.html                                 |  4 +---
 content/calendars.html                                   |  4 +---
 content/calendars/conferences.html                       |  4 +---
 content/calendars/index.html                             |  4 +---
 content/comdevboardreports.html                          |  4 +---
 content/comdevboardresolution.html                       |  4 +---
 content/committers.html                                  |  4 +---
 content/committers/consensusBuilding.html                |  4 +---
 content/committers/decisionMaking.html                   |  4 +---
 content/committers/funding-disclaimer.html               |  4 +---
 content/committers/index.html                            | 15 +++------------
 content/committers/lazyConsensus.html                    |  4 +---
 content/committers/voting.html                           |  4 +---
 content/contactpoints.html                               |  4 +---
 content/contributors.html                                |  4 +---
 content/contributors/etiquette.html                      |  4 +---
 content/contributors/index.html                          |  4 +---
 content/events.html                                      |  4 +---
 content/events/small-events.html                         |  4 +---
 content/gettingStarted.html                              |  4 +---
 content/gettingStarted/101.html                          |  4 +---
 content/gsoc-admin-tasks.html                            |  4 +---
 content/gsoc.html                                        |  4 +---
 content/guide-to-being-a-mentor.html                     |  4 +---
 content/index.html                                       |  9 +++------
 content/index.xml                                        |  2 +-
 content/links.html                                       |  4 +---
 content/lists.html                                       |  4 +---
 content/localmentors.html                                |  4 +---
 content/mentee-ranking-process.html                      |  4 +---
 content/mentor-request-mail.html                         |  4 +---
 content/mentoring.html                                   |  4 +---
 content/mentoring/committer.html                         |  4 +---
 content/mentoring/experiences.html                       |  4 +---
 content/mentoring/firstpatch.html                        |  4 +---
 content/mentoring/index.html                             |  4 +---
 content/mentoring/mentor.html                            |  4 +---
 content/mentoring/pmc.html                               |  4 +---
 content/mentoringprogramme-icfoss-pilot.html             |  4 +---
 content/mentoringprogramme.html                          |  4 +---
 content/mentorprogrammeapplication.html                  |  4 +---
 content/mentorprogrammeformaleducation.html              |  4 +---
 content/newbiefaq.html                                   | 13 ++-----------
 content/newcomers.html                                   |  4 +---
 content/newcomers/index.html                             |  4 +---
 content/newcommitter.html                                |  4 +---
 content/newsletter.html                                  |  4 +---
 content/newsletter/2017-04.html                          |  4 +---
 content/newsletter/2017-05.html                          |  4 +---
 content/newsletter/index.html                            |  4 +---
 content/projectIndependence.html                         |  4 +---
 content/proposals.html                                   |  4 +---
 content/proposals/ZestProposal.html                      |  4 +---
 content/sitemap.xml                                      | 14 +++++++-------
 content/speakers.html                                    |  4 +---
 content/speakers/index.html                              |  4 +---
 content/speakers/index.xml                               |  2 +-
 content/speakers/slides.html                             | 11 ++++-------
 content/speakers/speakers.html                           |  4 +---
 content/use-the-comdev-issue-tracker-for-gsoc-tasks.html |  4 +---
 64 files changed, 80 insertions(+), 219 deletions(-)

diff --git a/content/about.html b/content/about.html
index be3e4ed..78ef8a8 100644
--- a/content/about.html
+++ b/content/about.html
@@ -138,9 +138,7 @@
                 <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/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+                <a class="dropdown-item" href="/speakers/slides.html">Sample presentations</a>
               </div>
             </li>
             <li class="nav-item dropdown">
diff --git a/content/about/index.html b/content/about/index.html
index fc4c099..1b2c648 100644
--- a/content/about/index.html
+++ b/content/about/index.html
@@ -12,7 +12,7 @@
 <meta property="og:type" content="article" />
 <meta property="og:url" content="https://community.apache.org/about/" />
 <meta property="og:image" content="https://community.apache.org/images/aceu19_1.jpg"/>
-<meta property="article:modified_time" content="2023-03-17T09:03:09-04:00" /><meta property="og:site_name" content="Apache Community Development" />
+<meta property="article:modified_time" content="2023-03-17T09:35:59-04:00" /><meta property="og:site_name" content="Apache Community Development" />
 
 
   <title>Apache Community Development - Community Development: What we do</title>
@@ -139,9 +139,7 @@
                 <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/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+                <a class="dropdown-item" href="/speakers/slides.html">Sample presentations</a>
               </div>
             </li>
             <li class="nav-item dropdown">
@@ -232,8 +230,7 @@ provides a wide array of information, <a href="/newbiefaq.html">FAQs</a>, and he
 <li>Partnered Industry Events (FOSDEM etc.)</li>
 <li>MeetUps, Apache BarCamps, etc.</li>
 <li>Event Representatives (booth coverage, etc.)</li>
-<li><a href="/speakers/">Speaker Resources</a></li>
-<li><a href="/speakers/slides.html">Stock Presentations</a></li>
+<li><a href="/speakers/slides.html">Sample Presentations</a></li>
 </ul>
 <h3 id="diversity">Diversity</h3>
 <ul>
diff --git a/content/apache-way.html b/content/apache-way.html
index 92f9e01..19e0ebb 100644
--- a/content/apache-way.html
+++ b/content/apache-way.html
@@ -138,9 +138,7 @@
                 <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/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+                <a class="dropdown-item" href="/speakers/slides.html">Sample presentations</a>
               </div>
             </li>
             <li class="nav-item dropdown">
diff --git a/content/apache-way/apache-project-maturity-model.html b/content/apache-way/apache-project-maturity-model.html
index 9ec3cda..d64021c 100644
--- a/content/apache-way/apache-project-maturity-model.html
+++ b/content/apache-way/apache-project-maturity-model.html
@@ -139,9 +139,7 @@ Overview The goals of this maturity model are to describe how Apache projects op
                 <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/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+                <a class="dropdown-item" href="/speakers/slides.html">Sample presentations</a>
               </div>
             </li>
             <li class="nav-item dropdown">
diff --git a/content/boardreport.html b/content/boardreport.html
index d56eb3c..1dbc16d 100644
--- a/content/boardreport.html
+++ b/content/boardreport.html
@@ -141,9 +141,7 @@ Reports need not be exhaustive, unless you are asking for assistance." />
                 <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/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+                <a class="dropdown-item" href="/speakers/slides.html">Sample presentations</a>
               </div>
             </li>
             <li class="nav-item dropdown">
diff --git a/content/calendars.html b/content/calendars.html
index fc3e1ce..9fb8689 100644
--- a/content/calendars.html
+++ b/content/calendars.html
@@ -138,9 +138,7 @@
                 <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/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+                <a class="dropdown-item" href="/speakers/slides.html">Sample presentations</a>
               </div>
             </li>
             <li class="nav-item dropdown">
diff --git a/content/calendars/conferences.html b/content/calendars/conferences.html
index 09557dd..4d851dd 100644
--- a/content/calendars/conferences.html
+++ b/content/calendars/conferences.html
@@ -140,9 +140,7 @@ Upcoming events  List loading   This Calendar is also available as an iCal feed"
                 <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/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+                <a class="dropdown-item" href="/speakers/slides.html">Sample presentations</a>
               </div>
             </li>
             <li class="nav-item dropdown">
diff --git a/content/calendars/index.html b/content/calendars/index.html
index 9c61047..549339e 100644
--- a/content/calendars/index.html
+++ b/content/calendars/index.html
@@ -139,9 +139,7 @@ This Calendar is maintained by Apache Community Development volunteers (ComDev);
                 <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/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+                <a class="dropdown-item" href="/speakers/slides.html">Sample presentations</a>
               </div>
             </li>
             <li class="nav-item dropdown">
diff --git a/content/comdevboardreports.html b/content/comdevboardreports.html
index 4671ee5..fcc50d4 100644
--- a/content/comdevboardreports.html
+++ b/content/comdevboardreports.html
@@ -141,9 +141,7 @@ DRAFT November 2012 Status report for the Apache Community Development Project T
                 <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/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+                <a class="dropdown-item" href="/speakers/slides.html">Sample presentations</a>
               </div>
             </li>
             <li class="nav-item dropdown">
diff --git a/content/comdevboardresolution.html b/content/comdevboardresolution.html
index 3e42f45..0a1b89c 100644
--- a/content/comdevboardresolution.html
+++ b/content/comdevboardresolution.html
@@ -139,9 +139,7 @@ Board Resolution Creating the Apache Community Development ProjectEstablish the
                 <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/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+                <a class="dropdown-item" href="/speakers/slides.html">Sample presentations</a>
               </div>
             </li>
             <li class="nav-item dropdown">
diff --git a/content/committers.html b/content/committers.html
index 926631f..34ba646 100644
--- a/content/committers.html
+++ b/content/committers.html
@@ -138,9 +138,7 @@
                 <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/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+                <a class="dropdown-item" href="/speakers/slides.html">Sample presentations</a>
               </div>
             </li>
             <li class="nav-item dropdown">
diff --git a/content/committers/consensusBuilding.html b/content/committers/consensusBuilding.html
index 4a21280..ba383de 100644
--- a/content/committers/consensusBuilding.html
+++ b/content/committers/consensusBuilding.html
@@ -139,9 +139,7 @@ Constructive discussion is the lifeblood of a successful project. However, we wa
                 <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/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+                <a class="dropdown-item" href="/speakers/slides.html">Sample presentations</a>
               </div>
             </li>
             <li class="nav-item dropdown">
diff --git a/content/committers/decisionMaking.html b/content/committers/decisionMaking.html
index c81699b..9ea0542 100644
--- a/content/committers/decisionMaking.html
+++ b/content/committers/decisionMaking.html
@@ -139,9 +139,7 @@ To some, the idea of having to establish consensus in a large and distributed te
                 <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/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+                <a class="dropdown-item" href="/speakers/slides.html">Sample presentations</a>
               </div>
             </li>
             <li class="nav-item dropdown">
diff --git a/content/committers/funding-disclaimer.html b/content/committers/funding-disclaimer.html
index 62dd033..f251962 100644
--- a/content/committers/funding-disclaimer.html
+++ b/content/committers/funding-disclaimer.html
@@ -141,9 +141,7 @@ If you have any question about this, feel free to ask on our dev@community." />
                 <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/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+                <a class="dropdown-item" href="/speakers/slides.html">Sample presentations</a>
               </div>
             </li>
             <li class="nav-item dropdown">
diff --git a/content/committers/index.html b/content/committers/index.html
index 63dc7b8..fd9d17f 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="2020-12-01T10:29:20-04:00" /><meta property="og:site_name" content="Apache Community Development" />
+<meta property="article:modified_time" content="2023-03-17T09:35:59-04:00" /><meta property="og:site_name" content="Apache Community Development" />
 
 
   <title>Apache Community Development - Committer resources</title>
@@ -141,9 +141,7 @@ Decision making Decisions in Apache projects result from:" />
                 <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/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+                <a class="dropdown-item" href="/speakers/slides.html">Sample presentations</a>
               </div>
             </li>
             <li class="nav-item dropdown">
@@ -270,14 +268,7 @@ activities, although non-committers can often act in supporting roles.</p>
 </ul>
 <h2 id="speaking-about-apache-projects-at-events">Speaking about Apache projects at events</h2>
 <p>We encourage all of our committers to speak about Apache projects and
-technologies, and generally to help to grow and enhance our community.
-For more information, see our
-<a href="/speakers/">Speakers section</a>.</p>
-<p>In addition, we encourage all committers to list themselves as
-&ldquo;Local Mentors&rdquo;, and thus help new committers
-and would-be committers. For more information on what this program involves,
-and how to sign yourself up for it, see the
-<a href="/localmentors.html">Local Mentors</a> page.</p>
+technologies, and generally to help to grow and enhance our community.</p>
 <h2 id="other-resources">Other Resources</h2>
 <p>There is no shortage of useful resources for committers at Apache. Here are a few you might want to take a look at:</p>
 <ul>
diff --git a/content/committers/lazyConsensus.html b/content/committers/lazyConsensus.html
index 18c6b39..9afa820 100644
--- a/content/committers/lazyConsensus.html
+++ b/content/committers/lazyConsensus.html
@@ -138,9 +138,7 @@
                 <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/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+                <a class="dropdown-item" href="/speakers/slides.html">Sample presentations</a>
               </div>
             </li>
             <li class="nav-item dropdown">
diff --git a/content/committers/voting.html b/content/committers/voting.html
index e6c3280..6330e19 100644
--- a/content/committers/voting.html
+++ b/content/committers/voting.html
@@ -139,9 +139,7 @@ Preparing for a Vote It is important to ensure that the community has time to di
                 <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/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+                <a class="dropdown-item" href="/speakers/slides.html">Sample presentations</a>
               </div>
             </li>
             <li class="nav-item dropdown">
diff --git a/content/contactpoints.html b/content/contactpoints.html
index 2b89488..c320512 100644
--- a/content/contactpoints.html
+++ b/content/contactpoints.html
@@ -141,9 +141,7 @@ Technical Questions If you have a technical question about this website, or one
                 <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/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+                <a class="dropdown-item" href="/speakers/slides.html">Sample presentations</a>
               </div>
             </li>
             <li class="nav-item dropdown">
diff --git a/content/contributors.html b/content/contributors.html
index 4fcfba2..69c9000 100644
--- a/content/contributors.html
+++ b/content/contributors.html
@@ -138,9 +138,7 @@
                 <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/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+                <a class="dropdown-item" href="/speakers/slides.html">Sample presentations</a>
               </div>
             </li>
             <li class="nav-item dropdown">
diff --git a/content/contributors/etiquette.html b/content/contributors/etiquette.html
index 6e8ca74..9cc550a 100644
--- a/content/contributors/etiquette.html
+++ b/content/contributors/etiquette.html
@@ -139,9 +139,7 @@ Code of Conduct The ASF has adopted a Code of Conduct which covers interactions
                 <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/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+                <a class="dropdown-item" href="/speakers/slides.html">Sample presentations</a>
               </div>
             </li>
             <li class="nav-item dropdown">
diff --git a/content/contributors/index.html b/content/contributors/index.html
index a11c867..b839a87 100644
--- a/content/contributors/index.html
+++ b/content/contributors/index.html
@@ -139,9 +139,7 @@ Project Independence And Policies While not all ASF projects practice all aspect
                 <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/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+                <a class="dropdown-item" href="/speakers/slides.html">Sample presentations</a>
               </div>
             </li>
             <li class="nav-item dropdown">
diff --git a/content/events.html b/content/events.html
index 30240ba..6d92b51 100644
--- a/content/events.html
+++ b/content/events.html
@@ -138,9 +138,7 @@
                 <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/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+                <a class="dropdown-item" href="/speakers/slides.html">Sample presentations</a>
               </div>
             </li>
             <li class="nav-item dropdown">
diff --git a/content/events/small-events.html b/content/events/small-events.html
index e45f44e..22a10b0 100644
--- a/content/events/small-events.html
+++ b/content/events/small-events.html
@@ -143,9 +143,7 @@ c) Once brand use is approved by the respective PMCs, inform the community devel
                 <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/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+                <a class="dropdown-item" href="/speakers/slides.html">Sample presentations</a>
               </div>
             </li>
             <li class="nav-item dropdown">
diff --git a/content/gettingStarted.html b/content/gettingStarted.html
index d8a1c40..7de7a5f 100644
--- a/content/gettingStarted.html
+++ b/content/gettingStarted.html
@@ -138,9 +138,7 @@
                 <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/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+                <a class="dropdown-item" href="/speakers/slides.html">Sample presentations</a>
               </div>
             </li>
             <li class="nav-item dropdown">
diff --git a/content/gettingStarted/101.html b/content/gettingStarted/101.html
index 77c76a1..b121580 100644
--- a/content/gettingStarted/101.html
+++ b/content/gettingStarted/101.html
@@ -139,9 +139,7 @@ Finding the right project The key to working on projects at Apache (and on any o
                 <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/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+                <a class="dropdown-item" href="/speakers/slides.html">Sample presentations</a>
               </div>
             </li>
             <li class="nav-item dropdown">
diff --git a/content/gsoc-admin-tasks.html b/content/gsoc-admin-tasks.html
index 1a562e1..49a0ed0 100644
--- a/content/gsoc-admin-tasks.html
+++ b/content/gsoc-admin-tasks.html
@@ -140,9 +140,7 @@ List of duties:
                 <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/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+                <a class="dropdown-item" href="/speakers/slides.html">Sample presentations</a>
               </div>
             </li>
             <li class="nav-item dropdown">
diff --git a/content/gsoc.html b/content/gsoc.html
index 8bd94ca..a0c9413 100644
--- a/content/gsoc.html
+++ b/content/gsoc.html
@@ -140,9 +140,7 @@ Students: read this  Learn about GSoC Decide if you are eligible for GSoC?" />
                 <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/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+                <a class="dropdown-item" href="/speakers/slides.html">Sample presentations</a>
               </div>
             </li>
             <li class="nav-item dropdown">
diff --git a/content/guide-to-being-a-mentor.html b/content/guide-to-being-a-mentor.html
index 7e7f892..2d46b6f 100644
--- a/content/guide-to-being-a-mentor.html
+++ b/content/guide-to-being-a-mentor.html
@@ -140,9 +140,7 @@ Important Steps  Add an issue to JIRA (if your project does not use JIRA you can
                 <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/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+                <a class="dropdown-item" href="/speakers/slides.html">Sample presentations</a>
               </div>
             </li>
             <li class="nav-item dropdown">
diff --git a/content/index.html b/content/index.html
index 19082e1..5871367 100644
--- a/content/index.html
+++ b/content/index.html
@@ -139,9 +139,7 @@
                 <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/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+                <a class="dropdown-item" href="/speakers/slides.html">Sample presentations</a>
               </div>
             </li>
             <li class="nav-item dropdown">
@@ -213,10 +211,9 @@ in the specific Apache projects that interest you.</p>
         <p>The ASF is a large organization made up of many separate projects. Each project community may have its own ways of working, while still following the basic Apache Way process.</p>
     </div>
     <div class="col-md-4">
-        <h4>Event Organizers and Speakers</h4>
-        <p>We have a <a href="speakers/index.html">list of speaker resources</a> for conference organizers and speakers, including some useful slides.</p>
+        <h4>Events</h4>
         <p>Producers should read our <a href="https://www.apache.org/foundation/marks/events">Event Branding Policy</a> for ticketed events, and we have some <a href="events/small-events.html">tips for organizing small community events</a> about Apache projects.</p>
-        <p>The <a href="https://events.apache.org/event/calendar.html">master event calendar</a> contains an aggregation of many different Apache-related events, including ApacheCon and BarCamps.</p>
+        <p>The <a href="https://events.apache.org/event/calendar.html">event calendar</a> lists approved Apache-related events, including Community Over Code (formerly ApacheCon) and project summits.</p>
     </div>
     <div class="col-md-4">
         <h4>The Foundation</h4>
diff --git a/content/index.xml b/content/index.xml
index a73bc38..b2947fd 100644
--- a/content/index.xml
+++ b/content/index.xml
@@ -80,7 +80,7 @@ This Calendar is maintained by Apache Community Development volunteers (ComDev);
       
       <guid>https://community.apache.org/speakers/slides.html</guid>
       <description>This page contains links to presentations and other key papers about the ASF and how Apache projects work that you may find useful. Many of these have been presented at ApacheCon conferences or other open source conferences.
-These presentations are available under permissive licenses; please see each individual presentation for license details. More tips and links for speakers are available.
+These presentations are available under permissive licenses; please see each individual presentation for license details.
 Many Apache speakers post their slides to the SlideShare website, and the FeatherCast podcast offers audio recordings of many talks and interviews.</description>
     </item>
     
diff --git a/content/links.html b/content/links.html
index 6a94da6..9725503 100644
--- a/content/links.html
+++ b/content/links.html
@@ -140,9 +140,7 @@ Books  Producing Open Source Software - by Karl Fogel  Blog posts  Apache - the
                 <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/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+                <a class="dropdown-item" href="/speakers/slides.html">Sample presentations</a>
               </div>
             </li>
             <li class="nav-item dropdown">
diff --git a/content/lists.html b/content/lists.html
index 3fbc4e7..540734f 100644
--- a/content/lists.html
+++ b/content/lists.html
@@ -138,9 +138,7 @@
                 <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/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+                <a class="dropdown-item" href="/speakers/slides.html">Sample presentations</a>
               </div>
             </li>
             <li class="nav-item dropdown">
diff --git a/content/localmentors.html b/content/localmentors.html
index fdd95d2..218a6bf 100644
--- a/content/localmentors.html
+++ b/content/localmentors.html
@@ -140,9 +140,7 @@ Why? When you&rsquo;re getting involved in a new open source project, it can be
                 <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/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+                <a class="dropdown-item" href="/speakers/slides.html">Sample presentations</a>
               </div>
             </li>
             <li class="nav-item dropdown">
diff --git a/content/mentee-ranking-process.html b/content/mentee-ranking-process.html
index 8fbad0b..9b25ef5 100644
--- a/content/mentee-ranking-process.html
+++ b/content/mentee-ranking-process.html
@@ -140,9 +140,7 @@ Remember, mentoring is all about the mentee and open source as a whole. It is no
                 <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/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+                <a class="dropdown-item" href="/speakers/slides.html">Sample presentations</a>
               </div>
             </li>
             <li class="nav-item dropdown">
diff --git a/content/mentor-request-mail.html b/content/mentor-request-mail.html
index 9463829..47a0cdd 100644
--- a/content/mentor-request-mail.html
+++ b/content/mentor-request-mail.html
@@ -139,9 +139,7 @@ Here&rsquo;s an example of what your first email might look like:" />
                 <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/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+                <a class="dropdown-item" href="/speakers/slides.html">Sample presentations</a>
               </div>
             </li>
             <li class="nav-item dropdown">
diff --git a/content/mentoring.html b/content/mentoring.html
index 5df07e8..422c64c 100644
--- a/content/mentoring.html
+++ b/content/mentoring.html
@@ -138,9 +138,7 @@
                 <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/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+                <a class="dropdown-item" href="/speakers/slides.html">Sample presentations</a>
               </div>
             </li>
             <li class="nav-item dropdown">
diff --git a/content/mentoring/committer.html b/content/mentoring/committer.html
index d45edf6..9aec0f1 100644
--- a/content/mentoring/committer.html
+++ b/content/mentoring/committer.html
@@ -141,9 +141,7 @@ TODO" />
                 <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/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+                <a class="dropdown-item" href="/speakers/slides.html">Sample presentations</a>
               </div>
             </li>
             <li class="nav-item dropdown">
diff --git a/content/mentoring/experiences.html b/content/mentoring/experiences.html
index 158eb18..c09b0a3 100644
--- a/content/mentoring/experiences.html
+++ b/content/mentoring/experiences.html
@@ -139,9 +139,7 @@
                 <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/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+                <a class="dropdown-item" href="/speakers/slides.html">Sample presentations</a>
               </div>
             </li>
             <li class="nav-item dropdown">
diff --git a/content/mentoring/firstpatch.html b/content/mentoring/firstpatch.html
index e0f898a..dcd0edc 100644
--- a/content/mentoring/firstpatch.html
+++ b/content/mentoring/firstpatch.html
@@ -139,9 +139,7 @@ Here&rsquo;s some tips on how to do that." />
                 <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/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+                <a class="dropdown-item" href="/speakers/slides.html">Sample presentations</a>
               </div>
             </li>
             <li class="nav-item dropdown">
diff --git a/content/mentoring/index.html b/content/mentoring/index.html
index 836998e..9887d7b 100644
--- a/content/mentoring/index.html
+++ b/content/mentoring/index.html
@@ -140,9 +140,7 @@ Here&rsquo;s some concrete ways you can provide mentoring to other members of yo
                 <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/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+                <a class="dropdown-item" href="/speakers/slides.html">Sample presentations</a>
               </div>
             </li>
             <li class="nav-item dropdown">
diff --git a/content/mentoring/mentor.html b/content/mentoring/mentor.html
index 137cbed..6cd7441 100644
--- a/content/mentoring/mentor.html
+++ b/content/mentoring/mentor.html
@@ -139,9 +139,7 @@
                 <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/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+                <a class="dropdown-item" href="/speakers/slides.html">Sample presentations</a>
               </div>
             </li>
             <li class="nav-item dropdown">
diff --git a/content/mentoring/pmc.html b/content/mentoring/pmc.html
index 1bf16e2..79f833a 100644
--- a/content/mentoring/pmc.html
+++ b/content/mentoring/pmc.html
@@ -139,9 +139,7 @@ These things vary a little from one project to another, so clearly documenting t
                 <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/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+                <a class="dropdown-item" href="/speakers/slides.html">Sample presentations</a>
               </div>
             </li>
             <li class="nav-item dropdown">
diff --git a/content/mentoringprogramme-icfoss-pilot.html b/content/mentoringprogramme-icfoss-pilot.html
index 87e4d8c..74d2c00 100644
--- a/content/mentoringprogramme-icfoss-pilot.html
+++ b/content/mentoringprogramme-icfoss-pilot.html
@@ -140,9 +140,7 @@ The mentoring programme is not here to teach you to write documentation or code.
                 <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/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+                <a class="dropdown-item" href="/speakers/slides.html">Sample presentations</a>
               </div>
             </li>
             <li class="nav-item dropdown">
diff --git a/content/mentoringprogramme.html b/content/mentoringprogramme.html
index 9944e6a..ff34dcf 100644
--- a/content/mentoringprogramme.html
+++ b/content/mentoringprogramme.html
@@ -139,9 +139,7 @@ The mentoring programme is not here to teach you to write documentation or code.
                 <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/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+                <a class="dropdown-item" href="/speakers/slides.html">Sample presentations</a>
               </div>
             </li>
             <li class="nav-item dropdown">
diff --git a/content/mentorprogrammeapplication.html b/content/mentorprogrammeapplication.html
index a3f4e54..e42fe21 100644
--- a/content/mentorprogrammeapplication.html
+++ b/content/mentorprogrammeapplication.html
@@ -140,9 +140,7 @@ Creating a proposal and finding a mentor  Find the project you are interested in
                 <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/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+                <a class="dropdown-item" href="/speakers/slides.html">Sample presentations</a>
               </div>
             </li>
             <li class="nav-item dropdown">
diff --git a/content/mentorprogrammeformaleducation.html b/content/mentorprogrammeformaleducation.html
index e0234e1..476e3b3 100644
--- a/content/mentorprogrammeformaleducation.html
+++ b/content/mentorprogrammeformaleducation.html
@@ -140,9 +140,7 @@ Overview Projects are defined by the students tutor in consultation with the TLP
                 <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/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+                <a class="dropdown-item" href="/speakers/slides.html">Sample presentations</a>
               </div>
             </li>
             <li class="nav-item dropdown">
diff --git a/content/newbiefaq.html b/content/newbiefaq.html
index e6e2f4e..8753506 100644
--- a/content/newbiefaq.html
+++ b/content/newbiefaq.html
@@ -13,7 +13,7 @@ Index of Questions
 <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-16T11:05:50-04:00" /><meta property="og:site_name" content="Apache Community Development" />
+<meta property="article:modified_time" content="2023-03-17T09:35:59-04:00" /><meta property="og:site_name" content="Apache Community Development" />
 
 
   <title>Apache Community Development - Apache Newcomer FAQs</title>
@@ -140,9 +140,7 @@ Index of Questions
                 <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/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+                <a class="dropdown-item" href="/speakers/slides.html">Sample presentations</a>
               </div>
             </li>
             <li class="nav-item dropdown">
@@ -219,7 +217,6 @@ The Apache Software Foundation (ASF) and our many Apache projects understand how
 <li><a href="#NewbieFAQ-HowdoIApplytotheMentorProgramme?">How do I apply to the Mentor Programme?</a></li>
 </ul>
 </li>
-<li><a href="#NewbieFAQ-AboutSpeakers">Finding Apache speakers for events or meetups</a></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>
@@ -373,12 +370,6 @@ need to complete an <a href="mentorprogrammeapplication.html">application</a>. T
 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>
-<p><a name="NewbieFAQ-AboutSpeakers"></a></p>
-<h2 id="how-can-i-find-speakers-willing-to-help-us-understand-apache">How can I find speakers willing to help us understand Apache?</h2>
-<p>The best way to start getting involved is to join the
-<a href="##NewbieFAQ-HowdoIaskaquestionabouttheASFingeneral?">dev@community.apache.org</a>
-mailing list. We also have a <a href="/speakers/">listing of volunteer speakers</a>
-who might be willing to share slides or talks about the ASF.</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 d903ac7..9a10cf9 100644
--- a/content/newcomers.html
+++ b/content/newcomers.html
@@ -138,9 +138,7 @@
                 <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/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+                <a class="dropdown-item" href="/speakers/slides.html">Sample presentations</a>
               </div>
             </li>
             <li class="nav-item dropdown">
diff --git a/content/newcomers/index.html b/content/newcomers/index.html
index 36a2acc..16fada4 100644
--- a/content/newcomers/index.html
+++ b/content/newcomers/index.html
@@ -139,9 +139,7 @@
                 <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/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+                <a class="dropdown-item" href="/speakers/slides.html">Sample presentations</a>
               </div>
             </li>
             <li class="nav-item dropdown">
diff --git a/content/newcommitter.html b/content/newcommitter.html
index b5a012e..652bf84 100644
--- a/content/newcommitter.html
+++ b/content/newcommitter.html
@@ -140,9 +140,7 @@ Each project has a different approach to managing new committers. This page desc
                 <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/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+                <a class="dropdown-item" href="/speakers/slides.html">Sample presentations</a>
               </div>
             </li>
             <li class="nav-item dropdown">
diff --git a/content/newsletter.html b/content/newsletter.html
index 98a4650..85b101e 100644
--- a/content/newsletter.html
+++ b/content/newsletter.html
@@ -138,9 +138,7 @@
                 <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/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+                <a class="dropdown-item" href="/speakers/slides.html">Sample presentations</a>
               </div>
             </li>
             <li class="nav-item dropdown">
diff --git a/content/newsletter/2017-04.html b/content/newsletter/2017-04.html
index e1e5948..6321112 100644
--- a/content/newsletter/2017-04.html
+++ b/content/newsletter/2017-04.html
@@ -141,9 +141,7 @@ In our recent community survey, we heard from a lot of you that you want more in
                 <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/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+                <a class="dropdown-item" href="/speakers/slides.html">Sample presentations</a>
               </div>
             </li>
             <li class="nav-item dropdown">
diff --git a/content/newsletter/2017-05.html b/content/newsletter/2017-05.html
index ea803e7..f2aeedd 100644
--- a/content/newsletter/2017-05.html
+++ b/content/newsletter/2017-05.html
@@ -140,9 +140,7 @@ If you blog about anything Apache related, you might want to know about http://p
                 <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/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+                <a class="dropdown-item" href="/speakers/slides.html">Sample presentations</a>
               </div>
             </li>
             <li class="nav-item dropdown">
diff --git a/content/newsletter/index.html b/content/newsletter/index.html
index bdcc8e4..659d20c 100644
--- a/content/newsletter/index.html
+++ b/content/newsletter/index.html
@@ -139,9 +139,7 @@
                 <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/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+                <a class="dropdown-item" href="/speakers/slides.html">Sample presentations</a>
               </div>
             </li>
             <li class="nav-item dropdown">
diff --git a/content/projectIndependence.html b/content/projectIndependence.html
index 74a7d22..1814489 100644
--- a/content/projectIndependence.html
+++ b/content/projectIndependence.html
@@ -139,9 +139,7 @@ A community is not merely a set of rules; it is also a set of behaviors that the
                 <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/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+                <a class="dropdown-item" href="/speakers/slides.html">Sample presentations</a>
               </div>
             </li>
             <li class="nav-item dropdown">
diff --git a/content/proposals.html b/content/proposals.html
index 76b41f7..d7bc089 100644
--- a/content/proposals.html
+++ b/content/proposals.html
@@ -138,9 +138,7 @@
                 <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/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+                <a class="dropdown-item" href="/speakers/slides.html">Sample presentations</a>
               </div>
             </li>
             <li class="nav-item dropdown">
diff --git a/content/proposals/ZestProposal.html b/content/proposals/ZestProposal.html
index 520aabf..fc61503 100644
--- a/content/proposals/ZestProposal.html
+++ b/content/proposals/ZestProposal.html
@@ -140,9 +140,7 @@ Governance of Provisional Top Level Project Provisional Top Level Project is a n
                 <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/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+                <a class="dropdown-item" href="/speakers/slides.html">Sample presentations</a>
               </div>
             </li>
             <li class="nav-item dropdown">
diff --git a/content/sitemap.xml b/content/sitemap.xml
index 07a160c..3c1ffed 100644
--- a/content/sitemap.xml
+++ b/content/sitemap.xml
@@ -14,7 +14,7 @@
   
   <url>
     <loc>https://community.apache.org/about.html</loc>
-    <lastmod>2023-03-17T09:03:09-04:00</lastmod>
+    <lastmod>2023-03-17T09:35:59-04:00</lastmod>
   </url>
   
   <url>
@@ -34,7 +34,7 @@
   
   <url>
     <loc>https://community.apache.org/newbiefaq.html</loc>
-    <lastmod>2023-03-16T11:05:50-04:00</lastmod>
+    <lastmod>2023-03-17T09:35:59-04:00</lastmod>
   </url>
   
   <url>
@@ -44,7 +44,7 @@
   
   <url>
     <loc>https://community.apache.org/speakers/slides.html</loc>
-    <lastmod>2020-12-13T10:25:55-04:00</lastmod>
+    <lastmod>2023-03-17T10:04:48-04:00</lastmod>
   </url>
   
   <url>
@@ -84,12 +84,12 @@
   
   <url>
     <loc>https://community.apache.org/committers/</loc>
-    <lastmod>2020-12-01T10:29:20-04:00</lastmod>
+    <lastmod>2023-03-17T09:35:59-04:00</lastmod>
   </url>
   
   <url>
     <loc>https://community.apache.org/committers.html</loc>
-    <lastmod>2022-02-20T11:10:20-04:00</lastmod>
+    <lastmod>2023-03-17T09:35:59-04:00</lastmod>
   </url>
   
   <url>
@@ -99,7 +99,7 @@
   
   <url>
     <loc>https://community.apache.org/about/</loc>
-    <lastmod>2023-03-17T09:03:09-04:00</lastmod>
+    <lastmod>2023-03-17T09:35:59-04:00</lastmod>
   </url>
   
   <url>
@@ -283,7 +283,7 @@
   
   <url>
     <loc>https://community.apache.org/speakers.html</loc>
-    <lastmod>2021-07-05T14:07:56-03:00</lastmod>
+    <lastmod>2023-03-17T10:04:48-04:00</lastmod>
   </url>
   
   <url>
diff --git a/content/speakers.html b/content/speakers.html
index ddf6187..0b6a365 100644
--- a/content/speakers.html
+++ b/content/speakers.html
@@ -138,9 +138,7 @@
                 <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/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+                <a class="dropdown-item" href="/speakers/slides.html">Sample presentations</a>
               </div>
             </li>
             <li class="nav-item dropdown">
diff --git a/content/speakers/index.html b/content/speakers/index.html
index bb90828..f8e55a0 100644
--- a/content/speakers/index.html
+++ b/content/speakers/index.html
@@ -140,9 +140,7 @@ Finding speakers You can use our &ldquo;Find People&rdquo; application to find s
                 <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/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+                <a class="dropdown-item" href="/speakers/slides.html">Sample presentations</a>
               </div>
             </li>
             <li class="nav-item dropdown">
diff --git a/content/speakers/index.xml b/content/speakers/index.xml
index 44d8702..588a9cb 100644
--- a/content/speakers/index.xml
+++ b/content/speakers/index.xml
@@ -17,7 +17,7 @@
       
       <guid>https://community.apache.org/speakers/slides.html</guid>
       <description>This page contains links to presentations and other key papers about the ASF and how Apache projects work that you may find useful. Many of these have been presented at ApacheCon conferences or other open source conferences.
-These presentations are available under permissive licenses; please see each individual presentation for license details. More tips and links for speakers are available.
+These presentations are available under permissive licenses; please see each individual presentation for license details.
 Many Apache speakers post their slides to the SlideShare website, and the FeatherCast podcast offers audio recordings of many talks and interviews.</description>
     </item>
     
diff --git a/content/speakers/slides.html b/content/speakers/slides.html
index 83872ea..8e9c34b 100644
--- a/content/speakers/slides.html
+++ b/content/speakers/slides.html
@@ -8,12 +8,12 @@
   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
   <meta property="og:title" content="Apache-related slides, videos and presentations" />
 <meta property="og:description" content="This page contains links to presentations and other key papers about the ASF and how Apache projects work that you may find useful. Many of these have been presented at ApacheCon conferences or other open source conferences.
-These presentations are available under permissive licenses; please see each individual presentation for license details. More tips and links for speakers are available.
+These presentations are available under permissive licenses; please see each individual presentation for license details.
 Many Apache speakers post their slides to the SlideShare website, and the FeatherCast podcast offers audio recordings of many talks and interviews." />
 <meta property="og:type" content="article" />
 <meta property="og:url" content="https://community.apache.org/speakers/slides.html" />
 <meta property="og:image" content="https://community.apache.org/images/aceu19_1.jpg"/>
-<meta property="article:modified_time" content="2020-12-13T10:25:55-04:00" /><meta property="og:site_name" content="Apache Community Development" />
+<meta property="article:modified_time" content="2023-03-17T10:04:48-04:00" /><meta property="og:site_name" content="Apache Community Development" />
 
 
   <title>Apache Community Development - Apache-related slides, videos and presentations</title>
@@ -140,9 +140,7 @@ Many Apache speakers post their slides to the SlideShare website, and the Feathe
                 <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/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+                <a class="dropdown-item" href="/speakers/slides.html">Sample presentations</a>
               </div>
             </li>
             <li class="nav-item dropdown">
@@ -204,8 +202,7 @@ Apache projects work that you may find useful.  Many of these have
 been presented at <a href="https://events.apache.org">ApacheCon conferences</a> or
 other open source conferences.</p>
 <p>These presentations are available under permissive licenses; please see
-each individual presentation for license details.  More tips and links for
-<a href="/speakers/index.html">speakers</a> are available.</p>
+each individual presentation for license details.</p>
 <p>Many Apache speakers post their slides to the <a href="//www.slideshare.net/search/slideshow?searchfrom=header&amp;q=apache+software">SlideShare website</a>,
 and the <a href="//feathercast.apache.org/">FeatherCast podcast offers audio recordings</a> of many talks and interviews.</p>
 <p>For those who prefer videos, our many volunteers have posted</p>
diff --git a/content/speakers/speakers.html b/content/speakers/speakers.html
index 465ddd6..6e9e2b1 100644
--- a/content/speakers/speakers.html
+++ b/content/speakers/speakers.html
@@ -140,9 +140,7 @@ Listing yourself as a potential speaker To list yourself as someone interested i
                 <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/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+                <a class="dropdown-item" href="/speakers/slides.html">Sample presentations</a>
               </div>
             </li>
             <li class="nav-item dropdown">
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 99cbe74..d342b7a 100644
--- a/content/use-the-comdev-issue-tracker-for-gsoc-tasks.html
+++ b/content/use-the-comdev-issue-tracker-for-gsoc-tasks.html
@@ -139,9 +139,7 @@
                 <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/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+                <a class="dropdown-item" href="/speakers/slides.html">Sample presentations</a>
               </div>
             </li>
             <li class="nav-item dropdown">