From c838cfb7a6fc60b21fa92eadc37e4026ad9af4dd Mon Sep 17 00:00:00 2001
From: Carson Gross <carson@bigsky.software>
Date: Fri, 20 Jun 2025 15:46:42 -0600
Subject: [PATCH 1/3] update docs

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7f5ebde6..c898c376 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,8 @@
 
 * 100% test coverage! (Thank you @MichaelWest22!)
 * The default recommended CDN is now jsDelivr
-* TODO `inherit` keyword
+* The `inherit` keyword is now supported by `hx-include`, `hx-indicator` and `hx-disabled-elt` to allow you to inherit
+  the value from a parent and extend it.
 * `hx-on` listeners are now added before processing nodes so events during processing can be captured
 * Using `<button hx-verb="/endpoint" type="reset">` will now reset the associated form (after submitting to `/endpoint`)
 * Using `<button formmethod="dialog">` will no longer submit its associated form

From 5df061fb65c19b74f0aa6bfecbff96ad72d9bb49 Mon Sep 17 00:00:00 2001
From: surfskidude <surfskidude@users.noreply.github.com>
Date: Wed, 25 Jun 2025 18:17:24 +0200
Subject: [PATCH 2/3] Adding Lua Server Pages server example (#3347)

---
 www/content/server-examples.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/www/content/server-examples.md b/www/content/server-examples.md
index 2821818a..4effd70b 100644
--- a/www/content/server-examples.md
+++ b/www/content/server-examples.md
@@ -57,6 +57,10 @@ These examples may make it a bit easier to get started using htmx with your plat
 - <https://github.com/cscortes/htmxflask>
 - <https://github.com/Konfuzian/htmx-examples-with-flask/>
 
+### Lua
+
+- Lua Server Pages: <https://realtimelogic.com/articles/LSP-htmx-A-Powerful-Duo-for-Embedded-Web-Apps>
+
 ### py4web
 
 - <https://github.com/jpsteil/py4web_htmx_demo>
@@ -235,4 +239,4 @@ These examples may make it a bit easier to get started using htmx with your plat
 
 ## FreePascal with Pas2JS
 
-- <https://github.com/zendrael/create_htmx_pascal_app>
\ No newline at end of file
+- <https://github.com/zendrael/create_htmx_pascal_app>

From 17f417c923aad7ed3b898bf59a9b54b48855db1a Mon Sep 17 00:00:00 2001
From: Carson Gross <carson@bigsky.software>
Date: Wed, 25 Jun 2025 15:15:48 -0600
Subject: [PATCH 3/3] remove 2.0 announcement

---
 www/content/_index.md | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/www/content/_index.md b/www/content/_index.md
index c6c42fc6..4d14136b 100644
--- a/www/content/_index.md
+++ b/www/content/_index.md
@@ -91,12 +91,6 @@ if(window.location.search=="?ads=true") {
 </a>
 </div>
 
-<div class="alert">
-<b>NEWS:</b> htmx 2.0 has been released!  It is not currently marked as <a href="https://docs.npmjs.com/cli/v10/commands/npm-dist-tag#purpose"><code>latest</code></a>
-in NPM so that people using the <a href="https://v1.htmx.org">1.x line</a> are not accidentally upgraded.  We will mark
-2.0 as <code>latest</code> at some point in 2025.
-</div>
-
 <h2>introduction</h2>
 
 htmx gives you access to [AJAX](@/docs.md#ajax), [CSS Transitions](@/docs.md#css_transitions), [WebSockets](@/docs.md#websockets-and-sse) and [Server Sent Events](@/docs.md#websockets-and-sse)