From 86abfbb931312db022ed8437a89219791ced6435 Mon Sep 17 00:00:00 2001
From: Russ Cox <rsc@golang.org>
Date: Mon, 27 Feb 2017 20:22:48 -0500
Subject: [PATCH] doc/devel: update release.html for new support policy

Fixes #19069.

Change-Id: I211a304ec57d6b94366af4c0db413c8055b9634d
Reviewed-on: https://go-review.googlesource.com/37531
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Reviewed-by: Steve Francia <spf@golang.org>
---
 doc/devel/release.html | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/doc/devel/release.html b/doc/devel/release.html
index d046149880..162966e03c 100644
--- a/doc/devel/release.html
+++ b/doc/devel/release.html
@@ -15,19 +15,12 @@ git checkout <i>release-branch</i>
 <h2 id="policy">Release Policy</h2>
 
 <p>
-Each major Go release obsoletes and ends support for the previous one.
-For example, if Go 1.5 has been released, then it is the current release
-and Go 1.4 and earlier are no longer supported.
-We fix critical problems in the current release as needed by issuing minor revisions
-(for example, Go 1.5.1, Go 1.5.2, and so on).
-</p>
-
-<p>
-As a special case, we issue minor revisions for critical security problems
-in both the current release and the previous release.
-For example, if Go 1.5 is the current release then we will issue minor revisions
-to fix critical security problems in both Go 1.4 and Go 1.5 as they arise.
-See the <a href="/security">security policy</a> for more details.
+Each major Go release is supported until there are two newer major releases.
+For example, Go 1.8 is supported until Go 1.10 is released,
+and Go 1.9 is supported until Go 1.11 is released.
+We fix critical problems, including <a href="/security">critical security problems</a>,
+in supported releases as needed by issuing minor revisions
+(for example, Go 1.8.1, Go 1.8.2, and so on).
 </p>
 
 <h2 id="go1.8">go1.8 (released 2017/02/16)</h2>
-- 
2.48.1