From: Andrew Bonventre <andybons@golang.org>
Date: Mon, 12 Feb 2018 20:09:58 +0000 (+0000)
Subject: Revert "[release-branch.go1.10] all: merge master into release-branch.go1.10"
X-Git-Tag: go1.10~9
X-Git-Url: http://www.git.cypherpunks.ru/?a=commitdiff_plain;h=3b6abd8a4501d816e80b4d46e6fda4df486ccb66;p=gostls13.git

Revert "[release-branch.go1.10] all: merge master into release-branch.go1.10"

This reverts commit b83d7f72537bdc0cec2e949d73ae40fbd42b7c63.

Reason for revert: wrong branch

Change-Id: I28ebb121f7b3e331729e8a6a00961b876f3dd0f2
Reviewed-on: https://go-review.googlesource.com/93455
Reviewed-by: Andrew Bonventre <andybons@golang.org>
---

diff --git a/.github/PULL_REQUEST_TEMPLATE b/.github/PULL_REQUEST_TEMPLATE
new file mode 100644
index 0000000000..00014e9b86
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE
@@ -0,0 +1,7 @@
+Please do not send pull requests to the golang/* repositories.
+
+We do, however, take contributions gladly.
+
+See https://golang.org/doc/contribute.html
+
+Thanks!
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 7c1dd54b30..4f2c4d4b02 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -30,6 +30,11 @@ For change proposals, see [Proposing Changes To Go](https://github.com/golang/pr
 
 Please read the [Contribution Guidelines](https://golang.org/doc/contribute.html) before sending patches.
 
+**We do not accept GitHub pull requests**
+(we use [an instance](https://go-review.googlesource.com/) of the
+[Gerrit](https://www.gerritcodereview.com/) code review system instead).
+Also, please do not post patches on the issue tracker.
+
 Unless otherwise noted, the Go source files are distributed under
 the BSD-style license found in the LICENSE file.
 
diff --git a/README.md b/README.md
index bb3d895d45..57492b3fb0 100644
--- a/README.md
+++ b/README.md
@@ -36,9 +36,10 @@ Go is the work of hundreds of contributors. We appreciate your help!
 To contribute, please read the contribution guidelines:
 	https://golang.org/doc/contribute.html
 
-Note that the Go project uses the issue tracker for bug reports and
-proposals only. See https://golang.org/wiki/Questions for a list of
-places to ask questions about the Go language.
+Note that the Go project does not use GitHub pull requests, and that
+we use the issue tracker for bug reports and proposals only. See
+https://golang.org/wiki/Questions for a list of places to ask
+questions about the Go language.
 
 [rf]: https://reneefrench.blogspot.com/
 [cc3-by]: https://creativecommons.org/licenses/by/3.0/
diff --git a/doc/devel/release.html b/doc/devel/release.html
index d82fb0c630..24fe583062 100644
--- a/doc/devel/release.html
+++ b/doc/devel/release.html
@@ -57,12 +57,6 @@ See the <a href="https://github.com/golang/go/issues?q=milestone%3AGo1.9.3">Go
 1.9.3 milestone</a> on our issue tracker for details.
 </p>
 
-<p>
-go1.9.4 (released 2018/02/07) includes a security fix to “go get”.
-See the <a href="https://github.com/golang/go/issues?q=milestone%3AGo1.9.4">Go
-1.9.4</a> milestone on our issue tracker for details.
-</p>
-
 <h2 id="go1.8">go1.8 (released 2017/02/16)</h2>
 
 <p>
@@ -120,13 +114,6 @@ See the <a href="https://github.com/golang/go/issues?q=milestone%3AGo1.8.6">Go
 1.8.6 milestone</a> on our issue tracker for details.
 </p>
 
-<p>
-go1.8.7 (released 2018/02/07) includes a security fix to “go get”.
-It contains the same fix as Go 1.9.4 and was released at the same time.
-See the <a href="https://github.com/golang/go/issues?q=milestone%3AGo1.8.7">Go
-1.8.7</a> milestone on our issue tracker for details.
-</p>
-
 <h2 id="go1.7">go1.7 (released 2016/08/15)</h2>
 
 <p>
diff --git a/doc/diagnostics.html b/doc/diagnostics.html
index 35aae156e8..0ed0e81b92 100644
--- a/doc/diagnostics.html
+++ b/doc/diagnostics.html
@@ -222,7 +222,7 @@ an execution tracer to trace the runtime events within an interval.
 <p>Tracing enables us to:</p>
 
 <ul>
-<li>Instrument and analyze application latency in a Go process.</li>
+<li>Instrument and profile application latency in a Go process.</li>
 <li>Measure the cost of specific calls in a long chain of calls.</li>
 <li>Figure out the utilization and performance improvements.
 Bottlenecks are not always obvious without tracing data.</li>
diff --git a/doc/go1.10.html b/doc/go1.10.html
index 569e420d51..5885176f46 100644
--- a/doc/go1.10.html
+++ b/doc/go1.10.html
@@ -785,8 +785,7 @@ Parsed certificates also now report URI names and IP, email, and URI constraints
 <a href="/pkg/crypto/x509/#Certificate"><code>Certificate</code></a> fields
 <code>URIs</code>, <code>PermittedIPRanges</code>, <code>ExcludedIPRanges</code>,
 <code>PermittedEmailAddresses</code>, <code>ExcludedEmailAddresses</code>,
-<code>PermittedURIDomains</code>, and <code>ExcludedURIDomains</code>. Certificates with
-invalid values for those fields are now rejected.
+<code>PermittedURIDomains</code>, and <code>ExcludedURIDomains</code>.
 </p>
 
 <p>
diff --git a/src/cmd/fix/cftype.go b/src/cmd/fix/cftype.go
index b47b06682a..df1cc18f9e 100644
--- a/src/cmd/fix/cftype.go
+++ b/src/cmd/fix/cftype.go
@@ -119,7 +119,7 @@ func typefix(f *ast.File, badType func(string) bool) bool {
 		if !ok {
 			return
 		}
-		t, ok := s.X.(*ast.SelectorExpr)
+		t := s.X.(*ast.SelectorExpr)
 		if !ok {
 			return
 		}