Skip to content

Commit

Permalink
[dev.garbage] all: merge default (f38460037b72) into dev.garbage
Browse files Browse the repository at this point in the history
This is the revision that dev.cc is branched from.

LGTM=austin
R=austin
CC=golang-codereviews
https://golang.org/cl/169590043
  • Loading branch information
rsc committed Nov 14, 2014
2 parents 18ed947 + c99616f commit 3dcc62e
Show file tree
Hide file tree
Showing 96 changed files with 1,478 additions and 6,291 deletions.
1 change: 1 addition & 0 deletions .hgtags
Original file line number Diff line number Diff line change
Expand Up @@ -135,3 +135,4 @@ f8b50ad4cac4d4c4ecf48324b4f512f65e82cc1c go1.3beta1
85518b1d6f8d6e16133b9ed2c9db6807522d37de go1.3.2
f44017549ff9c3cc5eef74ebe7276cd0dfc066b6 go1.3.3
f44017549ff9c3cc5eef74ebe7276cd0dfc066b6 release
1fdfd7dfaedb1b7702141617e621ab7328a236a1 go1.4beta1
4 changes: 4 additions & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ Aulus Egnatius Varialus <[email protected]>
Ben Olive <[email protected]>
Benjamin Black <[email protected]>
Benny Siegert <[email protected]>
Benoit Sigoure <[email protected]>
Berengar Lehr <[email protected]>
Billie Harold Cleek <[email protected]>
Bjorn Tillenius <[email protected]>
Expand Down Expand Up @@ -156,6 +157,7 @@ Evan Shaw <[email protected]>
Ewan Chou <[email protected]>
Fabrizio Milo <[email protected]>
Fan Hongjian <[email protected]>
Fastly, Inc.
Fatih Arslan <[email protected]>
Fazlul Shahriar <[email protected]>
Felix Geisendörfer <[email protected]>
Expand All @@ -166,6 +168,7 @@ Francisco Souza <[email protected]>
Frederick Kelly Mayle III <[email protected]>
Fredrik Enestad <[email protected]>
Frithjof Schulze <[email protected]> <[email protected]>
Gabriel Aszalos <[email protected]>
Gary Burd <[email protected]>
Gautham Thambidorai <[email protected]>
Georg Reinke <[email protected]>
Expand Down Expand Up @@ -315,6 +318,7 @@ Moriyoshi Koizumi <[email protected]>
Môshe van der Sterre <[email protected]>
Nan Deng <[email protected]>
Nathan John Youngman <[email protected]>
Nathan P Finch <[email protected]>
ngmoco, LLC
Nicholas Katsaros <[email protected]>
Nicholas Presta <[email protected]> <[email protected]>
Expand Down
4 changes: 4 additions & 0 deletions CONTRIBUTORS
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ Ben Lynn <[email protected]>
Ben Olive <[email protected]>
Benjamin Black <[email protected]>
Benny Siegert <[email protected]>
Benoit Sigoure <[email protected]>
Berengar Lehr <[email protected]>
Bill Neubauer <[email protected]> <[email protected]> <[email protected]>
Bill Thiede <[email protected]>
Expand Down Expand Up @@ -241,6 +242,7 @@ Fredrik Enestad <[email protected]>
Frithjof Schulze <[email protected]> <[email protected]>
Fumitoshi Ukai <[email protected]>
Gaal Yahas <[email protected]>
Gabriel Aszalos <[email protected]>
Gary Burd <[email protected]> <[email protected]>
Gautham Thambidorai <[email protected]>
Georg Reinke <[email protected]>
Expand Down Expand Up @@ -299,6 +301,7 @@ Jason Del Ponte <[email protected]>
Jason Travis <[email protected]>
Jay Weisskopf <[email protected]>
Jean-Marc Eurin <[email protected]>
Jed Denlea <[email protected]>
Jeff Hodges <[email protected]>
Jeff R. Allen <[email protected]> <[email protected]>
Jeff Sickel <[email protected]>
Expand Down Expand Up @@ -444,6 +447,7 @@ Môshe van der Sterre <[email protected]>
Mrunal Patel <[email protected]>
Nan Deng <[email protected]>
Nathan John Youngman <[email protected]>
Nathan P Finch <[email protected]>
Nicholas Katsaros <[email protected]>
Nicholas Presta <[email protected]> <[email protected]>
Nicholas Sullivan <[email protected]>
Expand Down
13 changes: 7 additions & 6 deletions doc/articles/go_command.html
Original file line number Diff line number Diff line change
Expand Up @@ -78,17 +78,18 @@ <h2>Go's conventions</h2>
source code. For Bitbucket, GitHub, Google Code, and Launchpad, the
root directory of the repository is identified by the repository's
main URL, without the <code>http://</code> prefix. Subdirectories are named by
adding to that path. For example, the supplemental networking
libraries for Go are obtained by running</p>
adding to that path.
For example, the Go example programs are obtained by running</p>

<pre>
hg clone http://code.google.com/p/go.net
git clone https://github.com/golang/example
</pre>

<p>and thus the import path for the root directory of that repository is
"<code>code.google.com/p/go.net</code>". The websocket package is stored in a
subdirectory, so its import path is
"<code>code.google.com/p/go.net/websocket</code>".</p>
"<code>github.com/golang/example</code>".
The <a href="https://godoc.org/github.com/golang/example/stringutil">stringutil</a>
package is stored in a subdirectory, so its import path is
"<code>github.com/golang/example/stringutil</code>".</p>

<p>These paths are on the long side, but in exchange we get an
automatically managed name space for import paths and the ability for
Expand Down
6 changes: 3 additions & 3 deletions doc/cmd.html
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
</tr>

<tr>
<td><a href="//godoc.org/code.google.com/p/go.tools/cmd/cover/">cover</a></td>
<td><a href="//godoc.org/golang.org/x/tools/cmd/cover/">cover</a></td>
<td>&nbsp;&nbsp;&nbsp;&nbsp;</td>
<td>Cover is a program for creating and analyzing the coverage profiles
generated by <code>"go test -coverprofile"</code>.</td>
Expand All @@ -83,13 +83,13 @@
</tr>

<tr>
<td><a href="//godoc.org/code.google.com/p/go.tools/cmd/godoc/">godoc</a></td>
<td><a href="//godoc.org/golang.org/x/tools/cmd/godoc/">godoc</a></td>
<td>&nbsp;&nbsp;&nbsp;&nbsp;</td>
<td>Godoc extracts and generates documentation for Go packages.</td>
</tr>

<tr>
<td><a href="//godoc.org/code.google.com/p/go.tools/cmd/vet/">vet</a></td>
<td><a href="//godoc.org/golang.org/x/tools/cmd/vet/">vet</a></td>
<td>&nbsp;&nbsp;&nbsp;&nbsp;</td>
<td>Vet examines Go source code and reports suspicious constructs, such as Printf
calls whose arguments do not align with the format string.</td>
Expand Down
Loading

0 comments on commit 3dcc62e

Please sign in to comment.