From 2c19e64da03e06c56eee90b5a3717b526ae6604e Mon Sep 17 00:00:00 2001
From: Andrew Gerrand <adg@golang.org>
Date: Mon, 5 May 2014 10:21:58 -0700
Subject: [PATCH] [release-branch.go1.2] doc: document go1.2.2
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

««« CL 100110043 / 51dc50080c9f
doc: document go1.2.2

R=rsc, bradfitz
CC=golang-codereviews
https://golang.org/cl/100110043
»»»

R=iant
CC=golang-codereviews, golang-dev
https://golang.org/cl/98960043
---
 doc/devel/release.html | 30 ++++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/doc/devel/release.html b/doc/devel/release.html
index 5511db71bc..be4c340055 100644
--- a/doc/devel/release.html
+++ b/doc/devel/release.html
@@ -13,12 +13,32 @@ hg pull
 hg update <i>tag</i>
 </pre>
 
+<h2 id="go1.2">go1.2 (released 2013/12/01)</h2>
+
+<p>
+Go 1.2 is a major release of Go.
+Read the <a href="/doc/go1.2">Go 1.2 Release Notes</a> for more information.
+</p>
+
+<h3 id="go1.2.minor">Minor revisions</h3>
+
+<p>
+go1.2.1 (released 2014/03/02) includes bug fixes to the <code>runtime</code>, <code>net</code>, and <code>database/sql</code> packages.
+See the <a href="https://code.google.com/p/go/source/list?name=release-branch.go1.2&r=7ada9e760ce34e78aee5b476c9621556d0fa5d31">change history</a> for details.
+</p>
+
+<p>
+go1.2.2 (released 2014/05/05) includes a
+<a href="https://code.google.com/p/go/source/detail?r=bda3619e7a2c&repo=tools">security fix</a>
+that affects the tour binary included in the binary distributions (thanks to Guillaume T).
+This point release only affects binary distributions; no code in the main repository has changed. 
+</p>
+
 <h2 id="go1.1">go1.1 (released 2013/05/13)</h2>
 
 <p>
 Go 1.1 is a major release of Go.
-Read the <a href="/doc/go1.1.html">Go 1.1 Release Notes</a> for
-more information.
+Read the <a href="/doc/go1.1">Go 1.1 Release Notes</a> for more information.
 </p>
 
 <h3 id="go1.1.minor">Minor revisions</h3>
@@ -363,12 +383,6 @@ variable to build and install your own code and external libraries outside of
 the Go tree (and avoid writing Makefiles).
 </p>
 
-<h3 id="go1.2.minor">Minor revisions</h3>
-
-<p>
-go1.2.1 (released 2014/03/02) includes bug fixes to the <code>runtime</code>, <code>net</code>, and <code>database/sql</code> packages.
-See the <a href="https://code.google.com/p/go/source/list?name=release-branch.go1.2&r=7ada9e760ce34e78aee5b476c9621556d0fa5d31">change history</a> for details.
-</p>
 
 <h3 id="r58.minor">Minor revisions</h3>
 
-- 
2.48.1