From: Jeremy Faller <jeremy@golang.org>
Date: Fri, 19 Nov 2021 21:51:47 +0000 (-0500)
Subject: doc/go1.18: add short-circuit evaluation for text/template
X-Git-Tag: go1.18beta1~124
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=3c6295d272d09e6c7be912510e4b62afc0ef8ffc;p=gostls13.git

doc/go1.18: add short-circuit evaluation for text/template

This description is based on https://golang.org/cl/321490.

Updates #47694

Change-Id: I48656cd487d2fccf0b0d3390f350f1bc6f2b0080
Reviewed-on: https://go-review.googlesource.com/c/go/+/365738
Trust: Jeremy Faller <jeremy@golang.org>
Trust: Dmitri Shuralyov <dmitshur@golang.org>
Run-TryBot: Jeremy Faller <jeremy@golang.org>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org>
---

diff --git a/doc/go1.18.html b/doc/go1.18.html
index d9da160ab5..74d0e0c23e 100644
--- a/doc/go1.18.html
+++ b/doc/go1.18.html
@@ -290,7 +290,7 @@ proposal</a>.
 <dl id="bufio"><dt><a href="/pkg/bufio/">bufio</a></dt>
   <dd>
     <p><!-- CL 345569 -->
-      The new <a href="/pkg/bufio#AvailableBuffer"><code>Writer.AvailableBuffer</code></a>
+      The new <a href="/pkg/bufio#Writer.AvailableBuffer"><code>Writer.AvailableBuffer</code></a>
       method returns an empty buffer with a possibly non-empty capacity for use
       with append-like APIs. After appending, the buffer can be provided to a
 			succeeding <code>Write</code> call and possibly avoid any copying.
@@ -517,7 +517,11 @@ proposal</a>.
 <dl id="text/template"><dt><a href="/pkg/text/template/">text/template</a></dt>
   <dd>
     <p><!-- CL 321490 -->
-      TODO: <a href="https://golang.org/cl/321490">https://golang.org/cl/321490</a>: implement short-circuit and, or
+      The <code>and</code> function no longer always evaluates all arguments; it
+      stops evaluating arguments after the first argument that evaluates to
+      false.  Similarly, the <code>or</code> function now stops evaluating
+      arguments after the first argument that evaluates to true. This makes a
+      difference if any of the arguments is a function call.
     </p>
   </dd>
 </dl><!-- text/template -->