From 35222eeb78ddb84f5787729c5f149cfd73d63ef8 Mon Sep 17 00:00:00 2001
From: Roland Shoemaker <roland@golang.org>
Date: Tue, 19 Dec 2023 08:14:50 -0800
Subject: [PATCH] doc: add html/template release note

Updates #61422

Change-Id: Ie86e8545d55cfd0898d21387d8b48d9392f85bf0
Reviewed-on: https://go-review.googlesource.com/c/go/+/551335
Reviewed-by: Carlos Amedee <carlos@golang.org>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
---
 doc/go1.22.html | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/doc/go1.22.html b/doc/go1.22.html
index d265541a59..951a8e3160 100644
--- a/doc/go1.22.html
+++ b/doc/go1.22.html
@@ -650,17 +650,15 @@ We plan to include an API migration tool in a future release, likely Go 1.23.
   </dd>
 </dl><!-- go/version -->
 
-<!-- <dl id="html/template"><dt><a href="/pkg/html/template/">html/template</a></dt> -->
-<!--   <dd> -->
-<!--     <p><\!-- https://go.dev/issue/61619 -\-> -->
-<!--       TODO: <a href="https://go.dev/issue/61619">https://go.dev/issue/61619</a>: allow actions in JS template literals -->
-<!--     </p> -->
-
-<!--     <p><\!-- CL 507995 -\-> -->
-<!--       TODO: <a href="https://go.dev/cl/507995">https://go.dev/cl/507995</a>: html/template: support parsing complex JS template literals; modified api/next/61619.txt -->
-<!--     </p> -->
-<!--   </dd> -->
-<!-- </dl><\!-- html/template -\-> -->
+<dl id="html/template"><dt><a href="/pkg/html/template/">html/template</a></dt>
+  <dd>
+    <p><!-- https://go.dev/issue/61619, CL 507995 -->
+      Javascript template literals may now contain Go template actions, and parsing a template containing one will
+      no longer return <code>ErrJSTemplate</code>. Similarly the GODEBUG setting <code>jstmpllitinterp</code> no
+      longer has any effect.
+    </p>
+  </dd>
+</dl><!-- html/template -->
 
 <dl id="io"><dt><a href="/pkg/io/">io</a></dt>
   <dd>
-- 
2.48.1