From ac83042aec8a620ab7a1317f6132e520ab1f1ee5 Mon Sep 17 00:00:00 2001
From: Bryan Behrenshausen <bryan.behrenshausen@sas.com>
Date: Thu, 25 Sep 2025 15:57:10 -0400
Subject: [PATCH 1/2] GEODE-4063: Update trademarks on website

This commit addresses a number of issues in order to better align the
Apache Geode project website with ASF trademark policy. In particular,
it:

* Adds trademark symbols where necessary
* Replaces the site's introductory text with a single-sentence
description of Geode

This commit also:

* Removes seemingly deprecated code that was no longer rending GitHub
repository statistics
* Adds a link to the ASF privacy policy, as per ASF policy
* Updates the page title

Additional details at: https://www.apache.org/foundation/marks/

Signed-off-by: Bryan Behrenshausen <bryan.behrenshausen@sas.com>
---
 website/content/index.html  | 27 ++++++++-------------------
 website/layouts/footer.html |  7 ++++---
 2 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/website/content/index.html b/website/content/index.html
index 7ec874909..2107e809d 100644
--- a/website/content/index.html
+++ b/website/content/index.html
@@ -1,5 +1,5 @@
 ---
-title: Performance is key. Consistency is a must.
+title: Apache Geode™: Providing low latency, high concurrency data management solutions since 2002
 ---
 <!-- Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file
@@ -23,24 +23,13 @@
         <div class="container">
             <img class="logo-title img-responsive hidden-xs" src="img/Apache_Geode_logo.png" />
             <div class="text-container">
-                <h2 class="tagline"><em>Performance</em> is key. <em>Consistency</em> is a must.</h2>
-                <p class="description">Providing low latency, high concurrency data management solutions since 2002.</p>
-                <p class="description">Build high-speed, data-intensive applications that elastically meet performance requirements at any scale.</p>
-				<p class="description">Take advantage of Apache Geode's unique technology that blends advanced techniques for data replication, partitioning and distributed processing.</p>
-				<p class="description">Apache Geode provides a database-like consistency model, reliable transaction processing, and a shared-nothing architecture to maintain very low latency performance with high concurrency processing.</p>
+                <p class="description">Apache Geode™ is a data management platform that provides real-time, consistent access to data-intensive applications throughout widely distributed cloud architectures.</p>
             </div>
-
-            <div class="btn-wrapper">
-              <p><a href="/releases/" class="btn btn-inverse btn-lg">Download Geode</a> &nbsp;</p> 
-              <!-- Place this tag where you want the button to render. -->
-              <a class="github-button" href="https://github.com/apache/geode" data-icon="octicon-star" data-style="mega" data-count-href="/apache/geode/stargazers" data-count-api="/repos/apache/geode#stargazers_count" data-count-aria-label="# stargazers on GitHub" aria-label="Star apache/geode on GitHub">Star</a>
-              <a class="github-button" href="https://github.com/apache/geode/fork" data-icon="octicon-repo-forked" data-style="mega" data-count-href="/apache/geode/network" data-count-api="/repos/apache/geode#forks_count" data-count-aria-label="# forks on GitHub" aria-label="Fork apache/geode on GitHub">Fork</a>
-              <a class="github-button" href="https://github.com/apache/geode" data-icon="octicon-eye" data-style="mega" data-count-href="/apache/geode/watchers" data-count-api="/repos/apache/geode#subscribers_count" data-count-aria-label="# watchers on GitHub" aria-label="Watch apache/geode on GitHub">Watch</a>
-
-
-            </div>
-        </div>
-    </div>
+              <div class="btn-wrapper">
+                <p><a href="/releases/" class="btn btn-inverse btn-lg">Get Geode</a></p> 
+              </div>
+        	</div>
+    	</div>
 </section>
 
 <section class="bf-features">
@@ -150,7 +139,7 @@ <h2>Ready to get started?</h2>
         <div class="row">
             <div class="col-md-12 text-left">
                 <h2>About the Project</h2>
-<p>Apache Geode is a data management platform that provides real-time, consistent access to data-intensive applications throughout widely distributed cloud architectures.</p>
+<p>Apache Geode™ is a data management platform that provides real-time, consistent access to data-intensive applications throughout widely distributed cloud architectures.</p>
 
 <p>Geode pools memory, CPU, network resources, and optionally local disk across multiple processes
 to manage application objects and behavior. It uses dynamic replication and data partitioning
diff --git a/website/layouts/footer.html b/website/layouts/footer.html
index dd295ae1c..11bdd93a9 100644
--- a/website/layouts/footer.html
+++ b/website/layouts/footer.html
@@ -45,7 +45,8 @@
                     <li><a href="https://www.apache.org/foundation/sponsorship.html" target="_blank">Sponsorship</a></li>
                     <li><a href="https://www.apache.org/foundation/thanks.html" target="_blank">Thanks</a></li>
                     <li><a href="https://www.apache.org/security/">Security</a></li>
-                    <li><a href="https://www.apache.org/" target="_blank">Apache Foundation</a></li>
+					<li><a href="https://privacy.apache.org/policies/privacy-policy-public.html">Privacy</a>
+                    <li><a href="https://www.apache.org/" target="_blank">Apache Software Foundation</a></li>
                 </ul>
             </div>
             <div class="col-md-4">
@@ -66,8 +67,8 @@
           <center>
             <div id="copyright">
                 <a href="https://www.apache.org" target="_blank"><img src="/img/asf_logo.png" height="125"></a><br/><br/>
-                <p>Copyright © 2016 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.<br>
-                Apache, Apache Geode, and the Apache feather logos are trademarks of The Apache Software Foundation.</p>
+                <p>Copyright © 2025 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.<br>
+                Apache Geode, Apache, Geode, the Apache logo, and the Apache Geode project logo are either registered trademarks or trademarks of The Apache Software Foundation in the United States and other countries.</p>
                 <p>Site designed & assembled with love by <a href="https://github.com/ryuneeee">@ryuneeee</a> + <a href="https://github.com/realbeast">@realbeast</a> + <a href="https://twitter.com/timanglade">@timanglade</a> + <a href="https://twitter.com/snoopdave">@snoopdave</a> for Apache Usergrid.</p>
                 <p>Modified for Apache Geode by <a href="https://twitter.com/william_markito">@william_markito</a>.</p>
             </div>

From 91af01f9db2b6b8a8946bd1c85c936a9b2bd3ae9 Mon Sep 17 00:00:00 2001
From: Bryan Behrenshausen <bryan.behrenshausen@sas.com>
Date: Mon, 29 Sep 2025 15:21:34 -0400
Subject: [PATCH 2/2] Add section heading

This commit add a section heading, "Key Features," to introduce the site
section devoted to Geode's most noteworthy and useful features.

Signed-off-by: Bryan Behrenshausen <bryan.behrenshausen@sas.com>
---
 website/content/css/geode-site.css | 2 +-
 website/content/index.html         | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/website/content/css/geode-site.css b/website/content/css/geode-site.css
index e787db8b1..f6a8964fe 100644
--- a/website/content/css/geode-site.css
+++ b/website/content/css/geode-site.css
@@ -472,7 +472,7 @@ section > .container > h2 {
   /* border-bottom: 1px solid #e5e5e5; */
 }
 .bf-features {
-  color: white;
+  color: rgb(52,73,94);
   text-align: center;
   padding: 20px 0;
 }
diff --git a/website/content/index.html b/website/content/index.html
index 2107e809d..0073c00f7 100644
--- a/website/content/index.html
+++ b/website/content/index.html
@@ -33,6 +33,7 @@
 </section>
 
 <section class="bf-features">
+	<h2>Key features</h2>
     <div class="container">
         <div class="row">
             <div class="col-md-4">