Merge pull request #359 from ShaneCurcuru/patch-site-docs
Patch site docs
diff --git a/content/asf25years/img/anniversary-hero-twenty-five.jpg b/content/asf25years/img/anniversary-hero-twenty-five.jpg
new file mode 100644
index 0000000..457bd2a
--- /dev/null
+++ b/content/asf25years/img/anniversary-hero-twenty-five.jpg
Binary files differ
diff --git a/content/asf25years/img/anniversary-hero-twenty-five.png b/content/asf25years/img/anniversary-hero-twenty-five.png
new file mode 100755
index 0000000..5a248dd
--- /dev/null
+++ b/content/asf25years/img/anniversary-hero-twenty-five.png
Binary files differ
diff --git a/content/asf25years/img/community-anniversary.jpg b/content/asf25years/img/community-anniversary.jpg
new file mode 100644
index 0000000..fb92ee6
--- /dev/null
+++ b/content/asf25years/img/community-anniversary.jpg
Binary files differ
diff --git a/content/asf25years/img/community-photo-filler.jpg b/content/asf25years/img/community-photo-filler.jpg
new file mode 100644
index 0000000..2447357
--- /dev/null
+++ b/content/asf25years/img/community-photo-filler.jpg
Binary files differ
diff --git a/content/asf25years/img/twenty-five-anniversary-place-holder.jpg b/content/asf25years/img/twenty-five-anniversary-place-holder.jpg
new file mode 100644
index 0000000..8ebde11
--- /dev/null
+++ b/content/asf25years/img/twenty-five-anniversary-place-holder.jpg
Binary files differ
diff --git a/content/asf25years/index.ezmd b/content/asf25years/index.ezmd
new file mode 100644
index 0000000..1d909f5
--- /dev/null
+++ b/content/asf25years/index.ezmd
@@ -0,0 +1,166 @@
+title: Celebrating 25 Years at The ASF
+license: https://www.apache.org/licenses/LICENSE-2.0
+
+<div class="text-center">
+
+<h1>Celebrating 25 Years at The ASF</h1>
+
+<img class="img-responsive" src="img/anniversary-hero-twenty-five.jpg" alt="Apache 25 Year Anniversary" />
+<h2>#ASF25Years</h2>
+
+</div>
+
+
+<div class="spacer-100">
+</div>
+
+<div class="in-page-nav text-center">
+<a class="btn btn-default mx-10" href="#software-the-world-relies-on" role="button">Software The World Relies On</a>
+<a class="btn btn-default mx-10" href="#communities-that-endure" role="button">Communities That Endure</a>
+<a class="btn btn-default mx-10" href="#everything-open-everyone-welcome" role="button">Everything Open, Everyone Welcome
+</a>
+</div>
+
+<div class="spacer-100">
+</div>
+
+## Software The World Relies On
+
+The ASF was founded with a mission to provide software for the public good. For 25 years the foundation has delivered reliable software that fuels innovation and powers organizations of all sizes - from small businesses to the most advanced data-driven enterprises.
+
+From the flagship Apache HTTP project to more recent projects spanning AI/ML, big data, cloud computing, financial tech, geospatial, IoT, search, and more – ASF projects serve the public good with use cases such as fueling cancer research; aiding in clean energy research; and reducing food waste.
+
+<div class="spacer-100">
+</div>
+
+### Public Good Stories
+
+<div class="cards-50 updates">
+ <article class="card">
+ <div class="content">
+ <h4>Apache Airflow</h4>
+ <p>Genomic algorithms are highly demanding of CPU, RAM, and storage. The data engineering team at C2i Genomics uses Apache Airflow to enable high-scale orchestration of genomic algorithms for cancer research.</p>
+ </div>
+ <a class="continue" href="https://www.youtube.com/watch?v=j4fmIh3ir3I" target="_blank">Watch Video →</a>
+ </article>
+ <article class="card">
+ <div class="content">
+ <h4>Apache Superset</h4>
+ <p>The City of Ann Arbor uses Apache Superset to deliver high-quality data reporting for its public-facing dashboards including rain gauges, air quality, and traffic crash reporting – saving the city 94% in costs.</p>
+ </div>
+ <a class="continue" href="https://samfirke.com/2023/06/02/making-the-switch-to-apache-superset/" target="_blank">Read More →</a>
+ </article>
+</div>
+
+<p>Want to share your public good story? <a target="_blank" href="https://docs.google.com/forms/d/1vuN-tUnBwpTgOE5xj3Z5AG1hsOoDNLBmGIqQHwQT6k8/viewform?edit_requested=true">Fill out the form</a>.</p>
+
+
+### Project Spotlights
+
+<div class="cards-50 updates">
+ <article class="card">
+ <a target="_blank" href="https://news.apache.org/foundation/entry/asf-project-spotlight-apace-apisix">
+ <div class="content">
+ <h4>ASF PROJECT SPOTLIGHT: APACHE APISIX</h4>
+ </div>
+ </a>
+ </article>
+ <article class="card">
+ <a target="_blank" href="https://news.apache.org/foundation/entry/asf-project-spotlight-apache-wicket">
+ <div class="content">
+ <h4>ASF PROJECT SPOTLIGHT: APACHE WICKET</h4>
+ </div>
+ </a>
+ </article>
+</div>
+
+<div class="spacer-100">
+</div>
+
+### The Voice of Apache Podcast
+<iframe width="560" height="315" src="https://www.youtube.com/embed/7nY2rlnPISg?si=ow3yTHYZcbWbIDuK" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" allowfullscreen></iframe>
+
+<div class="spacer-100">
+</div>
+
+## Communities That Endure
+
+Open source projects need healthy communities to thrive. The ASF provides projects with services and mentorship for building resilient and durable communities throughout their lifecycle. New projects start in the Apache Incubator and graduate once they’ve met certain criteria (and if it’s not longer maintained, it goes in the Attic).
+
+<div class="updates">
+ <article class="card">
+ <div class="content">
+ <h4>Current Incubating Projects</h4>
+ <p>See all <a href="https://incubator.apache.org/projects/#current">Incubating projects</a>.</p>
+ </div>
+ </article>
+ <article class="card">
+ <div class="content">
+ <h4>Recently Graduated Projects</h4>
+ <ul>
+ <li><a href="https://eventmesh.apache.org/">Apache EventMesh</a></li>
+ <li><a href="https://flagon.apache.org/">Apache Flagon</a></li>
+ <li><a href="https://kvrocks.apache.org/">Apache Kvrocks</a></li>
+ <li><a href="https://opendal.apache.org/">Apache OpenDAL</a> </li>
+ <li><a href="https://seatunnel.apache.org/">Apache SeaTunnel</a></li>
+ </ul>
+ </div>
+ </article>
+ <article class="card">
+ <div class="content">
+ <h4>Apache Attic</h4>
+ <p>If a project is no longer being supported by an active community, it’s retired to the Apache Attic for preservation including code, mailing lists, and all other project communications in the event that those artifacts become useful again in the future. Recent projects that entered the Attic include: Apache OODT, Apache Giraph, Apache MXNet, Apache Any23, and Apache jUDDI.</p>
+ </div>
+ </article>
+</div>
+<div class="spacer-100">
+</div>
+
+## Everything Open, Everyone Welcome
+
+<p>The ASF aims to foster a welcoming and open environment built on respect, empathy, openness, patience, candor, and dependability. According to the 2023 <a target="_blank" href="https://news.apache.org/foundation/entry/the-state-of-diversity-and-inclusion-in-the-asf-community-a-pulse-check">State of Diversity and Inclusion report</a>, people feel welcome and included at The ASF and that they have an equal chance of getting their contributions accepted. </p>
+
+### First Contribution Campaign
+
+We recognize community members through our First Contribution campaign that highlights a contributor’s first contribution to any ASF project. Look for the hashtag #FirstASFContribution on LinkedIn and X.
+
+<div class="cards-50 updates">
+ <article class="card">
+ <a target="_blank" href="https://news.apache.org/foundation/entry/first-time-asf-contributors-improve-technical-documentation-for-asf-projects-and-its-users">
+ <div class="content">
+ <h4>First-Time ASF Contributors Improve Technical Documentation for ASF Projects and Its Users</h4>
+ </div>
+ </a>
+ </article>
+ <article class="card">
+ <a target="_blank" href="https://news.apache.org/foundation/entry/first-time-contributors-enhance-code-for-asf-projects">
+ <div class="content">
+ <h4>First-Time Contributors Enhance Code for ASF Projects</h4>
+ </div>
+ </a>
+ </article>
+ <!-- <article class="card">
+ <a target="_blank" href="https://news.apache.org/foundation/entry/first-time-asf-contributors-fix-bugs-for-asf-projects-improving-oss-quality-security-and-usability">
+ <div class="content">
+ <h4>First-Time ASF contributors Fix Bugs for ASF projects, Improving OSS Quality, Security, and Usability </h4>
+ </div>
+ </a>
+ </article> -->
+</div>
+
+<p><a target="_blank" href="https://news.apache.org/foundation/entry/category/first-contributions">See all posts</a> and <a target="_blank" href="https://news.apache.org/foundation/entry/the-asf-launches-firstasfcontribution-campaign">submit your first contribution</a></p>
+
+## Get Involved with ASF
+
+<ul>
+<li>Follow us on social: <a target="_blank" href="https://twitter.com/TheASF">X</a>, <a target="_blank" href="https://www.linkedin.com/company/the-apache-software-foundation/">LinkedIn</a>, and <a target="_blank" href="https://www.youtube.com/c/TheApacheFoundation">YouTube</a></li>
+<li><a href="https://www.apache.org/projects/">Host a Project</a></li>
+<li><a href="https://www.apache.org/foundation/sponsorship.html">Become an ASF Sponsor </a></li>
+<li><a target="_blank" href="https://apache.org/community-resources/">Community Resources</a></li>
+<li><a target="_blank" href="https://communityovercode.org/">Attend Community Over Code</a></li>
+</ul>
+
+<div class="spacer-100">
+</div>
+
+<img class="img-responsive" src="img/community-anniversary.jpg" alt="Apache 25 Year Anniversary" />
\ No newline at end of file
diff --git a/content/css/styles.css b/content/css/styles.css
index 104beff..3017c31 100644
--- a/content/css/styles.css
+++ b/content/css/styles.css
@@ -67,6 +67,11 @@
.about-foundation .btn {
margin-right: 10px;
}
+.in-page-nav .btn {
+ font-size: 17px;
+ font-weight: bold;
+ margin-bottom: 10px;
+}
.upper-nav {
padding: 10px 50px;
display: flex;
@@ -100,6 +105,10 @@
max-width: 90vw;
}
+.spacer-100 {
+ margin-bottom: 100px;
+}
+
@media (max-width: 768px) {
.search-form.dropdown-menu {position: relative; left: auto; top: auto; padding: 0; display: block; max-width: calc(100% - 20px); margin-left: 10px}
.search-form::before {content: 'search'; margin: 30px auto; position: absolute; top: -30px; color: #fff; left: 5px;}
@@ -476,6 +485,9 @@
.updates {
grid-template-columns: 1fr 1fr 1fr;
}
+ .cards-50 {
+ grid-template-columns: 1fr 1fr;
+ }
.updates.updates-community-practices {
grid-template-columns: 1fr 1fr 1fr 1fr;
margin-bottom: 40px;
diff --git a/content/foundation/docs/Valuating_Code_at_the_ASF.pdf b/content/foundation/docs/Valuating_Code_at_the_ASF.pdf
new file mode 100644
index 0000000..77ffdff
--- /dev/null
+++ b/content/foundation/docs/Valuating_Code_at_the_ASF.pdf
Binary files differ
diff --git a/content/foundation/marks/downstream.md b/content/foundation/marks/downstream.md
index bb04db7..9d0749b 100644
--- a/content/foundation/marks/downstream.md
+++ b/content/foundation/marks/downstream.md
@@ -3,8 +3,6 @@
# {{title}}
-# DRAFT ~ DRAFT ~ DRAFT
-
This **Downstream Distribution Branding Policy** defines **requirements** for
downstream software distributors that wish to distribute Apache® software
products under the original Apache product name. Distributors wishing to use a
@@ -164,14 +162,9 @@
## Policy Version {#version}
-This is version 0.6 of this draft Apache policy document, published in December 2023.
+This is version 1.0 of this Apache policy document, published in March 2024.
Material changes will be marked with a new version number.
-Changes will be tracked from version 1.0 onwards.
-
-
-## DRAFT ~ DRAFT ~ DRAFT
-
[resources]: /foundation/marks/resources
diff --git a/content/foundation/marks/faq/index.md b/content/foundation/marks/faq/index.md
index 43788fd..748480d 100644
--- a/content/foundation/marks/faq/index.md
+++ b/content/foundation/marks/faq/index.md
@@ -151,6 +151,13 @@
"Powered by..." program](#poweredby).
+# May I distibute modified versions of Apache Software under the original name?
+
+Generally, no. If you distribute modified versions of Apache Software you must
+do so under a new name. There are limited circumstance where this is permitted
+which are set out in the [Apache Downstream Distribution Policy][downstream].
+
+
# May I use Apache Powered by... marks or logos in software product names or logos? {#poweredby}
Yes, under certain circumstances, you may use the Powered by... phrase or
@@ -337,6 +344,7 @@
[contact]: /foundation/marks/contact
[contactother]: /foundation/marks/contact#other
+[downstream]: /foundation/marks/downstream
[resources]: /foundation/marks/resources
[guide]: /foundation/marks/guide
[incubator]: //incubator.apache.org/
diff --git a/content/foundation/marks/resources.md b/content/foundation/marks/resources.md
index 347a742..bb1ebe9 100644
--- a/content/foundation/marks/resources.md
+++ b/content/foundation/marks/resources.md
@@ -23,6 +23,7 @@
| [Non-Software Merchandise Branding Policy](/foundation/marks/merchandise) | [Process For Selecting New Apache Software Product Names](/foundation/marks/naming) |
| [Contacting Apache With Trademark Questions](/foundation/marks/contact) | [Incubator Branding Policy For Podlings](//incubator.apache.org/guides/branding.html) |
| [Asking **non**-Trademark related Legal questions](/legal/) | [How To: Request Registration of Your Project Name][1] |
+| [Apache Software Downstream Distribution Policy](/foundation/marks/downstream) | |
## Apache Trademark Policy Presentations / Slides / Videos {#slides}
diff --git a/content/foundation/members.md b/content/foundation/members.md
index f8fb1a9..597cd2e 100644
--- a/content/foundation/members.md
+++ b/content/foundation/members.md
@@ -31,6 +31,7 @@
| aheritier | [Arnaud Héritier](http://aheritier.net/) | [Maven](http://maven.apache.org/), [Archiva](http://archiva.apache.org/)|
| akarasulu | [Alex Karasulu](mailto:akarasulu@apache.org) | [directory](http://incubator.apache.org/directory) ; [excalibur](http://excalibur.apache.org/) ; [jakarta](http://jakarta.apache.org/)|
| akm | Andrew Musselman | [Mahout](http://mahout.apache.org) |
+| alamb | [Andrew Lamb](http://andrew.nerdnetworks.org/) | [Arrow](http://arrow.apache.org/) |
| alfonsonishikawa | [Alfonso Nishikawa Muñumer](http://people.apache.org/~alfonsonishikawa) | [Gora](https://gora.apache.org) |
| amaniatis | Aristedes Maniatis | [Cayenne](http://cayenne.apache.org/)|
| amareshwari | Amareshwari Sriramadasu | [Hadoop](http://hadoop.apache.org/) , [Falcon](http://falcon.apache.org/), [Hive](http://hive.apache.org/), [Lens](http://lens.apache.org) |
diff --git a/content/img/anniversary-hero-twenty-five.jpg b/content/img/anniversary-hero-twenty-five.jpg
new file mode 100644
index 0000000..457bd2a
--- /dev/null
+++ b/content/img/anniversary-hero-twenty-five.jpg
Binary files differ
diff --git a/content/img/anniversary-hero-twenty-five.png b/content/img/anniversary-hero-twenty-five.png
new file mode 100755
index 0000000..5a248dd
--- /dev/null
+++ b/content/img/anniversary-hero-twenty-five.png
Binary files differ
diff --git a/content/img/community-anniversary.jpg b/content/img/community-anniversary.jpg
new file mode 100644
index 0000000..fb92ee6
--- /dev/null
+++ b/content/img/community-anniversary.jpg
Binary files differ
