[dev.garbage] Merge remote-tracking branch 'origin/master' into HEAD

Change-Id: I282fd9ce9db435dfd35e882a9502ab1abc185297

7 files changed, 51 insertions, 12 deletions

diff --git a/doc/contribute.html b/doc/contribute.html
index 59b3d20a51..1cd6f37d34 100644
--- a/doc/contribute.html
+++ b/doc/contribute.html
@@ -16,6 +16,10 @@ have <a href="code.html">written and tested your code</a>.
 see <a href="gccgo_contribute.html">Contributing to gccgo</a>.)
 </p>
 
+<p>
+Sensitive security-related issues should be reported to <a href="mailto:security@golang.org">security@golang.org</a>.
+</p>
+
 <h2 id="Design">Discuss your design</h2>
 
 <p>
diff --git a/doc/devel/release.html b/doc/devel/release.html
index 299f6dc3c5..7e7312d6e7 100644
--- a/doc/devel/release.html
+++ b/doc/devel/release.html
@@ -37,6 +37,22 @@ Go 1.6 is a major release of Go.
 Read the <a href="/doc/go1.6">Go 1.6 Release Notes</a> for more information.
 </p>
 
+<h3 id="go1.6.minor">Minor revisions</h3>
+
+<p>
+go1.6.1 (released 2016/04/12) includes two security fixes.
+See the <a href="https://github.com/golang/go/issues?q=milestone%3AGo1.6.1">Go
+1.6.1 milestone</a> on our issue tracker for details.
+</p>
+
+<p>
+go1.6.2 (released 2016/04/20) includes fixes to the compiler, runtime, tools,
+documentation, and the <code>mime/multipart</code>, <code>net/http</code>, and
+<code>sort</code> packages.
+See the <a href="https://github.com/golang/go/issues?q=milestone%3AGo1.6.2">Go
+1.6.2 milestone</a> on our issue tracker for details.
+</p>
+
 <h2 id="go1.5">go1.5 (released 2015/08/19)</h2>
 
 <p>
@@ -68,6 +84,13 @@ affecting the <code>crypto/tls</code> package.
 See the <a href="https://golang.org/s/go153announce">release announcement</a> for details.
 </p>
 
+<p>
+go1.5.4 (released 2016/04/12) includes two security fixes.
+It contains the same fixes as Go 1.6.1 and was released at the same time.
+See the <a href="https://github.com/golang/go/issues?q=milestone%3AGo1.6.1">Go
+1.6.1 milestone</a> on our issue tracker for details.
+</p>
+
 <h2 id="go1.4">go1.4 (released 2014/12/10)</h2>
 
 <p>
diff --git a/doc/go1.6.html b/doc/go1.6.html
index 8dea862ca4..9594736e65 100644
--- a/doc/go1.6.html
+++ b/doc/go1.6.html
@@ -168,7 +168,7 @@ Go 1.7 will remove support for the old syntax.
 <p>
 The release schedules for the GCC and Go projects do not coincide.
 GCC release 5 contains the Go 1.4 version of gccgo.
-The next release, GCC 6, will have the Go 1.6 version of gccgo.
+The next release, GCC 6, will have the Go 1.6.1 version of gccgo.
 </p>
 
 <h3 id="go_command">Go command</h3>
diff --git a/doc/go1.7.txt b/doc/go1.7.txt
index 0f179ad1af..7dd24edf90 100644
--- a/doc/go1.7.txt
+++ b/doc/go1.7.txt
@@ -6,6 +6,7 @@ cmd/link: "-X name value" form gone (CL 19614)
 cmd/compile: smaller binaries (many CLs)
 cmd/go, go/build: add support for Fortran (CL 19670, CL 4114)
 cmd/dist: introduce list subcommand to list all supported platforms (CL 19837)
+cmd/doc: group constructors with types (CL 22354)
 
 Ports:
 
@@ -20,3 +21,4 @@ net/http/httptest: ResponseRecorder supports trailer (CL 20047) (compat impact:
 net/url: support query string without values (CL 19931)
 net/textproto: permit all valid token chars in CanonicalMIMEHeaderKey input (CL 18725)
 go/doc: add Unordered boolean to Example struct (CL 19280)
+time: print zero duration as 0s, not 0 (CL 22357)
\ No newline at end of file
diff --git a/doc/go_faq.html b/doc/go_faq.html
index e1594e5c7c..5954d17f5d 100644
--- a/doc/go_faq.html
+++ b/doc/go_faq.html
@@ -335,7 +335,10 @@ code that does what generics would enable, if less smoothly.
 </p>
 
 <p>
-This remains an open issue.
+The topic remains open.
+For a look at several previous unsuccessful attempts to
+design a good generics solution for Go, see
+<a href="https://golang.org/issue/15292">this proposal</a>.
 </p>
 
 <h3 id="exceptions">
diff --git a/doc/go_spec.html b/doc/go_spec.html
index 437fc066bb..13dae09420 100644
--- a/doc/go_spec.html
+++ b/doc/go_spec.html
@@ -1,6 +1,6 @@
 <!--{
 	"Title": "The Go Programming Language Specification",
-	"Subtitle": "Version of February 23, 2016",
+	"Subtitle": "Version of April 25, 2016",
 	"Path": "/ref/spec"
 }-->
 
@@ -1043,8 +1043,8 @@ promoted methods are included in the method set of the struct as follows:
 <p>
 A field declaration may be followed by an optional string literal <i>tag</i>,
 which becomes an attribute for all the fields in the corresponding
-field declaration. The tags are made
-visible through a <a href="/pkg/reflect/#StructTag">reflection interface</a>
+field declaration. An empty tag string is equivalent to an absent tag.
+The tags are made visible through a <a href="/pkg/reflect/#StructTag">reflection interface</a>
 and take part in <a href="#Type_identity">type identity</a> for structs
 but are otherwise ignored.
 </p>
@@ -3326,8 +3326,8 @@ var s uint = 33
 var i = 1&lt;&lt;s           // 1 has type int
 var j int32 = 1&lt;&lt;s     // 1 has type int32; j == 0
 var k = uint64(1&lt;&lt;s)   // 1 has type uint64; k == 1&lt;&lt;33
-var m int = 1.0&lt;&lt;s     // 1.0 has type int
-var n = 1.0&lt;&lt;s != i    // 1.0 has type int; n == false if ints are 32bits in size
+var m int = 1.0&lt;&lt;s     // 1.0 has type int; m == 0 if ints are 32bits in size
+var n = 1.0&lt;&lt;s == j    // 1.0 has type int32; n == true
 var o = 1&lt;&lt;s == 2&lt;&lt;s   // 1 and 2 have type int; o == true if ints are 32bits in size
 var p = 1&lt;&lt;s == 1&lt;&lt;33  // illegal if ints are 32bits in size: 1 has type int, but 1&lt;&lt;33 overflows int
 var u = 1.0&lt;&lt;s         // illegal: 1.0 has type float64, cannot shift
@@ -4257,7 +4257,7 @@ All other statements are not terminating.
 
 <p>
 A <a href="#Blocks">statement list</a> ends in a terminating statement if the list
-is not empty and its final statement is terminating.
+is not empty and its final non-empty statement is terminating.
 </p>
 
 
diff --git a/doc/install-source.html b/doc/install-source.html
index fc4d66fd2a..d9157c2b17 100644
--- a/doc/install-source.html
+++ b/doc/install-source.html
@@ -194,14 +194,19 @@ To build without <code>cgo</code>, set the environment variable
 <p>Go will install to a directory named <code>go</code>.
 Change to the directory that will be its parent
 and make sure the <code>go</code> directory does not exist.
-Then clone the repository and check out the latest release tag:</p>
+Then clone the repository and check out the latest release tag
+(<code class="versionTag">go1.6</code>, for example):</p>
 
 <pre>
 $ git clone https://go.googlesource.com/go
 $ cd go
-$ git checkout go1.6
+$ git checkout <span class="versionTag"><i>&lt;tag&gt;</i></span>
 </pre>
 
+<p class="whereTag">
+Where <code>&lt;tag&gt;</code> is the version string of the release.
+</p>
+
 <h2 id="head">(Optional) Switch to the master branch</h2>
 
 <p>If you intend to modify the go source code, and
@@ -378,7 +383,7 @@ New releases are announced on the
 <a href="//groups.google.com/group/golang-announce">golang-announce</a>
 mailing list.
 Each announcement mentions the latest release tag, for instance,
-<code>go1.6</code>.
+<code class="versionTag">go1.6</code>.
 </p>
 
 <p>
@@ -388,11 +393,13 @@ To update an existing tree to the latest release, you can run:
 <pre>
 $ cd go/src
 $ git fetch
-$ git checkout <i>&lt;tag&gt;</i>
+$ git checkout <span class="versionTag"><i>&lt;tag&gt;</i></psan>
 $ ./all.bash
 </pre>
 
+<p class="whereTag">
 Where <code>&lt;tag&gt;</code> is the version string of the release.
+</p>
 
 
 <h2 id="environment">Optional environment variables</h2>