Skip to content

Commit

Permalink
Merge remote-tracking branch 'golang/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
OlingCat committed Jan 12, 2020
2 parents f94d5f7 + 641e61d commit d4e8cec
Show file tree
Hide file tree
Showing 227 changed files with 3,039 additions and 1,963 deletions.
6 changes: 4 additions & 2 deletions .github/ISSUE_TEMPLATE
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<!-- Please answer these questions before submitting your issue. Thanks! -->
<!--
Please answer these questions before submitting your issue. Thanks!
For questions please use one of our forums: https://github.com/golang/go/wiki/Questions
-->

### What version of Go are you using (`go version`)?

Expand Down Expand Up @@ -33,4 +36,3 @@ A link on play.golang.org is best.


### What did you see instead?

125 changes: 124 additions & 1 deletion CONTRIBUTORS

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion api/go1.14.txt
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ pkg debug/dwarf, method (*Reader) ByteOrder() binary.ByteOrder
pkg encoding/asn1, const TagBMPString = 30
pkg encoding/asn1, const TagBMPString ideal-int
pkg encoding/json, method (*Decoder) InputOffset() int64
pkg go/build, type Context struct, WorkingDir string
pkg go/build, type Context struct, Dir string
pkg go/doc, func NewFromFiles(*token.FileSet, []*ast.File, string, ...interface{}) (*Package, error)
pkg go/doc, type Example struct, Suffix string
pkg go/doc, type Func struct, Examples []*Example
Expand Down
5 changes: 5 additions & 0 deletions doc/articles/race_detector.html
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,11 @@ <h2 id="Options">Options</h2>
<code>halt_on_error</code> (default <code>0</code>): Controls whether the program
exits after reporting first data race.
</li>

<li>
<code>atexit_sleep_ms</code> (default <code>1000</code>): Amount of milliseconds
to sleep in the main goroutine before exiting.
</li>
</ul>

<p>
Expand Down
211 changes: 0 additions & 211 deletions doc/conduct.html

This file was deleted.

4 changes: 2 additions & 2 deletions doc/contribute.html
Original file line number Diff line number Diff line change
Expand Up @@ -925,13 +925,13 @@ <h3 id="copyright">Copyright headers</h3>
</p>

<pre>
// Copyright 2019 The Go Authors. All rights reserved.
// Copyright 2020 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
</pre>

<p>
(Use the current year if you're reading this in 2020 or beyond.)
(Use the current year if you're reading this in 2021 or beyond.)
Files in the repository are copyrighted the year they are added.
Do not update the copyright year on files that you change.
</p>
Expand Down
Loading

0 comments on commit d4e8cec

Please sign in to comment.