From 11078fb459fb1e377763d94d041240c8f5a736a0 Mon Sep 17 00:00:00 2001
From: Daniel Augusto Veronezi Salvador
 <38945620+GutoVeronezi@users.noreply.github.com>
Date: Wed, 12 Jun 2024 18:57:36 -0300
Subject: [PATCH 01/24] Fix typo in the reporting to board page (#383)

Co-authored-by: Daniel Augusto Veronezi Salvador <gutoveronezi@apache.org>
---
 content/foundation/board/reporting.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/foundation/board/reporting.md b/content/foundation/board/reporting.md
index 4505daaad5..35ae102c6b 100644
--- a/content/foundation/board/reporting.md
+++ b/content/foundation/board/reporting.md
@@ -316,7 +316,7 @@ The [board meeting][6] typically follows this pattern:
      reports.
  11. The Secretary sends any comments on your report by directors to your project's private@ list 
      shortly after the meeting concludes.  This gives you brief feedback 
-     from the meeting, and a chance to enage with the board either to answer questions 
+     from the meeting, and a chance to engage with the board either to answer questions 
      or to ask for advice.  If the board has questions for your project, [reply-all and answer them][8].
  12. Reports are published as part of the minutes, when approved in the subsequent monthly meeting of the
      Board of Directors.

From 6969ceb18fd1c6cb9ab2db1e7cfea586c6e0612e Mon Sep 17 00:00:00 2001
From: "Melissa Logan (she/her)" <melissalogan@apache.org>
Date: Fri, 14 Jun 2024 17:49:43 -0700
Subject: [PATCH 02/24] Update index.ezmd

Removed social links that are in the header & a dead link to an old monthly newsletter.
---
 content/index.ezmd | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/content/index.ezmd b/content/index.ezmd
index 3b278df105..4663ff6f63 100644
--- a/content/index.ezmd
+++ b/content/index.ezmd
@@ -59,9 +59,7 @@ bodytag: id="home"
     <h2 class="no-btm-margin">Latest News</h2>
  		<p>Keep up with the ASF's news and announcements by subscribing to the
    		<a href="/foundation/mailinglists.html#foundation-announce">Apache Announcements List</a>, as well as following the <a href="https://news.apache.org/">Foundation Blog</a>,
-		<a href="https://news.apache.org/foundation/entry/category/newsletter">Apache Weekly News Round-Ups</a>,
-		<a href="https://twitter.com/TheASF">@TheASF on Twitter</a>,
-		<a href="https://www.linkedin.com/company/the-apache-software-foundation/">The Apache Software Foundation on LinkedIn</a>, on the ASF's <a href="https://www.youtube.com/c/TheApacheFoundation/">YouTube channel</a>, and on <a href="https://feathercast.apache.org/">Feathercast</a>, the voice of the ASF.</p>
+		and <a href="https://feathercast.apache.org/">the Voice of Apache podcast</a>.</p>
  <!-- gm -->
      	<div class="updates blog-feed">
  <!--

From 71b1de2cb24ac337327dcff404a641fa87da8063 Mon Sep 17 00:00:00 2001
From: Jarek Potiuk <jarek@potiuk.com>
Date: Mon, 24 Jun 2024 19:49:54 +0200
Subject: [PATCH 03/24] Add potiuk to members.md

---
 content/foundation/members.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/content/foundation/members.md b/content/foundation/members.md
index 3267356218..8d6e901375 100644
--- a/content/foundation/members.md
+++ b/content/foundation/members.md
@@ -339,6 +339,7 @@ This table shows current and emeritus members who have manually added themselves
 | piergiorgio | [Piergiorgio Lucidi](https://www.open4dev.com) | [ManifoldCF](http://manifoldcf.apache.org/) , [ComDev](https://community.apache.org/)|
 | pietsch | Joerg Pietschmann |
 | pono | [Daniel Pono Takamori](https://multivariatepolynomial.xyz) | [infrastructure](https://infra.apache.org) |
+| potiuk | [Jarek Potiuk](https://potiuk.com) | [Airflow](https://airflow.apache.org) |
 | pottlinger | Philipp Ottlinger | [Creadur](https://creadur.apache.org) |
 | pquerna | [Paul Querna](http://paul.querna.org/) |
 | proyal | [Peter Royal](http://fotap.org/~osi) |

From a92c77267991fd1d66ca3eae82a023f3b1f9c901 Mon Sep 17 00:00:00 2001
From: Alin Jerpelea <alin.jerpelea@sony.com>
Date: Fri, 28 Jun 2024 09:43:15 +0200
Subject: [PATCH 04/24] Update members.md

add myself to members
---
 content/foundation/members.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/content/foundation/members.md b/content/foundation/members.md
index 8d6e901375..a577decc00 100644
--- a/content/foundation/members.md
+++ b/content/foundation/members.md
@@ -208,6 +208,7 @@ This table shows current and emeritus members who have manually added themselves
 | jcorvel | Johan Corveleyn | [Subversion](http://subversion.apache.org/) |
 | jeagles | Jonathan Eagles | [Hadoop](http://hadoop.apache.org) ; [Tez](http://tez.apache.org/) |
 | jerenkrantz | [Justin Erenkrantz](http://www.erenkrantz.com/) | [httpd](http://httpd.apache.org/) , [APR](http://apr.apache.org/) , [commons](http://commons.apache.org/) , prc , infrastructure|
+| jerpelea | Alin Jerpelea | [NuttX RTOS] (https://nuttx.apache.org/) |
 | jerrytan | Jerry Tan (Tanzhongyi) | brpc |
 | jesus | Theo Schlossnagle |
 | jfarrell | Jake Farrell |  [Thrift](http://thrift.apache.org) |

From a76ead1731e54daf7234e79c78153a2b22f2bd38 Mon Sep 17 00:00:00 2001
From: Alin Jerpelea <alin.jerpelea@sony.com>
Date: Fri, 28 Jun 2024 09:44:45 +0200
Subject: [PATCH 05/24] Update members.md

---
 content/foundation/members.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/foundation/members.md b/content/foundation/members.md
index a577decc00..0a1ea79b3e 100644
--- a/content/foundation/members.md
+++ b/content/foundation/members.md
@@ -208,7 +208,7 @@ This table shows current and emeritus members who have manually added themselves
 | jcorvel | Johan Corveleyn | [Subversion](http://subversion.apache.org/) |
 | jeagles | Jonathan Eagles | [Hadoop](http://hadoop.apache.org) ; [Tez](http://tez.apache.org/) |
 | jerenkrantz | [Justin Erenkrantz](http://www.erenkrantz.com/) | [httpd](http://httpd.apache.org/) , [APR](http://apr.apache.org/) , [commons](http://commons.apache.org/) , prc , infrastructure|
-| jerpelea | Alin Jerpelea | [NuttX RTOS] (https://nuttx.apache.org/) |
+| jerpelea | Alin Jerpelea | [NuttX RTOS](https://nuttx.apache.org/) |
 | jerrytan | Jerry Tan (Tanzhongyi) | brpc |
 | jesus | Theo Schlossnagle |
 | jfarrell | Jake Farrell |  [Thrift](http://thrift.apache.org) |

From 185a8e7a4ba418991ebd0a08ea123236c6056647 Mon Sep 17 00:00:00 2001
From: Andrew Wetmore <andrew@cottage14.com>
Date: Mon, 1 Jul 2024 11:06:55 -0300
Subject: [PATCH 06/24] Update base.html removed link to Redbubble in the
 footer

We do not currently have a 'store' presence on Redbubble
---
 theme/apache/templates/base.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/theme/apache/templates/base.html b/theme/apache/templates/base.html
index f6c42cf7ad..cc6e996864 100644
--- a/theme/apache/templates/base.html
+++ b/theme/apache/templates/base.html
@@ -235,7 +235,6 @@ <h5 class="white">Community</h5>
             <li><a href="/community-resources/">Community Resources</a></li>
             <li><a href="https://communityovercode.org/" target="_blank">Community Over Code</a></li>
             <li><a href="https://events.apache.org/" target="_blank">Events</a></li>
-            <li><a href="https://www.redbubble.com/people/comdev/shop" target="_blank">Store</a></li>
           </ul>
         </div>
 

From 06c368e612a6733a7148e7cac4e9a8b02a6da2f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=B2=20Boschi?= <boschi1997@gmail.com>
Date: Mon, 8 Jul 2024 09:29:59 +0200
Subject: [PATCH 07/24] Add nicoloboschi to members.md

---
 content/foundation/members.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/content/foundation/members.md b/content/foundation/members.md
index 0a1ea79b3e..e5da5c98fa 100644
--- a/content/foundation/members.md
+++ b/content/foundation/members.md
@@ -316,6 +316,7 @@ This table shows current and emeritus members who have manually added themselves
 | ngn | [Niklas Gustavsson](http://protocol7.com) | [MINA](http://mina.apache.org)|
 | niallp | Niall Pemberton | [Jakarta](http://jakarta.apache.org/) ; [Struts](https://struts.apache.org/)|
 | nick | Nick Burch |
+| nicoloboschi | Nicolò Boschi | [BookKeeper](https://bookkeeper.apache.org), [Pulsar](https://pulsar.apache.org) |
 | ningjiang | Willem Ning Jiang |[activemq](http://activemq.apache.org/);[camel](http://camel.apache.org);[cxf](http://cxf.apache.org); [doris](http://doris.apache.org); [iotdb](http://iotdb.apache.org); [rocketmq](http://rocketmq.apache.org); [servicecomb](http://servicecomb.apache.org); [servicemix](http://servicemix.apache.org); [shardingsphere](http://shardingsphere.apache.org); [skywalking](http://skywalking.apache.org); [weex](http://weex.apache.org); [zipkin](http://zipkin.apache.org)|
 | niq | [Nick Kew](http://home.apache.org/~niq/) | [APR](http://apr.apache.org/) ; [httpd](http://httpd.apache.org/)|
 | noel | Noel J. Bergman | [ApacheCon](http://www.apachecon.com/) , [incubator](http://incubator.apache.org/) , infrastructure , [James](http://james.apache.org/)|

From 331f9eab4bf43fb6c9a4e9c07a64f92ad5250d4f Mon Sep 17 00:00:00 2001
From: Paul Au <paul@constantia.io>
Date: Tue, 9 Jul 2024 09:57:43 -0700
Subject: [PATCH 08/24] Preview/paulau (#387)

* Updating public good form link

* Remove Target from silver sponsor

* Update buy_stuff.md (#376)

As per @rbowen on #comdev Slack, the RedBubble store has been canceled.

* Proposed fix for 372 (#377)

* Update index.md

Removed Store from list of resources because it is no longer active. cc @bproffitt

* Update index.ezmd

Added new project spotlights - Age, NuttX

* Update to latest version of pagefind (1.1.0) (#378)

* Update to pagefind 1.1.0

* How long?

* Update index.ezmd

Added Apache Storm public good story

* Grammar

* Update directors data for 2024 (#381)

* Update directors data for 2024

* Oops, remove stray TODO

* Adding bytedance as gold sponsor

* Update logo

* Fix typo in the reporting to board page (#383)

Co-authored-by: Daniel Augusto Veronezi Salvador <gutoveronezi@apache.org>

* Update index.ezmd

Removed social links that are in the header & a dead link to an old monthly newsletter.

* Add potiuk to members.md

* Update members.md

add myself to members

* Update members.md

* Update base.html removed link to Redbubble in the footer

We do not currently have a 'store' presence on Redbubble

* removing old page and bad link in nav

---------

Co-authored-by: bob <bob@apache.org>
Co-authored-by: Bertrand Delacretaz <bdelacretaz@apache.org>
Co-authored-by: Sebb <sebbASF@users.noreply.github.com>
Co-authored-by: Melissa Logan (she/her) <melissalogan@apache.org>
Co-authored-by: Daniel Augusto Veronezi Salvador <38945620+GutoVeronezi@users.noreply.github.com>
Co-authored-by: Daniel Augusto Veronezi Salvador <gutoveronezi@apache.org>
Co-authored-by: Jarek Potiuk <jarek@potiuk.com>
Co-authored-by: Alin Jerpelea <alin.jerpelea@sony.com>
Co-authored-by: Andrew Wetmore <andrew@cottage14.com>
---
 content/foundation/apachecon-rfp.md | 178 ----------------------------
 theme/apache/templates/base.html    |   1 -
 2 files changed, 179 deletions(-)
 delete mode 100644 content/foundation/apachecon-rfp.md

diff --git a/content/foundation/apachecon-rfp.md b/content/foundation/apachecon-rfp.md
deleted file mode 100644
index 9801b92770..0000000000
--- a/content/foundation/apachecon-rfp.md
+++ /dev/null
@@ -1,178 +0,0 @@
-Title:     ApacheCon North America 2012 Request For Proposals (Now Closed)
-license: https://www.apache.org/licenses/LICENSE-2.0
-
-# EXECUTIVE SUMMARY
-
-In early 2012, The Apache Software Foundation requested proposals to prepare, manage and execute the ApacheCon conference in North 
-America. ApacheCon is primarily a conference to support and grow the Apache Community.  The RFP opened on Monday 23rd January
-2012, and was open for 45 days. All submissions had to have been received by 5pm GMT on Thursday 8th March 2012 for
-them to have been considered. Submissions were sent to [rfp@apachecon.com](mailto:rfp@apachecon.com). Following the RFP, 
-[OpenBastion](http://theopenbastion.com/) were selected to produce [ApacheCon North America 2013](http://na.apachecon.com/), 
-which will take place 24th February - 2nd March 2013, in Portland, Oregon.
-
-Details of this past RFP are retained below.
-
-# APACHECON 2012 RFP (NOW CLOSED)
-
-In the interest of creating a safe and productive atmosphere, ASF recently adopted an 
-[ApacheCon Code of Conduct](/foundation/policies/anti-harassment.html) to which all Apache branded events must adhere.
-
-Successful bidders to this RFP will suggest a venue, timing and pricing in addition to a narrative plan for the event.
-
-The initial appointment will be for a single North American event only. Subsequent years and/or regions will only be 
-considered following a successful initial event, and will not be entered into at this time.
-
-
-# KEYWORDS
-
-Care has been taken in this document to use the words "must (not)", "shall (not)" and "can/may (not)" as follows:
-
- * CAN / MAY (NOT) - is optional
- * SHALL (NOT) - is advisory
- * MUST (NOT) - compels
-
-
-# BACKGROUND
-
-One purpose of this RFP is to solicit new ideas about how ApacheCon could proceed.  In the interest of informing bidders, here is some information about the history of ApacheCon. ApacheCon has been running since 2000, and in the early days saw large audiences (up to 1200), however, in recent years ApacheCon attendance in North America has decreased to around 500. (ApacheCons have also been successfully hosted in Europe and Asia, but this RFP relates initially to North America).
-
-Conference sessions have been selected from submissions to a "Call for Papers" (CFP) which were circulated throughout the Apache community.  Selected sessions have been scheduled into a multi-day "traditional conference" schedule grid over a three-day timeline that also included structured breaks and meals.  Afterhours "Meetups" and "Birds of a Feather" session slots made use of otherwise empty conference rooms to host as-hoc special interest meetings for conference attendees.  Community building plenary sessions have included "Lightning Talk" sessions and a sponsored pre-dinner.  Preceeding or following the confenernce, there has tradiationally been a "Hackathon" and/or "BarCamp", typically hosted in a subset of the venue space. These events are essentially a two-day working session for Apache Committers. 
-
-During the same two-day period we’ve typically offered separately priced half-day and full-day trainings / tutorials which are an opportunity to deep-dive into a specific project or technology.  Several of our Apache Community Members are expert trainers who have delivered this tutorial content in exchange for pay.  
-
-As the common theme of most ASF Projects is activity on the Internet, gratis attendee access to high-speed internet throughout the conference has come to be expected.
-
-At the first ApacheCon there were fewer than 5 "Apache Projects", but as of 2011 there are around 100. This fact means it is very difficult to create a single conference that is both representative of the breadth, and of sufficient technical depth to be a compelling value for "all interested parties".  
-
-Past ApacheCons have mitigated this issue by emphasizing more popular projects, although in recent years some projects have switched to hosting their own separate topic-specific conferences (such as HadoopWorld).  The ASF has granted such separate events the right to use Apache trademarks in exchange for some considerations, such as ensuring a suitable proportion of Apache-related content, and event date coordination (to avoid date collisions).
-
-ApacheCon has been successfully held at a variety of venues ranging from five-star hotel conference facilities to public municipal halls.  One of the evolving issues has been rising cost per attendee, offset by an expanding desire to affiliate the ASF with an increasingly professional face.  
-
-One very important element of the ApacheCon event has always been social aspects for our community (both the existing committers, and the conference attendees). This has traditionally occured in the evenings, often (but not always) featuring sponsored drinks. Past conference "socials" have ranged from the world premier screening of a movie about Apache, through short but informative mini talks, to a home-grown "show & tell" performed by musically or comically talented Members... This has usually occured with beer in hand (plus wine and soft drinks, though beer is by far the most popular), and venues have always been screened to ensure they allow this. These events feature "socialable" drinking, with emphasis on the social rather than the drinking, and there has been increasing drive to ensure they are welcoming to all.
-
-The Sponsorship landscape has changed over the history of ApacheCon.  Initially the ASF only engaged in fundraising activities through ApacheCon, but today ASF runs direct appeals for monetary sponsorship of the Foundation.  We need to avoid making multiple appeals to the Foundation sponsors (present and upcoming) to avoid sponsorship fatigue.  Consequently sponsorship appeals for ApacheCon must be mediated by the ASF Fundraising Committee.
-
-
-# DELIVERABLES
-
-## SESSION CONTENT
-
-The vast majority of talks must be about ASF technologies, and while some commercial content can be included, this must be clearly labelled as such, and offered on a neutral basis to all sponsors. (If commerical content is included, it must not be dominated by just one vendor) 
-
-All applicable [ASF event branding](/foundation/marks/events.html) and 
-[ASF trademark policies](/foundation/marks/) must be adhered to.  The Producer will be ultimately responsible for the session content, speaker selection, track organization, session scheduling and length.
-
-## KEYNOTES
-
-The ASF must pick one keynote topic and must reserve the right to reject or request modification of other keynotes.
-
-## TRAININGS / TUTORIALS
-
-The Producer can be responsible for the training content, trainer selection, training organization, scheduling and length.
-
-## ASF RESOURCES AVAILABLE TO PRODUCER
-
-The ASF may have volunteer resources available to assist in talk selection and other conference functions.
-
-The ASF may recommend volunteers or for pay consultants for talk selection, talk presentation, trainings, and other conference functions.
-
-The ASF shall supply the Producer with communication channels to its member and committer base for purposes needed by the Producer.  The ASF will moderate such messages prior to release to the community.  Producer must be aware that such messages will be publicly visible and archived, and furthermore the ASF may broaden the audience of such messages by re-posting them as they see fit.
-
-
-## COST
-
-The event shall be affordable by our community.  
-
-The ASF believes that by having our community participate, this benefits both our community and creates a draw for the general public. To support our goals of community building, enough of our community must be able to afford to attend at least part of the event. This could be via low pricing, could be though discounts to ASF members and committers, could be via large numbers of speakers receiving support, could be via co-located community events, but most likely will be a suitable combination of these.
-
-
-## COMMUNITY EVENTS
-
-The Producer can co-locate low or no cost community events or create community building events of their own (within the scope of the branding guidelines).  If low or no cost community events are not part of the Producer's proposal, the ASF may encourage or directly support a nearby event.  Low cost community building is more important than profit sharing with the ASF.
-
-The ApacheCon conference must be branded as such, and for branding purposes must not be overshadowed by co-located events.
-
-
-## Schedule
-
-A draft copy of the conference schedule shall be prepared and submitted to the ASF no less than 90 days prior to the event.
-
-
-## Marketing and Publicity Material Review
-
-The Producer must submit all publicly released marketing and/or PR materials to the ASF at least three (3) days in advance, for review by the ASF.  The ASF may veto and/or propose corrections to the material during that timeframe.  Should the ASF not respond during this period, the Producer must not be held responsible for the integrity of such material.  Regardless, if a "late correction" is found, the Producer shall work with the ASF to correct the situation as possible under the circumstances.
-
-The cost of Marketing and Publicity is the responsibility of the Producer.
-
-## Conference website
-
-The Producer must supply a website for the conference. The Producer must be responsible for content and hosting of any Producer delivered website until the end of the event.  The conference website must be under the apachecon.com domain.  The Producer must provide a list of any non-ASF technologies used in hosting any Producer provided website.  The website content must be transferable to the ASF following the conference for archiving purposes.
-
-## Registration
-
-The registration system must easily handle registrations for international and domestic attendees. The Administrative requirements for international attendees (including, but not limited to, invite letters for visas) must be the Producer's responsibility.
-
-## Sessions Recordings
-
-The proposal must include options and costs of recording sessions: Audio, Video, and Slides. These recordings would be transferred to the ASF 30 days after the end of the event, under a suitable license to allow the ASF to redistribute them.
-
-The ASF shall host recordings and session material after the event. 
-
-## Venue
-
-The Producer must provide a venue, with all associated costs managed exclusively by the Producer.
-
-Venue must include unrestricted Internet connectivity capable of handling heavy Internet usage for wireless users and must have the capability of delivering wired connections where needed by presenters and sponsors.
-
-Venue must include power in tutorial sessions over 2 hours in length and can include electric power sockets available in lounge areas and sessions.
-
-Venue can include on-site snacks, meals, and a range of beverages both alcoholic and non-alcoholic.  Venue shall allow the consumption of alcoholic beverages, regardless of whether or not they provide them on-site.
-
-## Privacy Policy
-
-The Producer must submit and maintain a privacy policy for the general public.  Among other things, this policy must allow registrants to opt-out of email communications from the Producer.
-
-
-# BID REQUIREMENTS
-
-The bid proposal must describe their understanding of Apache technologies, the ASF and the "Apache Community". It should include documentation that details relevant experience within the technology industry and highlights past events produced in the Open Source sector.
-
-The bid proposal shall thoroughly describe the services provided for similar events (detailing work in planning, coordination, implementation, etc., across each work area - content/programming, pre-event logistics, contract negotiation, venue selection, marketing/outreach, PR, website development, registration process management, sponsorship sales cultivation, production, on-site supervision, speaker liaison, etc.)
-
-The bid proposal shall specify one or more suggested venues and dates.  
-
-The bid proposal shall specify a suggested theme and layout for the conference.  It is understood that the proposed information may be changed by the Producer based on the collection of conference material and the ASF must be notified of this change.
-
-The bid proposal shall provide samples of collateral, including website copy, press releases, media alerts and advisories, advertisements, marketing outreach communications and emails, and speaker communications previously prepared by the Producer. The Producer shall demonstrate strong writing skills for media campaigns, delegate/sponsor email marketing communications, social media, and other outlets.
-
-The bid proposal shall demonstrate Producer's experience in meeting deadlines, achieving concrete deliverables, and describe day-to-day interaction, processes, and reporting during the project life cycle.
-
-The bid proposal shall describe and demonstrate the Producer's ability to respond to and handle crisis situations/communications.
-
-The bid proposal shall include a list of all proposed key staff members who will be performing services under the contract. For the key positions, this list shall include team bios, detailing relevant experience in relation to the role performed, and a thorough description of their knowledge or other credentials that demonstrates subject matter/industry expertise.
-
-The bid proposal must provided at least one, and shall provide at least three client corporate references who have received similar services. At least one of those references shall be from a similar industry organization/event such as Apache/ApacheCon. List of references shall include: name and date(s) of event, specific services performed, timeframe of services performed, reference contact name, title, phone number and email.
-
-The bid proposal must include estimated price points for full-price and discounted attendance.
-
-The bid proposal must include a sample contract.  The bid proposal may include a draft contract for execution of this specific event.
-
-The bid should be submitted to [rfp@apachecon.com](mailto:rfp@apachecon.com) no later than 5pm GMT on Thursday 8th March 2012 to be considered.
-
-During the bid process, potential bidders may ask for clarification on things relating to the requirements, or information on 
-past events (where that information is not readily available from archives and coverage). Where possible, we will aim to reply 
-to questions within 3 working days. In the interests of fairness, the answer and the question will be distributed to other 
-interested bidders. If you would like to be notified of these, please inform us at 
-[rfp@apachecon.com](mailto:rfp@apachecon.com).
-
-
-# CONTRACT REQUIREMENTS
-
- * The ASF must not assume risk or liability, and this must be included in the contract
- * The ASF must not receive invoices for services not explicitly presented in the contract
- * After the event, the ASF must receive a list of all attendees, including
-    contact details and basic demographics (as captured by the Producer)
- * The ASF must provide a list of organisations who may not be directly
-    contacted by the Producer about sponsorship of an event, except with
-    written approval by the ASF fundraising committee
- * The contract will be for a single event
diff --git a/theme/apache/templates/base.html b/theme/apache/templates/base.html
index cc6e996864..3a6310ba1b 100644
--- a/theme/apache/templates/base.html
+++ b/theme/apache/templates/base.html
@@ -120,7 +120,6 @@
                 <li><a href="/community-resources/">Community Resources</a></li>
                 <li><a href="https://communityovercode.org/" target="_blank">Community Over Code</a></li>
                 <li><a href="https://events.apache.org/" target="_blank">Events</a></li>
-                <li><a href="https://www.redbubble.com/people/comdev/shop" target="_blank">Store</a></li>
               </ul>
             </li>
             <li class="dropdown">

From a620ef9333e013654eb65e1c1df3feb5885b4b4f Mon Sep 17 00:00:00 2001
From: tison <wander4096@gmail.com>
Date: Sun, 14 Jul 2024 11:40:31 -0700
Subject: [PATCH 09/24] Update glossary for Incubator-related terms (#388)

Signed-off-by: tison <wander4096@gmail.com>
---
 content/foundation/glossary.md | 51 ++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/content/foundation/glossary.md b/content/foundation/glossary.md
index 62aba489c6..4ffd3dc867 100644
--- a/content/foundation/glossary.md
+++ b/content/foundation/glossary.md
@@ -317,6 +317,33 @@ describe a [project](#Project) with low levels of activity.
 
 </dd>
 
+<dt>Incubator {#Incubator}</dt>
+
+<dd>
+
+[The Incubator](https://incubator.apache.org/) provides services to
+projects which want to enter the ASF.
+
+It helps those incoming projects (called ["podlings"](#Podling)) adopt
+the Apache style of governance and operation and guides them to the ASF
+services available to our projects so they can become top-level
+ASF projects (["TLPs"](#TLP)).
+
+</dd>
+
+<dt>IPMC {#IPMC}</dt>
+
+<dd>
+
+Incubator [Project Management Committee](#PMC).
+
+Since the Apache Incubator is also a top-level ASF project, it has its own
+PMC as well.
+
+Members of the IPMC can acts as a [podling's](#Podling) [mentor](#Mentor).
+
+</dd>
+
 <dt>Karma  {#Karma}</dt>
 
 <dd>
@@ -368,6 +395,18 @@ process](voting.html).
 
 </dd>
 
+<dt>Mentor  {#Mentor}</dt>
+
+<dd>
+
+Also called 'incubation mentors'.
+
+The [Incubator](#Incubator) delegates a few mentors for each podling to
+act as liaisons with the various ASF teams: [Incubator PMC](#IPMC), Infrastructure team,
+etc., and facilitate the podling’s growth and operations.
+
+</dd>
+
 <dt>Member  {#Member}</dt>
 
 <dd>
@@ -506,6 +545,18 @@ process](http://incubator.apache.org/incubation/Process_Description.html).
 
 </dd>
 
+<dt>PPMC  {#PPMC}</dt>
+
+<dd>
+
+[Podling Project Management Committee](#PPMC), the group of people with formal
+oversight of a [podling](#Podling).
+
+PPMC doesn't have a chair. It runs under the oversight of [IPMC](#IPMC),
+espeically the [mentors](#Mentors) of the podling.
+
+</dd>
+
 <dt>President  {#President}</dt>
 
 <dd>

From b9b03a3f549dbc9bf675eb183a695dff2f3a18f2 Mon Sep 17 00:00:00 2001
From: Jarek Potiuk <jarek@potiuk.com>
Date: Wed, 17 Jul 2024 04:59:09 +0200
Subject: [PATCH 10/24] Correct the link for new PMC member to `newpmcmember`
 from `newpmc` (#389)

There were a few documentation links (in comdev site mainly) that
lined to #newpmc anchor, and since the links were shown
verbatim in the page, they could be misunderstood - it was not about
new PMC but about new PMC menber, and since we are now reminding
projects that they should not invite "new PMC" but "new PMC member",
correcting it in the link is a good thing to do.

Separate PR in comdev site corrects those links (and changes them
to be replaced with "New PMC member" name.
---
 content/board/policies.md             | 2 +-
 content/dev/pmc.md                    | 4 ++--
 content/dev/project-requirements.md   | 2 +-
 content/foundation/governance/pmcs.md | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/content/board/policies.md b/content/board/policies.md
index fb70d460ea..492a8a5d78 100644
--- a/content/board/policies.md
+++ b/content/board/policies.md
@@ -32,7 +32,7 @@ and/or to the board.
 
   * Project discussions SHOULD use normal ASF-hosted dev@, user@, and similar mailing lists.
 
-  * Projects MAY use their own documented consensus process, or a VOTE, to decide on any [new committers](//www.apache.org/dev/pmc.html#newcommitter) or [PMC members](//www.apache.org/dev/pmc.html#newpmc).
+  * Projects MAY use their own documented consensus process, or a VOTE, to decide on any [new committers](//www.apache.org/dev/pmc.html#newcommitter) or [PMC members](//www.apache.org/dev/pmc.html#newpmcmember).
 
 ### Operate Independently And For The Public Good ([Board](https://whimsy.apache.org/foundation/orgchart/board))
 
diff --git a/content/dev/pmc.md b/content/dev/pmc.md
index a5c201d7f3..769ffa42ba 100644
--- a/content/dev/pmc.md
+++ b/content/dev/pmc.md
@@ -158,7 +158,7 @@ the new committer has [karma](#newcommitter) (access) to the project repositorie
 ### Send NOTICEs and followup when adding PMC members
 The chair is responsible for sending the NOTICE email to the board, then
 updating [committee-info.txt](https://svn.apache.org/repos/private/committers/board/committee-info.txt)
-and the LDAP committee group after the candidate accepts -- see the [detailed procedure](#newpmc).
+and the LDAP committee group after the candidate accepts -- see the [detailed procedure](#newpmcmember).
 
 ### Maintain ASF records on the PMC roster
 Maintain information about your PMC's composition in the SVN "committers" repository
@@ -284,7 +284,7 @@ See also [why would a project move to the Attic?](pmc.html#move-to-attic), above
 
 ## PMC membership management  {#pmcmembers}
 
-### How to add a PMC member  {#newpmc}
+### How to add a PMC member  {#newpmcmember}
 
 The usual process for adding a member to a PMC is to:
 
diff --git a/content/dev/project-requirements.md b/content/dev/project-requirements.md
index 5963aa3124..fe4fcc7c82 100644
--- a/content/dev/project-requirements.md
+++ b/content/dev/project-requirements.md
@@ -36,7 +36,7 @@ ASF-wide policies, as well as for providing various services to all Apache proje
 
 * Project discussions SHOULD use normal ASF-hosted dev@, user@, and similar mailing lists.
 
-* Projects MAY use a documented consensus process or a VOTE for any [new committers](/dev/pmc.html#newcommitter) or [PMC members](/dev/pmc.html#newpmc), and carefully follow policies for recording ICLAs and granting access.
+* Projects MAY use a documented consensus process or a VOTE for any [new committers](/dev/pmc.html#newcommitter) or [PMC members](/dev/pmc.html#newpmcmember), and carefully follow policies for recording ICLAs and granting access.
 	
 # Technical  {#technical}
 
diff --git a/content/foundation/governance/pmcs.md b/content/foundation/governance/pmcs.md
index 4e214948d0..892dfeff8b 100644
--- a/content/foundation/governance/pmcs.md
+++ b/content/foundation/governance/pmcs.md
@@ -60,7 +60,7 @@ accepts the offer of membership, the PMC chair may update the official roster
 of the members of that PMC. The process is designed to ensure that the board
 has explicit notification of all PMC changes. 
 
-For more details on the process, read [Adding a new PMC member](/dev/pmc.html#newpmc)
+For more details on the process, read [Adding a new PMC member](/dev/pmc.html#newpmcmember)
 
 For people leaving the PMC, read [A PMC member wishes to be resign/go emeritus. Now what?](/dev/pmc.html#emeritus)
 

From 2c5cc985315285f36b2452a2ea2f4000fbe60f90 Mon Sep 17 00:00:00 2001
From: Rich Bowen <rbowen@rcbowen.com>
Date: Thu, 25 Jul 2024 09:08:21 -0400
Subject: [PATCH 11/24] =?UTF-8?q?Mention=20lists.apache.org=20as=20the=20p?=
 =?UTF-8?q?referred=20way=20to=20link=20to=20mailing=20list=E2=80=A6=20(#3?=
 =?UTF-8?q?91)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Mention lists.apache.org as the preferred way to link to mailing list threads.

* typos
---
 content/foundation/board/reporting.md | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/content/foundation/board/reporting.md b/content/foundation/board/reporting.md
index 35ae102c6b..9a6de57e2d 100644
--- a/content/foundation/board/reporting.md
+++ b/content/foundation/board/reporting.md
@@ -153,7 +153,7 @@ chair should consider each of these questions when writing a report.
      A healthy project will often be working towards a common goal, or have a shared
      understanding of what is being done next - even if individual contributors have their
      own "itches". What are the main features being worked on? What releases are planned?
-     Are there any specific efforts or branches of development under way? Provide a summary, without going depply into the technical details.
+     Are there any specific efforts or branches of development under way? Provide a summary, without going deeply into the technical details.
      
      Aside from the report, if the project is planning major announcements, get in touch with the Marketing and Publicity Committee at `press@apache.org` to coordinate announcements and press releases.
      
@@ -217,7 +217,10 @@ chair should consider each of these questions when writing a report.
  
  - Do not use non-Apache URL shorteners.
  
-      If you have a long URL you wish to include in your report, **only** use the `https://s.apache.org/` URL shortener (Apache login required) to provide a shorter link. Apache cannot control how long an external URL shortener will exist, or will maintain a given shortened URL.   
+      If you have a long URL you wish to include in your report, **only** use the `https://s.apache.org/` URL shortener (Apache login required) to provide a shorter link. Apache cannot control how long an external URL shortener will exist, or will maintain a given shortened URL.
+      If you mention a mailing list thread, **only** use the
+      `https://lists.apache.org` URL to that mailing list thread, for
+      the same reason.
 
 - There's no need to include details about committer affiliations in a report, unless the information points to an issue around diversity which may be included privately.
 
@@ -312,7 +315,7 @@ The [board meeting][6] typically follows this pattern:
      outcomes.
   9. Any project reports that were not approved or were missing are added to the reminder list for the
      subsequent month.
- 10. Shepherds reach out to project chairs with specific action items arising in the meeting in reponse to their
+ 10. Shepherds reach out to project chairs with specific action items arising in the meeting in response to their
      reports.
  11. The Secretary sends any comments on your report by directors to your project's private@ list 
      shortly after the meeting concludes.  This gives you brief feedback 

From 430bea3ae63fc8a22af0d816c4ce8f341b37cfd9 Mon Sep 17 00:00:00 2001
From: Mark Thomas <markt@apache.org>
Date: Fri, 26 Jul 2024 11:20:39 +0100
Subject: [PATCH 12/24] Remove page. 7 years out of date. Not linked from
 anywhere on ASF main site.

---
 content/foundation/marks/operations.md | 510 -------------------------
 1 file changed, 510 deletions(-)
 delete mode 100644 content/foundation/marks/operations.md

diff --git a/content/foundation/marks/operations.md b/content/foundation/marks/operations.md
deleted file mode 100644
index bea18af0f7..0000000000
--- a/content/foundation/marks/operations.md
+++ /dev/null
@@ -1,510 +0,0 @@
-Title: Brand Management Quarterly Operations Summary
-license: https://www.apache.org/licenses/LICENSE-2.0
-
-# {{title}}
-
-Historical records of public operations summaries of the ASF Trademarks Committee.
-
-**Contents**
-
-<div class=".pull-right" style="float:right; border-style:dotted; width:200px; padding:5px; margin:5px">
-
-See Also: [Trademark Resources Site Map][resources].
-
-</div>
-
-[TOC]
-
-### Brand Management Monthly Reports To The Board
-
-Formally published reports from Brand Management are included in the 
-[official board meeting minutes](https://whimsy.apache.org/board/minutes/Brand_Management) of the ASF.
-
-
-### Q2 Operations Summary - December 2017 (FY 2018)
-
-The fall quarter in the Northern Hemisphere brings a regular uptick 
-in requests and questions, which continues to require effort to provide 
-timely and complete answers to questioners, especially outside parties.
-
-We've also seen a large uptick in requests to create non-computer 
-merchandise (shirts, giveaways, etc.) using Apache brands.  Most of 
-these requests are a good way to help promote awareness of Apache 
-projects and their contributors, and are well in line with our policy:
-
-[https://www.apache.org/foundation/marks/merchandise](/foundation/marks/merchandise)
-
-While a few Apache project PMCs continue to actively monitor uses 
-of their brand and raise issues appropriately, the rapid growth in 
-popular projects, both in the big data space and elsewhere, continues 
-to be an issue with our capacity to provide knowledgeable and timely 
-responses to questions.  We will be investigating new ways to invest 
-in our ability to provide the branding and trademark services that 
-our many Apache projects deserve.
-
-All of the ASF's education and policies around trademark law for Open
-Source as well as brand management are published online, and we urge
-project participants and software vendors alike to review and ask us
-questions about them - please review our complete site map:
-
-  [http://www.apache.org/foundation/marks/resources](/foundation/marks/resources)
-
-On the registration front, we continue to work with counsel to process 
-renewals and registrations for projects.  While most are straightforward, 
-some are complex, and require a significant amount of both our limited 
-volunteer officer time as well as our counsel's time.
-
-As Apache projects power more of the internet every day, we
-look to the companies that profit from Apache software products to
-fully respect Apache brands. We very much appreciate the companies that
-pass on their **completed** trademark registrations along with the 
-codebases they donate to the Apache Incubator. Having existing 
-registrations makes managing trademarks much simpler for the ASF.
-
-While many companies continue to give credit to our volunteer
-communities, sadly some companies continue to 
-take advantage of our non-profit work by unfairly co-opting Apache
-project brands or by interfering with Apache project governance.
-Reviewing and correcting these mis-uses is an ongoing effort for the ASF
-Board, the Brand Management Committee, and all Apache projects.
-
-Please [contact the Apache Brand Management team][contactus] with your 
-questions or suggestions!
-
-> Shane Curcuru, Vice President ASF Brand Management
-
-
-### Q1 Operations Summary - September 2017 (FY 2018)
-
-The summer quarter continues to be traditionally quiet in terms of 
-trademark questions and requests, although we continue to get new 
-kinds of questions coming in with some regularity.  Some Apache 
-project PMCs now have experience implementing our trademark policies 
-and have been doing a great job answering basic questions themselves 
-directly with third parties, which is great to see.  However as our 
-number of projects grow, so do the number of questions or issues 
-overall which continues to tax our small pool of Brand Management 
-volunteers with broad experience.
-
-All of the ASF's education and policies around trademark law for Open
-Source as well as brand management is published online, and we urge
-project participants and software vendors alike to review and ask us
-questions about them - please review our complete site map:
-
-  [http://www.apache.org/foundation/marks/resources](/foundation/marks/resources)
-
-On the registration front, we have come upon our first large set of 
-trademark registration renewals and maintenance paperwork.  Although 
-our legal counsel handles all the actual paperwork with various 
-national trademark registries, this is still an ongoing effort for our 
-volunteer Brand Management team to validate continuing use of these 
-marks - as well as the financial costs for registry fees.  In almost 
-all cases we will continue to maintain existing registrations for 
-projects.  We continue to have some projects request new registrations
-as well, and are successfully negotiating some coexistence agreements 
-with potentially similar software brands in the marketplace as well.
-
-As more Apache brands and projects power more business every year, we
-continue to look to the companies that profit from Apache software products to
-help respect Apache brands. We very much appreciate the companies that
-pass on their trademark registrations with incoming donations of
-podlings joining the Incubator. Having existing registrations makes the
-trademark management process simpler for the ASF.
-
-While many companies continue to properly give credit to our volunteer
-communities, sadly some companies continue to --or have started to--
-take advantage of our non-profit work by unfairly co-opting Apache
-project brands or by interfering with Apache project governance.
-Reviewing and correcting these mis-uses is an ongoing effort for the ASF
-Board, the Brand Management Committee, and all Apache projects.
-
-Please [contact the Apache Brand Management team][contactus] with your 
-questions or suggestions!
-
-> Shane Curcuru, Vice President ASF Brand Management
-
-
-### Annual Report June 2017 (FY 2017)
-
-#### Operational Trends
-
-We continues to field both general questions and permissions requests 
-for a wide variety of brand uses.  Along with questions about using Apache project 
-marks in unusual places, including television, movies, and a variety of 
-academic papers and vendor marketing, we've had questions about the 
-applicability of the APACHE (R) trademark to licenses themselves.  While 
-we have the expertise to help answer these questions, it is still 
-difficult to keep all our operations proceeding speedily while relying 
-solely on volunteers for all work that doesn't directly require counsel.
-
-Some projects continue to do a good job of policing and addressing 
-potential misuses of their brands, and the strength of the Apache brand  
-continues to get good results when we request the trademark credit our 
-volunteer communities deserve.
-
-#### New Policy Initiatives
-
-Part of the Brand Management Committee has discussed and written new 
-policies to clarify proper uses of Apache brands and to address many 
-new permissions requests for apparel featuring Apache project brands.
-
-While the ASF is firmly committed to providing free access to our source 
-code and all resources, we are happy to allow respectful vendors to 
-use selected Apache trademarks on non-computer related goods, like 
-apparel, stickers, and the like.  These uses can both publicize project 
-brands as well as encourage a sense of community for Apache project fans.
-Free giveaways are generally fine, and the ASF now has a policy for 
-licensing specific brands to apparel or sticker companies with a clear
-license and profit sharing arrangement.
-
-- [See the new Apache Non-Software Merchandise Branding Policy](/foundation/marks/merchandise)
-
-Our new [Third Party Services Naming Branding Policy](/foundation/marks/services)
-clarifies the use of Apache brands in services, for example the many cloud 
-or hosting providers who offer services around Apache software products.
-In addition, a greatly expanded [Apache Product Name Usage Guide](/foundation/marks/guide)
-will help marketers and technologists alike better refer to Apache 
-communities and the software products they produce.
-
-#### Statistics And Registrations
-
-With several guides for how Apache project communities can improve their 
-brands, better attract new contributors, and register their project 
-name as a trademark, we offer comprehensive advice for all Apache 
-projects and podlings.  We at Brand Management are happy to work with 
-all Apache projects to answer questions or submit registration 
-applications, but it's still up to the individual Apache communities 
-to take the first step and request registration.
-
-In the past year, 11 new projects have made trademark applications in 
-the US and other countries, 5 projects have had their registrations 
-granted, and two incoming podlings have had their existing trademark 
-registrations transferred to the ASF as part of their graduation to 
-top level project status.
-
-Please [contact the Apache Brand Management team][contactus] with your 
-questions or suggestions!
-
-> Shane Curcuru, Vice President ASF Brand Management
-
-
-### Q3 Operations Summary: March 2017 (FY 2017)
-
-Over the past few years, the Brand Management committee has been working
-on a comprehensive set of trademark policies and procedures to help our
-volunteer-run communities best protect their shared brand of Apache
-project independence. During the holiday lull at the end of the year,
-we've worked on drafting policies for use of Apache brands in services
-and hosting, as well as detailed policies for producing merchandise
-(apparel, stickers, and non-computer goods) using any Apache project's
-names or logos. This is timely, as a number of apparel vendors have
-approached us recently for licensing agreements. These products can both
-provide a way for people to show support for Apache projects, as well as
-donations of profits from the vendors.
-
-All of the ASF's education and policies around trademark law for Open
-Source as well as brand management is published online, and we urge
-project participants and software vendors alike to review and ask us
-questions about them: http://www.apache.org/foundation/marks/resources
-
-On the registration front, we are facing more potential conflicts with
-the few projects that request registrations than in the past. The
-limitations of having a volunteer-run organization with nearly 200
-active projects means that managing which registrations to fight for is
-still a complex problem to work through.
-
-As more Apache brands and projects power more business every year, we
-look to the many companies that profit from Apache software products to
-help respect Apache brands. We very much appreciate the companies that
-pass on their trademark registrations with incoming donations of
-podlings joining the Incubator. Having existing registrations makes the
-trademark management process simpler for the ASF.
-
-While many companies continue to properly give credit to our volunteer
-communities, sadly some companies continue to --or have started to--
-take advantage of our non-profit work by unfairly co-opting Apache
-project brands or by interfering with Apache project governance.
-Reviewing and correcting these mis-uses is an ongoing effort for the ASF
-Board, the Brand Management Committee, and all Apache projects.
-
-Please [contact the Apache Brand Management team][contactus] with your 
-questions or suggestions!
-
-> Shane Curcuru, Vice President ASF Brand Management
-
-
-### Q2 Operations Summary - December 2016 (FY 2017)
-
-The ASF continues to be at the forefront of what's really a new kind of
-organization, where our independently governed and distributed volunteer
-communities are in charge of managing not just their technologies and
-communities, but their trademarks and their whole brand and presence in
-the larger world.  We continue to build new educational materials to
-help our highly technical communities understand the larger implications
-of managing the brand and outward impact of their projects, including
-proper trademark maintenance.
-
-The ASF is seen as a leader in trademark and brand policies, and our
-example is helping other FOSS communities as well as companies better
-understand how we can work together fairly and productively.   Our
-community-focused education and policy materials are the best available,
-and we recently expanded to provide a more generic module on Practical
-Trademark Law for FOSS projects.  We continue to work on improving
-education and mentoring for projects to ensure they understand how to
-best maintain their independent brand and image.
-
-All of the ASF's education and policies around trademark law for open
-source as well as brand management is published online, and we urge
-project participants and software vendors alike to review and ask us
-questions about them:
-
-  http://www.apache.org/foundation/marks/resources
-
-On the registration front, we continue to get some projects who request
-registration of names or beloved logos in the US and internationally. We
-continue to exercise financial care with our budget by working with the
-relevant project communities to detail why registration is important for
-them to attract new project contributors around the world.
-
-With the continued rise of prominent Apache brands and projects that
-power more business every year, we look to the many companies that
-profit from Apache software products to help respect Apache brands.
-While many companies continue to properly give credit to our volunteer
-communities, sadly some companies continue to --or have started to--
-take advantage of our non-profit work by unfairly co-opting Apache
-project brands or by interfering with Apache project governance.
-Reviewing and correcting these mis-uses is an ongoing effort for the ASF
-Board, the Brand Management Committee, and all Apache projects.
-
-The Apache Brand Management team welcomes your questions on our private
-email list: trademarks@apache.org
-
-> Shane Curcuru, Vice President ASF Brand Management
-
-
-### Q1 Operations Summary - September 2016 (FY 2017)
-
-Our Foundation-wide educational and policy improvement work continues to
-pay off, as more Apache projects are getting organized about maintaining
-and promoting their brands in a more organized fashion. Some projects
-are continuing work on their own detailed how-to guides for companies
-that want to *properly* use valuable Apache brands as part of their
-products or Web presences.  However the rapid growth in new projects in
-the Incubator means that more help spreading the education to new
-communities is still needed.
-
-Our detailed list of resources, both Apache policies as well as pointers
-to other valuable open source branding guidelines and information is
-improving our ability to respond, as seen by the more detailed questions
-we get from third parties, as well as by the ability of some experienced
-projects to handle brand enforcement more independently.
-http://www.apache.org/foundation/marks/resources
-
-While open source and the project communities are well understood in
-industry these days, open source *governance* and brand management are
-becoming more important topics.  The ASF is seen as a leader in
-governance and brand policing, and our example is helping other FOSS
-communities as well as companies better understand how we can work
-together fairly and productively.
-
-On the registration front, we continue to get some projects who request
-registration of names or beloved logos in the US and internationally.
-We continue to exercise financial care with our budget by working with
-the relevant project communities to detail why registration is important
-for them to attract new project contributors around the world.
-
-With the continued rise of prominent Apache brands and projects that
-power more business every year, we look to the many companies that
-profit from Apache software products to help respect Apache brands.
-While many companies continue to properly give credit to our volunteer
-communities, sadly some companies continue to - or have started to -
-take advantage of our non-profit work by unfairly co-opting Apache
-project brands.  Reviewing and correcting these mis-uses is an ongoing
-effort for the ASF and all Apache projects.
-
-You can always ask the Apache Brand Management team private questions at
-trademarks@apache.org
-
-> Shane Curcuru, Vice President ASF Brand Management
-
-
-### Annual Report - June 2016 (FY 2016)
-
-While Foundation-wide educational and policy improvement work continues,
-we are still finding communities that need more help in reviewing their
-brand and presence, and in keeping a focus on reviewing uses of their
-brand by vendors. While many companies support Apache projects in a
-variety of ways, new brand misuses continue to crop up across various
-Apache projects that need to be dealt with.
-
-Our detailed list of resources, both Apache policies as well as pointers
-to other valuable Open Source branding guidelines and information is
-continuing to improve with more detailed process guides for community
-brand management.
-
-http://www.apache.org/foundation/marks/resources
-
-Our VP, Brand Management gave an expanded community branding talk at
-ApacheCon in Vancouver with great feedback, showing the benefits of a
-better brand and Website in terms of attracting new contributors. They
-were also an invited keynote speaker at the FLOSS Community Metrics
-conference, as well as leading several Community Leadership SummIt
-unconference sessions on community-led branding and governance topics. A
-BOF at OSCON Austin also gave another opportunity to showcase how Apache
-projects think about their brands to many other FOSS communities.
-
-The feedback from these sessions was positive, and shows a clear need
-for more education and help for FOSS communities around the ecosystem.
-While licensing is well understood, and community governance has plenty
-of leaders across the software world, brand management and trademark
-knowledge is still lacking in many communities. The ASF is clearly
-serving as a leader in this space through our examples and materials.
-
-With the rise of both prominent Apache brands as well as a number of
-other major movements showcasing how important vendor neutral Open
-Source project branding can be, we also welcome feedback from the many
-organizations that both use Apache software to power their business, as
-well as extend our thanks to those who contribute code to our projects
-and those who respect Apache brands.
-
-You can always ask the Brand Management team private questions at:
-trademarks@apache.org
-
-> Shane Curcuru, Vice President ASF Brand Management
-
-
-#### Q3 Operations Summary - March 2016 (FY 2016)
-
-Our Foundation-wide educational and policy improvement work continues to
-pay off, as more Apache projects are getting organized about maintaining
-and promoting their brands in a more organized fashion.  There is still
-a wide variety of experience and attention about proper branding and
-policing across our diverse volunteer communities, several projects are
-working on their own detailed how-to guides for companies that want to
-*properly* use valuable Apache brands as part of their products or web
-presences.
-
-Our detailed list of resources, both Apache policies as well as pointers
-to other valuable open source branding guidelines and information is
-improving our ability to respond, as seen by the more detailed questions
-we get from third parties, as well as by the ability of some projects to
-handle brand enforcement more independently.
-
-  http://www.apache.org/foundation/marks/resources
-
-While open source and the project communities are well understood in
-industry these days, open source *governance* and brand management are
-becoming more important topics.  The ASF is often seen as a leader in
-governance and brand policing, both due to our strong history of
-independent governance as well as from our wide variety of popular
-projects spanning all software technologies.  We will continue to
-provide more education and guidance for our projects, as well as
-improving and smoothing relations with vendors using our brands to
-ensure that our volunteer project communities always get the credit they
-deserve for building Apache software.
-
-On the registration front, our projects are really beginning to respond,
-and many more projects are requesting both US registrations, as well as
-a variety of international registrations; including in one case a
-request to register a particularly detailed project logo.  We continue
-to exercise financial care with our budget by working with the relevant
-project communities to detail why registration is important for them to
-attract new project contributors around the world.
-
-With the rise of both prominent Apache brands as well as a number of
-other major movements showcasing how important vendor neutral open
-source project branding can be, we also welcome feedback from the many
-organizations that both use Apache software to power their business, as
-well as extend our thanks to those who contribute code to our projects.
-
-> Shane Curcuru, Vice President ASF Brand Management
-
-
-#### Q2 Operations Summary - December 2016 (FY 2016)
-
-The brand management team continues to work on educational materials to
-help promote our many Apache project brands, as well as showing our
-volunteer communities effective ways to police third party use of Apache
-project brands.  We now have a detailed list of trademark and branding
-resources available for our communities as well as vendors who work with
-Apache projects:
-
-  http://www.apache.org/foundation/marks/resources
-
-Along with presenting on trademark basics at ApacheCon conferences, our
-VP of Brand Management was invited to speak on a panel discussion about
-community owned trademarks at Columbia Law School, at SFLC's annual
-conference.  Improving awareness of the importance of trademarks to our
-communities as well as to the Foundation is critical in ensuring
-long-lived and widely-contributed to software projects.
-
-We are also continuing to seek US trademark registrations for projects
-that ask for one, as well as improving our ability to register selected
-Apache project brands in other countries with our limited budget.
-
-> Shane Curcuru, Vice President ASF Brand Management
-
-
-### Annual Report - June 2015 (summary FY 2015)
-
-The Apache(R) brand holds a unique position in the software world, in
-that it is associated with communities and technologies in a wide
-variety of industries.  Apache software technology powers webservers,
-office suites, high performance search engines, a full stack of software
-development tools, geospatial work, and more than a dozen different big
-data technologies, including Apache Hadoop(R).  Similarly, Apache
-communities are often used as models for open source project behavior
-and bylaws by companies and other foundations alike.
-
-A key driver for innovation within Apache projects is the *independent*
-community governance model that the ASF provides.  Part of the Apache
-Way and a requirement for all Apache projects is that they must govern
-their affairs independently of commercial influence.  This ensures that
-project contributors are creating software for the public good, and not
-just for specific vendors.  Independent project governance - which
-includes allowing new contributors a say in the project direction going
-forward - ensures that every company and individual feels comfortable
-donating their time and code to any Apache project.
-
-As projects like Apache Hadoop are now powering whole industries, the
-pressures from various software companies to be the market leader grow.
- To ensure Apache projects are seen as independent, the ASF owns all
-project trademarks on behalf of our project communities.  As a
-non-profit, we recognize the importance and value of the brands and good
-reputations that our volunteer communities have built, and the ASF will
-defend all of our community brands.
-
-To ensure that Apache project brands are respected, the ASF's Trademarks
-Committee provides assistance and education to all Apache projects for
-how to display their trademarks, as well as how to deal with third
-parties using Apache brands.  Similarly, we have worked directly with a
-large number of companies who use Apache brands in their marketing to
-ensure that Apache trademarks are respected.  While the Apache Trademark
-Policy allows specific uses of Apache brands by third parties, it still
-clearly shows the ASF's ownership of and defense of our project trademarks.
-Similarly, the Trademarks Committee works with the Apache Incubator to
-vet all incoming project names to the ASF before they become official
-top level projects; we have reviewed 28 new project names in the past year.
-
-The ASF also provides US and some international trademark registrations
-for selected Apache projects.  While both DLAPiper and the Software
-Freedom Law Center provide pro bono legal advice, we rely on our budget
-to pay for trademark registration fees.  Being able to register select
-Apache project trademarks greatly eases the process of policing use of
-those marks, freeing our community volunteers up to go back working on
-all the great code they produce.
-
-As we provide better education on the importance of defending Apache
-brands to our communities, many more PMCs are requesting registration of
-their project brands.  Starting with over 40 registrations for 8
-different projects, in the past year several key applications for our
-APACHE brand internationally have finalized, and we have submitted 10
-new project registration applications, and have great interest from many
-more PMCs who wish to register their product names.
-
-> Shane Curcuru, Vice President ASF Brand Management
-
-
-
-[resources]: /foundation/marks/resources
-[contactus]: /foundation/marks/contact

From 5fc0ed1ed393a5f8a2a970f6d8852c254b3b3c55 Mon Sep 17 00:00:00 2001
From: Mark Thomas <markt@apache.org>
Date: Fri, 26 Jul 2024 11:27:37 +0100
Subject: [PATCH 13/24] Remove page. Not linked from anywhere on ASF main site.

---
 content/foundation/marks/policies.md | 96 ----------------------------
 1 file changed, 96 deletions(-)
 delete mode 100644 content/foundation/marks/policies.md

diff --git a/content/foundation/marks/policies.md b/content/foundation/marks/policies.md
deleted file mode 100644
index f183a95201..0000000000
--- a/content/foundation/marks/policies.md
+++ /dev/null
@@ -1,96 +0,0 @@
-Title: Apache Trademark Policy Overview
-license: https://www.apache.org/licenses/LICENSE-2.0
-
-# {{title}}
-
-This document provides a high-level overview of the required policies
-for trademark use by both *outside parties*, and by *Apache PMCs*.  Items
-marked MUST are required; items marked SHOULD or MAY are best practices
-or guidelines for usage.  A [site map of trademark resources][resources] is available, 
-and you can [contact us][contact] with questions.
-
-**Contents**
-
-[TOC]
-
-## Policies For Outside Parties  {#outside}
-
-- If you are acting on behalf of any entity except the ASF or an 
-Apache project, the [formal trademark policy][policy] defines the
-allowable uses of Apache trademarks, which include all Apache 
-project names and logos, along with our APACHE&reg; house mark and 
-the stylized feather logo.
-
-- You may request permission to use Apache trademarks in conjunction with
-[conferences or events][events], or in [domain names][domains], but
-you must first follow our detailed policies.
-
-- Please see the [Apache Product Name Usage Guide][guide] for a 
-detailed description of how to refer to Apache product names in your work. 
-
-- Our [FAQ][faq] provides many common answers to "Can I do *this* with an Apache trademark?".
-
-## Policies For Apache Projects  {#pmcs}
-
-Apache projects may define their own brand - name, logo, style - and
-promote it in their own way.  To ensure the ASF's ability to defend
-our project trademarks, there are a few MUST requirements for how
-projects display their websites and how they deal with reported
-misuses of their trademarks.  There are also a number of SHOULD best practices that
-PMCs may find useful as well.
-
-### Apache Project Names  {#name}
-
-- Must be [named "Apache *Project*"](//www.apache.org/foundation/marks/pmcs#websites).
-- New software product names must use the [Name Search process][naming]
-(primarily to ensure they do not conflict with existing trademarks).
-- PMCs should consider [requesting registration][register] of their project name.
-
-### Apache Project Logos  {#logo}
-
-- May [include a version of the Apache feather](//www.apache.org/foundation/marks/pmcs#graphics).
-
-### Apache Project Websites  {#website}
-
-- Must host the [primary development website at *projectname*.apache.org](//www.apache.org/foundation/marks/pmcs#websites).
-- Must have a few defined [links back to the ASF](//www.apache.org/foundation/marks/pmcs#navigation) in their navigation structure.
-- Must use the [appropriate &trade; or &reg; symbol](//www.apache.org/foundation/marks/pmcs#attributions)
-to legally note their name is a trademark, and provide an attribution on the homepage.
-- Should use appropriate [names for social media accounts][socialmedia].
-- Should link to other [corporations' websites appropriately][linking].
-
-### Apache Project Governance  {#governance}
-
-- PMCs must [govern their projects independently][independent] for the benefit of the 
-whole project community, and not favoring any outside organizations.
-
-### Apache PMCs and Outside Parties  {#requests}
-
-- PMCs must [evaluate and address misuses][reporting] of their own trademarks
-that are reported to them.
-- PMCs should respond to [event][events] and [domain][domains] name requests
-by outside parties - if not, they must ask trademarks@ to handle those requests.
-- PMCs may [always ask for assistance][contact] on trademarks@.
-
-
-## Important Note  {#notes}
-
-**Nothing in this ASF policy statement shall be interpreted to allow any
-third party to claim any association with the Apache Software Foundation or
-any of its projects or to imply any approval or support by the ASF for any
-third party products or services.**
-
-[policy]: //www.apache.org/foundation/marks/
-[pmcs]: //www.apache.org/foundation/marks/pmcs
-[reporting]: //www.apache.org/foundation/marks/reporting
-[resources]: //www.apache.org/foundation/marks/resources
-[socialmedia]: //www.apache.org/foundation/marks/socialmedia
-[events]: //www.apache.org/foundation/marks/events
-[domains]: //www.apache.org/foundation/marks/domains
-[naming]: //www.apache.org/foundation/marks/naming
-[register]: //www.apache.org/foundation/marks/register#register
-[linking]: //www.apache.org/foundation/marks/linking
-[brandguide]: //www.apache.org/foundation/marks/guide
-[contact]: //www.apache.org/foundation/marks/contact#pmc
-[guide]: //www.apache.org/foundation/marks/guide
-[faq]: //www.apache.org/foundation/marks/faq

From 4cfca59b36c4083301ebc1fb25250b1a71b8482a Mon Sep 17 00:00:00 2001
From: Mark Thomas <markt@apache.org>
Date: Fri, 26 Jul 2024 11:33:11 +0100
Subject: [PATCH 14/24] Projects may not use the featerh logo in their logo

---
 content/foundation/marks/pmcs.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/foundation/marks/pmcs.md b/content/foundation/marks/pmcs.md
index 490f451278..839f677247 100644
--- a/content/foundation/marks/pmcs.md
+++ b/content/foundation/marks/pmcs.md
@@ -246,7 +246,7 @@ graphic or immediately adjacent to it. For pages that include the project
 logo on them, ensure you mention "... and the Project logo are
 trademarks..." in the attribution.
 
-  - Projects may choose to use the Apache feather in their logo. For details on the proper [Apache visual identity and feather graphics][3],
+  - Projects must not use the Apache feather in their logo. For details on the proper [Apache visual identity and feather graphics][3],
 please work with press@.
 
 # Powered By... Logos  {#poweredby}

From 85a9fae660085df4f830366695c358a5edabf864 Mon Sep 17 00:00:00 2001
From: bob <bob@apache.org>
Date: Fri, 26 Jul 2024 10:12:33 -0500
Subject: [PATCH 15/24] Sponsorship benefit clean up.

---
 content/foundation/sponsorship.md | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/content/foundation/sponsorship.md b/content/foundation/sponsorship.md
index 9404f57d90..0666249668 100644
--- a/content/foundation/sponsorship.md
+++ b/content/foundation/sponsorship.md
@@ -28,13 +28,11 @@ There are four sponsorship levels, defined by donation amount and in-return bene
   </ul>
 </li>
 <li>Use of the ASF Platinum Sponsorship logo for your site</li>
-<li>Joint press release with the ASF</li>
-<li>Listed in ASF Quarterly + Annual Reports</li>
-<li>Listed in all ASF press releases</li>
-<li>New: Sponsor co-authored Case Study</li>
-<li>New: “Success At Apache” Guest Post</li>
-<li>New: Media testimonial placement + spokesperson opportunities</li>
-<li>New: Dedicated Sponsorship Ambassador</li>
+<li>Joint press release or blog post with the ASF</li>
+<li>Listed in ASF Annual Reports</li>
+<li>Sponsor co-authored Case Study</li>
+<li>“Success At Apache” Guest Post</li>
+<li>Dedicated Sponsorship Ambassador</li>
 </ul>
 
 </td>
@@ -53,11 +51,9 @@ There are four sponsorship levels, defined by donation amount and in-return bene
 </li>
 <li>Use of the ASF Gold Sponsorship logo for your site</li>
 <li>Personal quote for your press release</li>
-<li>Listed in ASF Quarterly + Annual Reports</li>
-<li>Listed in all ASF press releases</li>
-<li>New: Sponsor co-authored Case Study</li>
-<li>New: Media testimonial placement + spokesperson opportunities</li>
-<li>New: Dedicated Sponsorship Ambassador</li>
+<li>Listed in ASF Annual Reports</li>
+<li>Sponsor co-authored Case Study</li>
+<li>Dedicated Sponsorship Ambassador</li>
 </ul>
 
 </td></tr>
@@ -76,9 +72,8 @@ There are four sponsorship levels, defined by donation amount and in-return bene
   </ul>
 </li>
 <li>Use of the ASF Silver Sponsorship logo for your site</li>
-<li>Listed in ASF Quarterly + Annual Reports</li>
-<li>Listed in all ASF press releases</li>
-<li>New: Dedicated ASF Ambassador</li>
+<li>Listed in ASF Annual Reports</li>
+<li>Dedicated ASF Ambassador</li>
 </ul>
 
 </td>
@@ -96,7 +91,7 @@ There are four sponsorship levels, defined by donation amount and in-return bene
   </ul>
 </li>
 <li>Use of the ASF Bronze Sponsorship logo for your site</li>
-<li>Listed in ASF Quarterly + Annual Reports</li>
+<li>Listed in ASF Annual Reports</li>
 </ul>
 </td>
 </tr>

From 7716a71de47a7628fbd740967be96a526939668a Mon Sep 17 00:00:00 2001
From: Arnout Engelen <arnout@bzzt.net>
Date: Mon, 29 Jul 2024 09:20:02 +0200
Subject: [PATCH 16/24] Reconfirm the security.txt, update expiration date
 (#385)

It should expire less than a year in the future
---
 content/.well-known/security.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/content/.well-known/security.txt b/content/.well-known/security.txt
index 1254fba992..b9a223e78f 100644
--- a/content/.well-known/security.txt
+++ b/content/.well-known/security.txt
@@ -4,4 +4,5 @@ Policy: https://apache.org/security/
 # https://www.apache.org/foundation/policies/conduct#diversity-statement
 Preferred-Languages: en
 
-Expires: 2024-06-19T00:00:00Z
+# https://www.rfc-editor.org/rfc/rfc9116#section-2.5.5
+Expires: 2025-06-19T00:00:00Z

From 5148ba930be64dd83463018605e530031a9e1c20 Mon Sep 17 00:00:00 2001
From: Sebb <sebb@apache.org>
Date: Mon, 29 Jul 2024 11:29:33 +0100
Subject: [PATCH 17/24] OF: fix incorrect member id

---
 content/foundation/members.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/foundation/members.md b/content/foundation/members.md
index e5da5c98fa..58a9e328c1 100644
--- a/content/foundation/members.md
+++ b/content/foundation/members.md
@@ -276,7 +276,6 @@ This table shows current and emeritus members who have manually added themselves
 | luc | Luc Maisonobe | [commons](http://commons.apache.org/)|
 | luke1410 | [Stefan Hett](http://www.luke1410.de/) | [Subversion](https://subversion.apache.org/) ; [APR](https://apr.apache.org/) |
 | lukehan | Luke Han | [Kylin](http://kylin.apache.org)|
-| luot | Lukas Ott | [PLC4X](https://plc4x.apache.org/) ;  [Streampipes](https://streampipes.apache.org/) |
 | mads | [Mads Toftum](http://www.toftum.org/) | [httpd-docs](http://httpd.apache.org/docs-project/)|
 | manoj | [Manoj Kasichainula](http://www.io.com/~manojk/) | [httpd](http://httpd.apache.org/)|
 | marcelk | Marcel Kinard | [Cordova](http://cordova.apache.org/) |
@@ -329,6 +328,7 @@ This table shows current and emeritus members who have manually added themselves
 | olegk | Oleg Kalnichevski |
 | omalley | [Owen O'Malley](http://home.apache.org/~omalley) |
 | orlikowski | Victor J. Orlikowski | [httpd](http://httpd.apache.org/) ; [APR](http://apr.apache.org/) ; BSF|
+| otluk | Lukas Ott | [PLC4X](https://plc4x.apache.org/) ;  [Streampipes](https://streampipes.apache.org/) |
 | ovilia | Zhang Wenli | [ECharts](https://echarts.apache.org/) |
 | painter | Jeffery Painter | [Turbine](https://turbine.apache.org/) ; [Torque](https://db.apache.org/torque)|
 | paulirwin | [Paul Irwin](https://github.com/paulirwin/) | [Lucene.NET](https://lucenenet.apache.org/) |

From 60968c036b17714288fff7e4fb67c00e446de93d Mon Sep 17 00:00:00 2001
From: Sebb <sebb@apache.org>
Date: Mon, 29 Jul 2024 11:34:56 +0100
Subject: [PATCH 18/24] OF: went emeritus

---
 content/foundation/members.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/foundation/members.md b/content/foundation/members.md
index 58a9e328c1..ef801e653e 100644
--- a/content/foundation/members.md
+++ b/content/foundation/members.md
@@ -451,7 +451,6 @@ This table shows current and emeritus members who have manually added themselves
 | twilliams | [Tim Williams](http://williamstw.blogspot.com) |
 | uli | Ulrich Stärk |
 | umamahesh | [Uma Maheswara Rao G](https://home.apache.org/~umamahesh/umamahesh.html) | [Hadoop](http://hadoop.apache.org); [BookKeeper](http://bookkeeper.apache.org) |
-| upayavira | [Upayavira](http://www.odoko.com) | [Lucene](http://lucene.apache.org) ; [Cocoon](http://cocoon.apache.org/) ; infrastructure|
 | uschindler | [Uwe Schindler](http://www.thetaphi.de/) | [Lucene](//lucene.apache.org/) , [POI](http://poi.apache.org/) |
 | vanto | [Tammo van Lessen](http://www.taval.de/) | [ODE](http://ode.apache.org)|
 | veithen | [Andreas Veithen](http://veithen.github.io) |
@@ -713,6 +712,7 @@ Members may choose to move to [emeritus](/foundation/bylaws.html#4.2) status by
 | twl | [Theodore W. Leung](http://www.sauria.com/~twl) | [XML](http://xml.apache.org) ; ws ; [incubator](http://incubator.apache.org/)|
 | ugo | [Ugo Cei](http://agylen.com/) | [Cocoon](http://cocoon.apache.org/) , [POI](http://poi.apache.org/)|
 | uncled | David Nuescheler |
+| upayavira | [Upayavira](http://www.odoko.com) | [Lucene](http://lucene.apache.org) ; [Cocoon](http://cocoon.apache.org/) ; infrastructure|
 | vhardy | Vincent Hardy |
 | vmassol | Vincent Massol |
 | vsiveton | Vincent Siveton | [Maven](http://maven.apache.org) ; [Shindig](http://shindig.apache.org)|

From 68b0c9197149ecd2fc80315f9142b2be1f1dba4b Mon Sep 17 00:00:00 2001
From: Sebb <sebb@apache.org>
Date: Mon, 29 Jul 2024 11:43:09 +0100
Subject: [PATCH 19/24] OF: Typo [skip ci]

---
 docs/markdown.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/markdown.md b/docs/markdown.md
index 15e389efe1..bc6b609ee4 100644
--- a/docs/markdown.md
+++ b/docs/markdown.md
@@ -1,3 +1,3 @@
-# Gihub Flavored Markdown (GFM)
+# GitHub Flavored Markdown (GFM)
 
 Review information about [GitHub Flavored Markdown](https://infra.apache.org/gfm.html), which this site uses.

From 2a83ffe9c72aa6bb00b14986785acdbea4cc21f9 Mon Sep 17 00:00:00 2001
From: Sebb <sebb@apache.org>
Date: Mon, 29 Jul 2024 16:56:54 +0100
Subject: [PATCH 20/24] Went emeritus earlier this year

---
 content/foundation/members.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/foundation/members.md b/content/foundation/members.md
index ef801e653e..8186d8a866 100644
--- a/content/foundation/members.md
+++ b/content/foundation/members.md
@@ -92,7 +92,6 @@ This table shows current and emeritus members who have manually added themselves
 | chrisg | Christian Geisert | [XML Graphics](http://xmlgraphics.apache.org/) , [FOP](http://xmlgraphics.apache.org/fop/)|
 | christ | Chris Thistlethwaite | Infrastructure , [Warble (incubating)](http://warble.apache.org/) |
 | chtompki | [Rob Tompkins](http://www.robtompkins.com) | [Commons](http://commons.apache.org) |
-| claude | Claude N. Warren, Jr. | [Jena](http://jena.apache.org), [Commons Collections](https://commons.apache.org/proper/commons-collections/), [RAT](https://creadur.apache.org/rat/), [Incubator](https://incubator.apache.org), [Pekko (incubating)](https://pekko.apache.org/), [Cassandra](https://cassandra.apache.org), [Community over Code - EU (Formerly ApacheCon)](https://eu.communityovercode.org/) |
 | clr | Craig L Russell |  [JDO](http://db.apache.org/jdo) ; [Incubator](http://incubator.apache.org/) ; [OpenJPA](http://openjpa.apache.org/)|
 | cmccabe | Colin P. McCabe |
 | cmpilato | C. Michael Pilato |
@@ -529,6 +528,7 @@ Members may choose to move to [emeritus](/foundation/bylaws.html#4.2) status by
 | chirino | Hiram Chirino |
 | cholet | Eric Cholet |
 | chuck | Chuck Murcko |
+| claude | Claude N. Warren, Jr. | [Jena](http://jena.apache.org), [Commons Collections](https://commons.apache.org/proper/commons-collections/), [RAT](https://creadur.apache.org/rat/), [Incubator](https://incubator.apache.org), [Pekko (incubating)](https://pekko.apache.org/), [Cassandra](https://cassandra.apache.org), [Community over Code - EU (Formerly ApacheCon)](https://eu.communityovercode.org/) |
 | cliff | Cliff Skolnick | [httpd](http://httpd.apache.org/)|
 | cliffs | Cliff Schmidt |
 | cmueller | Christian Müller | [Camel](http://camel.apache.org) |

From dd609785ac362e4d1894fea425279d4605e1c8b1 Mon Sep 17 00:00:00 2001
From: Sebb <sebbASF@users.noreply.github.com>
Date: Mon, 29 Jul 2024 20:13:07 +0100
Subject: [PATCH 21/24] Add script to check changes to members.md (#393)

* GHA to check members.md

* Claude went emeritus

* Better name for job
---
 .github/workflows/members_check.yml | 20 +++++++
 members_check.py                    | 81 +++++++++++++++++++++++++++++
 2 files changed, 101 insertions(+)
 create mode 100644 .github/workflows/members_check.yml
 create mode 100644 members_check.py

diff --git a/.github/workflows/members_check.yml b/.github/workflows/members_check.yml
new file mode 100644
index 0000000000..595ca1f750
--- /dev/null
+++ b/.github/workflows/members_check.yml
@@ -0,0 +1,20 @@
+name: Check members.md listings
+on:
+  push:
+    paths:
+      - 'content/foundation/members.md'
+      - 'members_check.py'
+      - '.github/workflows/members_check.yml'
+  pull_request:
+    paths:
+      - 'content/foundation/members.md'
+      - 'members_check.py'
+      - '.github/workflows/members_check.yml'
+  workflow_dispatch:
+jobs:
+  members-check:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - run: |
+          python3 members_check.py
diff --git a/members_check.py b/members_check.py
new file mode 100644
index 0000000000..3cafe3c807
--- /dev/null
+++ b/members_check.py
@@ -0,0 +1,81 @@
+#!/usr/bin/env python3
+
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
+
+# Check contents of members.md to ensure entries are valid ids and in the correct section
+# Intended to be run by a GitHub Action, but can also be run from a local checkout
+
+import sys
+import requests
+
+MEMBER_INFO = 'https://whimsy.apache.org/public/member-info.json'
+MEMBERS_MD ='content/foundation/members.md'
+
+def main():
+    member_info = requests.get(MEMBER_INFO).json()
+    members = member_info['members']
+    ex_members = member_info['ex_members']
+    errors = 0
+    with open(MEMBERS_MD, 'r', encoding='utf-8') as md:
+        section = None
+        for line in md:
+            if line.startswith('| Id | Name | Projects |'):
+                section = 'members'
+                print("Checking members section")
+                continue
+            elif line.startswith('| Id | Name |'):
+                section = 'emeritus'
+                print("Checking emeritus section")
+                continue
+            elif len(line.strip()) == 0:
+                section = None
+                continue
+            elif line.startswith('|---'):
+                continue
+            if section is None:
+                continue
+            if not line.startswith('| '):
+                print("Unexpected format:")
+                print(line.strip())
+                errors += 1
+            parts = line.strip().split('|')
+            parts.pop(0)
+            availid = parts.pop(0).strip()
+            name = parts.pop(0).strip()
+            if section == 'members':
+                if not availid in members:
+                    print(f"Not listed in members: {availid} {name} Status: {ex_members.get(availid, 'Unknown')}")
+                    errors += 1
+            elif section == 'emeritus':
+                if availid != '?' and not availid in ex_members:
+                    if availid in members:
+                        status = 'ASF Member'
+                    else:
+                        status = 'Unknown'
+                    print(f"Not listed in ex_members: {availid} {name} Status: {status}")
+                    errors += 1
+    if errors > 0:
+        print(f"Detected {errors} error(s). ")
+        sys.exit(1)
+    else:
+        print("No errors detected")
+
+if __name__ == '__main__':
+    main()

From d1071d77843632ba496c8c2ff8197f8c2066db55 Mon Sep 17 00:00:00 2001
From: "Melissa Logan (she/her)" <melissalogan@apache.org>
Date: Tue, 30 Jul 2024 14:28:28 -0700
Subject: [PATCH 22/24] New marketing category and add "creator" FAQ (#390)

* New marketing category and add "creator" FAQ

The often asked question "Can I refer to an individual, organization or community as 'founding' an ASF project?" is currently on the Newsroom page. Because this is one of the more common brand violations that occur, it would make more sense to appear in the FAQ vs. Newsroom. I'm proposing the addition to the FAQ, and will be proposing the deletion (and re-routing) to the Newsroom page next.

* Update faq.md

Updating wording to my branch based on feedback
---
 content/foundation/faq.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/content/foundation/faq.md b/content/foundation/faq.md
index 7f5797bafc..5d67ee784a 100644
--- a/content/foundation/faq.md
+++ b/content/foundation/faq.md
@@ -8,6 +8,7 @@ license: https://www.apache.org/licenses/LICENSE-2.0
 <a class="btn btn-default mx-10" href="#foundation" role="button">Foundation</a>
 <a class="btn btn-default mx-10" href="#members" role="button">Members</a>
 <a class="btn btn-default mx-10" href="#technical" role="button">Technical</a>
+<a class="btn btn-default mx-10" href="#marketing" role="button">Marketing</a>
 
 ## Software
 
@@ -162,3 +163,9 @@ If you have sent us mail because you think you have traced spam to a system that
 
 - How to: Look up the owner of an IP address<small>(such as 10.0.35.147): [https://ws.arin.net/whois/](https://ws.arin.net/whois/). ARIN (Registered Internet Numbers) database (tells you who owns an IP address, such as 10.0.35.147, or which other database to query if the address is assigned outside the USA).
 
+## Marketing
+
+### Can I refer to an individual or organization as the "founder" or "creator" of an ASF project?
+The ASF discourages this because it is detrimental to the long-term health of a project community to continually call attention to the individuals and/or organizations that originally created the project.
+
+If it is necessary to highlight individuals and companies who founded a project that is now under the ASF’s stewardship, they may be referred to as "original creator of Apache Project Name" or "original developer of Apache Project Name."

From 7536b71580f90116039c3decf619460c37f5d7f4 Mon Sep 17 00:00:00 2001
From: "Melissa Logan (she/her)" <melissalogan@apache.org>
Date: Tue, 30 Jul 2024 14:35:55 -0700
Subject: [PATCH 23/24] Update index.md

Removed FAQ from this page and moved it to the main FAQ to make it more visible.
---
 content/press/index.md | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/content/press/index.md b/content/press/index.md
index 4b69294ddf..733e6e441f 100644
--- a/content/press/index.md
+++ b/content/press/index.md
@@ -30,15 +30,6 @@ The [publicity/brand/communications guidelines created by Databricks](https://ap
 ## Contact Us
 press@apache.org 
 
-## FAQ
-**Can I refer to an individual, organization or community as “founding” an ASF project?** <br>
-Many projects enter the Apache Incubator with a recognized individual founder, group of founders, or corporate entity where the project originated and/or which was responsible for its development/administration. 
-
-The ASF is vendor neutral: all ASF projects are overseen by their respective Project Management Committees (PMCs), who guide the project's day-to-day operations. Once a project comes to the ASF, its development and oversight is the responsibility of the project’s PMC and community. 
-
-There are no "owners" of any Apache project. Individuals and companies who founded projects that are now under the auspices of the ASF may be referred to as "original creator of Apache Project Name" or "original developer of Apache Project Name." Examples: 
-* **Individual’s title.** "Individual’s Name, Apache Member (or Committer) and original developer of Apache Project Name." 
-* **Company whose founders or employees are the original creators of an Apache project.** "Company Name, founded by the original creators of Apache Project Name" or "several Company Name team members are the original developers of Apache Project Name."
 
 
 

From 5c8cf0d5748ef0d36d7ad1a7e9c557fa5d8f84a9 Mon Sep 17 00:00:00 2001
From: Sebb <sebbASF@users.noreply.github.com>
Date: Wed, 31 Jul 2024 13:34:01 +0100
Subject: [PATCH 24/24] Revert to previous version of pagefind (#394)

* Revert to previous version

* Trigger site build

* Trigger site build

* Trigger build

* Trigger site build
---
 pagefind.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pagefind.sh b/pagefind.sh
index 712b07a9f0..283b5dca66 100644
--- a/pagefind.sh
+++ b/pagefind.sh
@@ -28,8 +28,11 @@ set -e # fast exit (must be done after 'which' invocation)
 
 if [ -z "$PAGEFIND" ] # could not find pagefind
 then
-    PAGEFIND_VERSION='1.1.0'
-    PAGEFIND_HASH='b20d0b06b54eb2fba1e290245919376364584a456fb644e66eecdb67549b1cf2'
+    # PAGEFIND_VERSION='1.1.0'
+    # PAGEFIND_HASH='b20d0b06b54eb2fba1e290245919376364584a456fb644e66eecdb67549b1cf2'
+    # Revert to previous version, as 1.1.0 generates spurious differences
+    PAGEFIND_VERSION='1.0.4'
+    PAGEFIND_HASH='a3a1ecf1d6edd79551c8b98a863b20cbdd999316a6ca73e81e277a74449db886'
     echo "Download pagefind ${PAGEFIND_VERSION}"
     BINDIR=$(mktemp -d)
     TARGET=${BINDIR}/pagefind.tar.gz