diff options
| author | Aaron Jacobs <jacobsa@google.com> | 2015-12-21 13:01:00 +1100 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2016-01-04 20:50:18 +0000 |
| commit | 6c8a141a6d53285acc876aacfa0a9c4edb563b6c (patch) | |
| tree | a55c6f26ea1a61d608e91aa083c576c19918a4c7 /src | |
| parent | 7f4443d5fa9248c1d0e9d07b2c502a46ca252db2 (diff) | |
| download | go-6c8a141a6d53285acc876aacfa0a9c4edb563b6c.tar.xz | |
cmd/go: update out of date help text about vendoring
Change-Id: I2b61f3b3ecf28d8f6a8dff94d194b6d3d450ea22
Reviewed-on: https://go-review.googlesource.com/17996
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Reviewed-by: Russ Cox <rsc@golang.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/cmd/go/alldocs.go | 13 | ||||
| -rw-r--r-- | src/cmd/go/help.go | 13 |
2 files changed, 10 insertions, 16 deletions
diff --git a/src/cmd/go/alldocs.go b/src/cmd/go/alldocs.go index a83f17ef35..ea2eb77470 100644 --- a/src/cmd/go/alldocs.go +++ b/src/cmd/go/alldocs.go @@ -1019,9 +1019,6 @@ As of Go 1.6 they are on by default. To turn them off, set GO15VENDOREXPERIMENT=0. In Go 1.7, the environment variable will stop having any effect. -The vendoring semantics are an experiment, and they may change -in future releases. Once settled, they will be on by default. - See https://golang.org/s/go15vendor for details. @@ -1089,7 +1086,7 @@ Special-purpose environment variables: File names in stack traces are rewritten from GOROOT to GOROOT_FINAL. GO15VENDOREXPERIMENT - Set to 1 to enable the Go 1.5 vendoring experiment. + Set to 0 to disable vendoring semantics. GO_EXTLINK_ENABLED Whether the linker should use external linking mode when using -linkmode=auto with code that uses cgo. @@ -1265,10 +1262,10 @@ unless it is being referred to by that import path. In this way, import comments let package authors make sure the custom import path is used and not a direct path to the underlying code hosting site. -If the vendoring experiment is enabled (see 'go help gopath'), -then import path checking is disabled for code found within vendor trees. -This makes it possible to copy code into alternate locations in vendor trees -without needing to update import comments. +If vendoring is enabled (see 'go help gopath'), then import path checking is +disabled for code found within vendor trees. This makes it possible to copy +code into alternate locations in vendor trees without needing to update import +comments. See https://golang.org/s/go14customimport for details. diff --git a/src/cmd/go/help.go b/src/cmd/go/help.go index 7f81241045..d8e7efedb3 100644 --- a/src/cmd/go/help.go +++ b/src/cmd/go/help.go @@ -269,10 +269,10 @@ unless it is being referred to by that import path. In this way, import comments let package authors make sure the custom import path is used and not a direct path to the underlying code hosting site. -If the vendoring experiment is enabled (see 'go help gopath'), -then import path checking is disabled for code found within vendor trees. -This makes it possible to copy code into alternate locations in vendor trees -without needing to update import comments. +If vendoring is enabled (see 'go help gopath'), then import path checking is +disabled for code found within vendor trees. This makes it possible to copy +code into alternate locations in vendor trees without needing to update import +comments. See https://golang.org/s/go14customimport for details. `, @@ -427,9 +427,6 @@ As of Go 1.6 they are on by default. To turn them off, set GO15VENDOREXPERIMENT=0. In Go 1.7, the environment variable will stop having any effect. -The vendoring semantics are an experiment, and they may change -in future releases. Once settled, they will be on by default. - See https://golang.org/s/go15vendor for details. `, } @@ -501,7 +498,7 @@ Special-purpose environment variables: File names in stack traces are rewritten from GOROOT to GOROOT_FINAL. GO15VENDOREXPERIMENT - Set to 1 to enable the Go 1.5 vendoring experiment. + Set to 0 to disable vendoring semantics. GO_EXTLINK_ENABLED Whether the linker should use external linking mode when using -linkmode=auto with code that uses cgo. |