Skip to content

Commit 3b6abd8

Browse files
committed
Revert "[release-branch.go1.10] all: merge master into release-branch.go1.10"
This reverts commit b83d7f7. Reason for revert: wrong branch Change-Id: I28ebb121f7b3e331729e8a6a00961b876f3dd0f2 Reviewed-on: https://go-review.googlesource.com/93455 Reviewed-by: Andrew Bonventre <[email protected]>
1 parent b83d7f7 commit 3b6abd8

File tree

7 files changed

+19
-20
lines changed

7 files changed

+19
-20
lines changed

.github/PULL_REQUEST_TEMPLATE

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
Please do not send pull requests to the golang/* repositories.
2+
3+
We do, however, take contributions gladly.
4+
5+
See https://golang.org/doc/contribute.html
6+
7+
Thanks!

CONTRIBUTING.md

+5
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@ For change proposals, see [Proposing Changes To Go](https://github.com/golang/pr
3030

3131
Please read the [Contribution Guidelines](https://golang.org/doc/contribute.html) before sending patches.
3232

33+
**We do not accept GitHub pull requests**
34+
(we use [an instance](https://go-review.googlesource.com/) of the
35+
[Gerrit](https://www.gerritcodereview.com/) code review system instead).
36+
Also, please do not post patches on the issue tracker.
37+
3338
Unless otherwise noted, the Go source files are distributed under
3439
the BSD-style license found in the LICENSE file.
3540

README.md

+4-3
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,10 @@ Go is the work of hundreds of contributors. We appreciate your help!
3636
To contribute, please read the contribution guidelines:
3737
https://golang.org/doc/contribute.html
3838

39-
Note that the Go project uses the issue tracker for bug reports and
40-
proposals only. See https://golang.org/wiki/Questions for a list of
41-
places to ask questions about the Go language.
39+
Note that the Go project does not use GitHub pull requests, and that
40+
we use the issue tracker for bug reports and proposals only. See
41+
https://golang.org/wiki/Questions for a list of places to ask
42+
questions about the Go language.
4243

4344
[rf]: https://reneefrench.blogspot.com/
4445
[cc3-by]: https://creativecommons.org/licenses/by/3.0/

doc/devel/release.html

-13
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,6 @@ <h3 id="go1.9.minor">Minor revisions</h3>
5757
1.9.3 milestone</a> on our issue tracker for details.
5858
</p>
5959

60-
<p>
61-
go1.9.4 (released 2018/02/07) includes a security fix to “go get”.
62-
See the <a href="https://github.com/golang/go/issues?q=milestone%3AGo1.9.4">Go
63-
1.9.4</a> milestone on our issue tracker for details.
64-
</p>
65-
6660
<h2 id="go1.8">go1.8 (released 2017/02/16)</h2>
6761

6862
<p>
@@ -120,13 +114,6 @@ <h3 id="go1.8.minor">Minor revisions</h3>
120114
1.8.6 milestone</a> on our issue tracker for details.
121115
</p>
122116

123-
<p>
124-
go1.8.7 (released 2018/02/07) includes a security fix to “go get”.
125-
It contains the same fix as Go 1.9.4 and was released at the same time.
126-
See the <a href="https://github.com/golang/go/issues?q=milestone%3AGo1.8.7">Go
127-
1.8.7</a> milestone on our issue tracker for details.
128-
</p>
129-
130117
<h2 id="go1.7">go1.7 (released 2016/08/15)</h2>
131118

132119
<p>

doc/diagnostics.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ <h2 id="tracing">Tracing</h2>
222222
<p>Tracing enables us to:</p>
223223

224224
<ul>
225-
<li>Instrument and analyze application latency in a Go process.</li>
225+
<li>Instrument and profile application latency in a Go process.</li>
226226
<li>Measure the cost of specific calls in a long chain of calls.</li>
227227
<li>Figure out the utilization and performance improvements.
228228
Bottlenecks are not always obvious without tracing data.</li>

doc/go1.10.html

+1-2
Original file line numberDiff line numberDiff line change
@@ -785,8 +785,7 @@ <h3 id="minor_library_changes">Minor changes to the library</h3>
785785
<a href="/pkg/crypto/x509/#Certificate"><code>Certificate</code></a> fields
786786
<code>URIs</code>, <code>PermittedIPRanges</code>, <code>ExcludedIPRanges</code>,
787787
<code>PermittedEmailAddresses</code>, <code>ExcludedEmailAddresses</code>,
788-
<code>PermittedURIDomains</code>, and <code>ExcludedURIDomains</code>. Certificates with
789-
invalid values for those fields are now rejected.
788+
<code>PermittedURIDomains</code>, and <code>ExcludedURIDomains</code>.
790789
</p>
791790

792791
<p>

src/cmd/fix/cftype.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ func typefix(f *ast.File, badType func(string) bool) bool {
119119
if !ok {
120120
return
121121
}
122-
t, ok := s.X.(*ast.SelectorExpr)
122+
t := s.X.(*ast.SelectorExpr)
123123
if !ok {
124124
return
125125
}

0 commit comments

Comments
 (0)