Merge branch 'master' into dev

# Conflicts:
#	www/content/docs.md

17 files changed, 60 insertions, 51 deletions

diff --git a/www/content/_index.md b/www/content/_index.md
index 7aad2773..04047b44 100644
--- a/www/content/_index.md
+++ b/www/content/_index.md
@@ -8,7 +8,7 @@ insert_anchor_links = "left"
 </div>
 
 <div style="border: 1px solid lightgrey; margin:24px;padding:12px;border-radius: 8px; background-color: whitesmoke; filter: drop-shadow(3px 3px darkgray)">
-<b>NEWS:</b> We are excited to <a href="/posts/2023-06-06-htmx-github-accelerator/">announce</a> that htmx has been accepted into the first class of the <a href="https://accelerator.github.com/">Github Open Source Accelerator!</a>
+<b>NEWS:</b> We are excited to <a href="/posts/2023-06-06-htmx-github-accelerator/">announce</a> that htmx has been accepted into the first class of the <a href="https://accelerator.github.com/">GitHub Open Source Accelerator!</a>
 </div>
 
 <h2>introduction</h2>
@@ -54,7 +54,7 @@ Read the [docs introduction](@/docs.md#introduction) for a more in-depth... intr
 <h2>sponsors <iframe src="https://github.com/sponsors/bigskysoftware/button" title="Sponsor htmx" height="32" width="114" style="border: 1px solid gray; border-radius: 12px; float:right"></iframe></h2>
 
 
-htmx development can be supported via [Github Sponsors](https://github.com/sponsors/bigskysoftware?o=esb)
+htmx development can be supported via [GitHub Sponsors](https://github.com/sponsors/bigskysoftware?o=esb)
 
 
 Thank you to all our generous <a href="https://github.com/sponsors/bigskysoftware?o=esb">supporters</a>, including:
diff --git a/www/content/attributes/hx-sse.md b/www/content/attributes/hx-sse.md
index 16ff86c4..980806e8 100644
--- a/www/content/attributes/hx-sse.md
+++ b/www/content/attributes/hx-sse.md
@@ -84,7 +84,7 @@ data: <div>Content to swap into your HTML page.</div>
 
 ### Test SSE Server
 
-Htmx includes an SSE test server with many more examples of how to use Server Sent Events.  Download the htmx source code from github and navigate to /test/servers/sse to experiment.
+Htmx includes an SSE test server with many more examples of how to use Server Sent Events.  Download the htmx source code from GitHub and navigate to /test/servers/sse to experiment.
 
 ## Notes
 
diff --git a/www/content/attributes/hx-trigger.md b/www/content/attributes/hx-trigger.md
index 595b85cc..d87379aa 100644
--- a/www/content/attributes/hx-trigger.md
+++ b/www/content/attributes/hx-trigger.md
@@ -132,11 +132,11 @@ If you want to add a filter to polling, it should be added *after* the poll decl
 
 ### Multiple Triggers
 
-Multiple triggers can be provided, seprarated by commas.  Each trigger gets its own options.
+Multiple triggers can be provided, separated by commas.  Each trigger gets its own options.
 ```html
   <div hx-get="/news" hx-trigger="load, click delay:1s"></div>
 ```
-This example will load `/news` immediate on the page load, and then again with a delay of one second after each click.
+This example will load `/news` immediately on page load, and then again with a delay of one second after each click.
 
 ### Via JavaScript
 
diff --git a/www/content/attributes/hx-ws.md b/www/content/attributes/hx-ws.md
index 82ac1318..ff413297 100644
--- a/www/content/attributes/hx-ws.md
+++ b/www/content/attributes/hx-ws.md
@@ -44,7 +44,7 @@ Own implementations can be provided by setting `htmx.config.wsReconnectDelay` to
 
 ### Test Web Sockets Server
 
-Htmx includes a WebSockets test server with many more examples of how to use Server Sent Events.  Download the htmx source code from github and navigate to /test/servers/ws to experiment.
+Htmx includes a WebSockets test server with many more examples of how to use Server Sent Events.  Download the htmx source code from GitHub and navigate to /test/servers/ws to experiment.
 
 ## Notes
 
diff --git a/www/content/docs.md b/www/content/docs.md
index e0eca687..72724ede 100644
--- a/www/content/docs.md
+++ b/www/content/docs.md
@@ -906,9 +906,9 @@ htmx supports some htmx-specific response headers:
 
 For more on the `HX-Trigger` headers, see [`HX-Trigger` Response Headers](@/headers/hx-trigger.md).
 
-Submitting a form via htmx has the benefit, that the [Post/Redirect/Get Pattern](https://en.wikipedia.org/wiki/Post/Redirect/Get) is not needed
-any more. After successful processing a POST request on the server, you don't need to return a [HTTP 302 (Redirect)](https://en.wikipedia.org/wiki/HTTP_302). You can directly return the new HTML fragment.
-
+Submitting a form via htmx has the benefit of no longer needing the [Post/Redirect/Get Pattern](https://en.wikipedia.org/wiki/Post/Redirect/Get).
+After successfully processing a POST request on the server, you don't need to return a [HTTP 302 (Redirect)](https://en.wikipedia.org/wiki/HTTP_302). You can directly return the new HTML fragment.
+ 
 ### Request Order of Operations {#request-operations}
 
 The order of operations in a htmx request are:
diff --git a/www/content/essays/_index.md b/www/content/essays/_index.md
index 5d47da9a..baf0abf1 100644
--- a/www/content/essays/_index.md
+++ b/www/content/essays/_index.md
@@ -3,37 +3,39 @@ title = "Essays"
 insert_anchor_links = "left"
 +++
 
-* [Hypermedia Friendly Scripting](@/essays/hypermedia-friendly-scripting.md)
+### Hypermedia and REST
+* [HATEOAS](@/essays/hateoas.md)
+* [How Did REST Come To Mean The Opposite of REST?](@/essays/how-did-rest-come-to-mean-the-opposite-of-rest.md)
+* [Two Approaches To Decoupling](@/essays/two-approaches-to-decoupling.md)
+* [Hypermedia APIs vs. Data APIs](@/essays/hypermedia-apis-vs-data-apis.md)
+* [Splitting Your Data & Application APIs: Going Further](@/essays/splitting-your-apis.md)
+* [Hypermedia Clients](@/essays/hypermedia-clients.md)
+* [HATEOAS Is For Humans](https://intercoolerjs.org/2016/05/08/hatoeas-is-for-humans.html)
+* [Rescuing REST From the API Winter](https://intercoolerjs.org/2016/01/18/rescuing-rest.html)
+* [Taking HTML Seriously](https://intercoolerjs.org/2020/01/14/taking-html-seriously)
+* [REST Copypasta](@/essays/rest-copypasta.md)
+
+### Why Hypermedia? Why Multi-Page Applications?
 * [Hypermedia On Whatever you'd Like (HOWL)](@/essays/hypermedia-on-whatever-youd-like.md)
+* [A Response To "Have SPAs Ruined The Web"](@/essays/a-response-to-rich-harris.md)
 * [When To Use Hypermedia?](@/essays/when-to-use-hypermedia.md)
+* [The API Churn/Security Trade-off](https://intercoolerjs.org/2016/02/17/api-churn-vs-security.html)
+* [SPA Alternative](@/essays/spa-alternative.md)
+
+### Building Hypermedia Applications
 * [A Real World React to htmx Port](@/essays/a-real-world-react-to-htmx-port.md)
-* [How Did REST Come To Mean The Opposite of REST?](@/essays/how-did-rest-come-to-mean-the-opposite-of-rest.md)
 * [Hypermedia-Driven Applications (HDAs)](@/essays/hypermedia-driven-applications.md)
-* [HATEOAS](@/essays/hateoas.md)
-* [Hypermedia Clients](@/essays/hypermedia-clients.md)
-* [Locality of Behavior (LoB)](@/essays/locality-of-behaviour.md)
-* [Splitting Your Data & Application APIs: Going Further](@/essays/splitting-your-apis.md)
-* [Hypermedia APIs vs. Data APIs](@/essays/hypermedia-apis-vs-data-apis.md)
-* [Complexity Budget](@/essays/complexity-budget.md)
-* [SPA Alternative](@/essays/spa-alternative.md)
-* [Two Approaches To Decoupling](@/essays/two-approaches-to-decoupling.md)
-* [A Response To "Have SPAs Ruined The Web"](@/essays/a-response-to-rich-harris.md)
-* [Template Fragments](@/essays/template-fragments.md)
+* [Hypermedia Friendly Scripting](@/essays/hypermedia-friendly-scripting.md)
 * [10 Tips For Building SSR/HDA applications](@/essays/10-tips-for-SSR-HDA-apps.md)
+* [Template Fragments](@/essays/template-fragments.md)
 * [View Transitions](@/essays/view-transitions.md)
-* [REST Copypasta](@/essays/rest-copypasta.md)
 
+### Complexity Very Very Bad
+* [The Grug Brained Developer](https://grugbrain.dev)
+* [Locality of Behavior (LoB)](@/essays/locality-of-behaviour.md)
+* [Complexity Budget](@/essays/complexity-budget.md)
 
-### Older [intercooler.js](https://intercoolerjs.org) Essays
-
-* [Taking HTML Seriously](https://intercoolerjs.org/2020/01/14/taking-html-seriously)
-* [HATEOAS Is For Humans](https://intercoolerjs.org/2016/05/08/hatoeas-is-for-humans.html)
-* [The API Churn/Security Trade-off](https://intercoolerjs.org/2016/02/17/api-churn-vs-security.html)
-* [Rescuing REST From the API Winter](https://intercoolerjs.org/2016/01/18/rescuing-rest.html)
-
-### Grug
 
-* [The Grug Brained Developer](https://grugbrain.dev)
 
 ## Banners
 <div style="text-align: center;margin:32px">
diff --git a/www/content/essays/a-response-to-rich-harris.md b/www/content/essays/a-response-to-rich-harris.md
index 0aa4480d..264b1690 100644
--- a/www/content/essays/a-response-to-rich-harris.md
+++ b/www/content/essays/a-response-to-rich-harris.md
@@ -85,13 +85,13 @@ This is a valid point: with an MPA-style application your UI interactions are ga
 
 Of course the problem with latency issues is that they can make an app feel laggy.  But, like you, we have worked with plenty of laggy SPAs, so we must say the problem isn't neatly solved by simply adopting SPA frameworks.  On top of that, optimistically synchronizing data with a server can lead to extremely difficult to understand data consistency issues as well as a significant increase in overall application complexity, a topic we will return to later.
 
-### "Github Has UI Bugs"
+### "GitHub Has UI Bugs"
 
-Github does, indeed, have UI bugs.  However, none of them are particularly difficult to solve.
+GitHub does, indeed, have UI bugs.  However, none of them are particularly difficult to solve.
 
 htmx offers multiple ways to [update content beyond the target element](@/examples/update-other-content.md), all of them quite easy and any of which would work to solve the UI consistency issues Mr. Harris points out.
 
-Contrast the Github UI issues with the Instagram UI issues Mr. Harris pointed out earlier: the Instagram issues would
+Contrast the GitHub UI issues with the Instagram UI issues Mr. Harris pointed out earlier: the Instagram issues would
 require far more sophisticated engineering work to resolve.
 
 ## Transitional Applications
@@ -167,7 +167,7 @@ unexpected happened: Python took off and, at the same time, javascript flat line
 
 </div>
 
-This trend of javascript peaking in the mid-2010's can be observed [on Github](https://www.benfrederickson.com/ranking-programming-languages-by-github-users/) as well:
+This trend of javascript peaking in the mid-2010's can be observed [on GitHub](https://www.benfrederickson.com/ranking-programming-languages-by-github-users/) as well:
 
 <div style="text-align:center">
 
diff --git a/www/content/essays/hateoas.md b/www/content/essays/hateoas.md
index 45457e8a..631faba4 100644
--- a/www/content/essays/hateoas.md
+++ b/www/content/essays/hateoas.md
@@ -179,9 +179,9 @@ HTTP/1.1 200 OK
 <html>
   <body>
     <form method="post" action="/accounts/12345/deposits">
-        <input name="amount" type="number'/>
+        <input name="amount" type="number" />
         <button>Submit</button>
-    </div>
+    </form>
   <body>
 </html>
 ```
diff --git a/www/content/essays/template-fragments.md b/www/content/essays/template-fragments.md
index cc9cc180..c0fbdfbf 100644
--- a/www/content/essays/template-fragments.md
+++ b/www/content/essays/template-fragments.md
@@ -146,6 +146,7 @@ Here are some known implementations of the fragment concept:
   * [jinja_partials package](https://github.com/mikeckennedy/jinja_partials) ([discussion](https://github.com/mikeckennedy/jinja_partials/issues/1) on motivation)
   * [chameleon_partials package](https://github.com/mikeckennedy/chameleon_partials)
   * [htmlgenerator](https://github.com/basxsoftwareassociation/htmlgenerator)
+  * [django-template-partials](https://pypi.org/project/django-template-partials/) ([repository](https://github.com/carltongibson/django-template-partials))
 * .NET
   * [Giraffe.ViewEngine.Htmx](https://github.com/bit-badger/Giraffe.Htmx/tree/main/src/ViewEngine.Htmx)
 
diff --git a/www/content/essays/when-to-use-hypermedia.md b/www/content/essays/when-to-use-hypermedia.md
index 46ae3576..64aca99e 100644
--- a/www/content/essays/when-to-use-hypermedia.md
+++ b/www/content/essays/when-to-use-hypermedia.md
@@ -73,13 +73,13 @@ to the simple [list view/detail view](@/examples/edit-row.md) approach many serv
 
 One area where hypermedia can start to go a little wobbly is when you have UI dependencies that span structural
 areas of the screen.  A good example of this, and one that often comes up when discussing the hypermedia approach, is the issue
-count number shown on the ["Issues" tab](https://github.com/bigskysoftware/htmx/issues) in Github.  For a long time, 
-when you closed an issue on Github, the issue count on the tab did not update properly.  Github, in general (although
+count number shown on the ["Issues" tab](https://github.com/bigskysoftware/htmx/issues) in GitHub.  For a long time, 
+when you closed an issue on GitHub, the issue count on the tab did not update properly.  GitHub, in general (although
  not exclusively), uses a hypermedia-style application.
 
 "Ah ha!", exclaims the SPA enthusiast, "See, even GitHub can't get this right!"
 
-Well, Github has fixed the issue, but it does demonstrate a problem with the hypermedia approach: how do you update
+Well, GitHub has fixed the issue, but it does demonstrate a problem with the hypermedia approach: how do you update
 disjoint parts of the UI cleanly?  htmx offers [a few techniques for making this work](@/examples/update-other-content.md),
 and Contexte, in their talk, discuss handling this situation very cleanly, using the event approach.
 
diff --git a/www/content/events.md b/www/content/events.md
index b1afe00e..7f660363 100644
--- a/www/content/events.md
+++ b/www/content/events.md
@@ -170,7 +170,7 @@ than a single value.
 
 ### Event - `htmx:confirm` {#htmx:confirm}
 
-This event is triggered immediate after a trigger occurs on an element.  It allows you to cancel (or delay) issuing
+This event is triggered immediately after a trigger occurs on an element.  It allows you to cancel (or delay) issuing
 the AJAX request.  If you call `preventDefault()` on the event, it will not issue the given request.  The `detail`
 object contains a function, `evt.detail.issueRequest()`, that can be used to issue the actual AJAX request at a
 later point.  Combining these two features allows you to create an asynchronous confirmation dialog.
diff --git a/www/content/examples/click-to-edit.md b/www/content/examples/click-to-edit.md
index 518bf858..eda4b233 100644
--- a/www/content/examples/click-to-edit.md
+++ b/www/content/examples/click-to-edit.md
@@ -5,7 +5,7 @@ template = "demo.html"
 
 The click to edit pattern provides a way to offer inline editing of all or part of a record without a page refresh.
 
-* This pattern starts with a UI that shows the details of a contact.  The div has a button that will get the editing UI for the contact from `/contacts/1/edit`
+* This pattern starts with a UI that shows the details of a contact.  The div has a button that will get the editing UI for the contact from `/contact/1/edit`
 
 ```html
 <div hx-target="this" hx-swap="outerHTML">
@@ -39,7 +39,7 @@ The click to edit pattern provides a way to offer inline editing of all or part
 </form>
 ```
 
-* The form issues a `PUT` back to `/contacts/1`, following the usual REST-ful pattern.
+* The form issues a `PUT` back to `/contact/1`, following the usual REST-ful pattern.
 
 {{ demoenv() }}
 
diff --git a/www/content/posts/2020-11-24-htmx-1.0.0-is-released.md b/www/content/posts/2020-11-24-htmx-1.0.0-is-released.md
index 64e1dad8..92a41d0f 100644
--- a/www/content/posts/2020-11-24-htmx-1.0.0-is-released.md
+++ b/www/content/posts/2020-11-24-htmx-1.0.0-is-released.md
@@ -36,7 +36,7 @@ In [May](https://github.com/bigskysoftware/htmx/releases/tag/v0.0.1) htmx reache
 who was interested in htmx as a base for his new reactive library, [Sprig](https://putyourlightson.com/plugins/sprig).  Ben was willing to be an early adopter of htmx and pushed the library along
 much faster than it would have gone otherwise.
 
-I have been very lucky to the have help and feedback from many contributors in [Github](https://github.com/bigskysoftware/htmx/graphs/contributors) and on [Discord](https://htmx.org/discord).  I'd like to thank, in particular, [Ben Pate](https://github.com/benpate), [Robert Schroll](https://github.com/rschroll) & [Alejandro Schmeichler](https://github.com/jreviews) for contributing code as well as new ideas and discussions.
+I have been very lucky to the have help and feedback from many contributors in [GitHub](https://github.com/bigskysoftware/htmx/graphs/contributors) and on [Discord](https://htmx.org/discord).  I'd like to thank, in particular, [Ben Pate](https://github.com/benpate), [Robert Schroll](https://github.com/rschroll) & [Alejandro Schmeichler](https://github.com/jreviews) for contributing code as well as new ideas and discussions.
 
 I would like to thank [Devmode.fm](https://devmode.fm/) for having me on to [talk about htmx](https://devmode.fm/episodes/dynamic-html-with-htmx) and for cleaning up all my "uhhs" and "umms".  
 
diff --git a/www/content/posts/2020-6-30-htmx-0.0.7-is-released.md b/www/content/posts/2020-6-30-htmx-0.0.7-is-released.md
index 6f2c918b..95facdcf 100644
--- a/www/content/posts/2020-6-30-htmx-0.0.7-is-released.md
+++ b/www/content/posts/2020-6-30-htmx-0.0.7-is-released.md
@@ -22,7 +22,7 @@ I'm pleased to announce the [0.0.7 release](https://unpkg.com/browse/htmx.org@0.
     * `view` - allows you to scroll the `top` or `bottom` of the target into view
 * The [`hx-push-url`](@/attributes/hx-push-url.md) attribute now can optionally take a URL to push, in addition to `true` and `false`
 * Added the [`hx-vars`](@/attributes/hx-vars.md) attribute that allows you to dynamically add to the parameters that will be submitted with a request
-* You can now sponsor htmx development via [Github Sponsors](https://github.com/sponsors/bigskysoftware)
+* You can now sponsor htmx development via [GitHub Sponsors](https://github.com/sponsors/bigskysoftware)
     * A big thanks to our first sponsors!
         * <https://github.com/putyourlightson>
         * <https://github.com/simosentissi>
diff --git a/www/content/posts/2023-06-06-htmx-github-accelerator.md b/www/content/posts/2023-06-06-htmx-github-accelerator.md
index e567ce46..9f9a523e 100644
--- a/www/content/posts/2023-06-06-htmx-github-accelerator.md
+++ b/www/content/posts/2023-06-06-htmx-github-accelerator.md
@@ -1,19 +1,19 @@
 +++
-title = "htmx is part of the Github Accelerator!"
+title = "htmx is part of the GitHub Accelerator!"
 date = 2023-06-06
 [taxonomies]
 tag = ["posts", "announcements"]
 +++
 
 We are excited to announce that htmx has been accepted into the first class of the 
-[Github Open Source Accelerator](https://accelerator.github.com/)!  This is a tremendous opportunity to work with and
+[GitHub Open Source Accelerator](https://accelerator.github.com/)!  This is a tremendous opportunity to work with and
 learn from some of the most successful open source developers and projects, and a great chance to get the message
 out about hypermedia and htmx.
 
 We plan on using this opportunity to begin work on htmx 2.0 and, we hope, possibly learn how to make working on htmx
 a full time job!
 
-Here are some of the other open source projects that we have met through the Github accelerator and that we recommend 
+Here are some of the other open source projects that we have met through the GitHub accelerator and that we recommend 
 people check out:
 
 <ul>
diff --git a/www/content/server-examples.md b/www/content/server-examples.md
index 412fae39..29c65f0a 100644
--- a/www/content/server-examples.md
+++ b/www/content/server-examples.md
@@ -128,3 +128,9 @@ These examples may make it a bit easier to get started using htmx with your plat
 ### Phoenix
 
 - <https://github.com/hungle00/todo-htmx>
+
+## Go
+
+### templ
+
+- <https://templ.guide/server-side-rendering/htmx>
diff --git a/www/content/talk/index.md b/www/content/talk/index.md
index 92bacfe7..d4c1b243 100644
--- a/www/content/talk/index.md
+++ b/www/content/talk/index.md
@@ -5,11 +5,11 @@ template = "talk.html"
 
 [htmx Discord Server](/discord)
 
-[Github Discussions](https://github.com/bigskysoftware/htmx/discussions)
+[GitHub Discussions](https://github.com/bigskysoftware/htmx/discussions)
 
 ## Feature Requests & Bug Reports
 
-[Github Issues](https://github.com/bigskysoftware/htmx/issues)
+[GitHub Issues](https://github.com/bigskysoftware/htmx/issues)
 
 ## Social
 
@@ -26,7 +26,7 @@ Email: [htmx@bigsky.software](mailto:htmx@bigsky.software)
 
 <iframe src="https://github.com/sponsors/bigskysoftware/card" title="Sponsor bigskysoftware" height="225" width="600" style="border: 0;"></iframe>
 
-## Github Stars
+## GitHub Stars
 
 <iframe style="width:100%;height:auto;min-width:600px;min-height:400px;" src="https://star-history.com/embed?secret=Z2hwX3oybDFUTnBMSTZBaXNhcjFwZmN5UVRnZEFSR3JFdTRPckV2Rw==#bigskysoftware/htmx&bigskysoftware/_hyperscript&Date" frameBorder="0"></iframe>