From 33d72fd4122a4b7e31e738d5d9283093966ec14a Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <iant@golang.org>
Date: Sun, 14 Feb 2021 17:21:56 -0800
Subject: doc/faq: update generics entry to reflect accepted proposal

For #43651

Change-Id: Idb511f4c759d9a77de289938c19c2c1d4a542a17
Reviewed-on: https://go-review.googlesource.com/c/go/+/291990
Trust: Ian Lance Taylor <iant@golang.org>
Reviewed-by: Rob Pike <r@golang.org>
---
 doc/go_faq.html | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/doc/go_faq.html b/doc/go_faq.html
index 23a3080c9b..67dc0b9bd4 100644
--- a/doc/go_faq.html
+++ b/doc/go_faq.html
@@ -446,8 +446,10 @@ they compensate in interesting ways for the lack of <var>X</var>.
 <h3 id="generics">
 Why does Go not have generic types?</h3>
 <p>
-Generics may well be added at some point.  We don't feel an urgency for
-them, although we understand some programmers do.
+A <a href="https://golang.org/issue/43651">language proposal
+implementing a form of generic types</a> has been accepted for
+inclusion in the language.
+If all goes well it will be available in the Go 1.18 release.
 </p>
 
 <p>
-- 
cgit v1.2.3-54-g00ecf