Skip to content

Commit 6c8a141

Browse files
jacobsarsc
authored andcommitted
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 <[email protected]> Reviewed-by: Russ Cox <[email protected]>
1 parent 7f4443d commit 6c8a141

File tree

2 files changed

+10
-16
lines changed

2 files changed

+10
-16
lines changed

src/cmd/go/alldocs.go

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1019,9 +1019,6 @@ As of Go 1.6 they are on by default. To turn them off, set
10191019
GO15VENDOREXPERIMENT=0. In Go 1.7, the environment
10201020
variable will stop having any effect.
10211021
1022-
The vendoring semantics are an experiment, and they may change
1023-
in future releases. Once settled, they will be on by default.
1024-
10251022
See https://golang.org/s/go15vendor for details.
10261023
10271024
@@ -1089,7 +1086,7 @@ Special-purpose environment variables:
10891086
File names in stack traces are rewritten from GOROOT to
10901087
GOROOT_FINAL.
10911088
GO15VENDOREXPERIMENT
1092-
Set to 1 to enable the Go 1.5 vendoring experiment.
1089+
Set to 0 to disable vendoring semantics.
10931090
GO_EXTLINK_ENABLED
10941091
Whether the linker should use external linking mode
10951092
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
12651262
let package authors make sure the custom import path is used and not a
12661263
direct path to the underlying code hosting site.
12671264
1268-
If the vendoring experiment is enabled (see 'go help gopath'),
1269-
then import path checking is disabled for code found within vendor trees.
1270-
This makes it possible to copy code into alternate locations in vendor trees
1271-
without needing to update import comments.
1265+
If vendoring is enabled (see 'go help gopath'), then import path checking is
1266+
disabled for code found within vendor trees. This makes it possible to copy
1267+
code into alternate locations in vendor trees without needing to update import
1268+
comments.
12721269
12731270
See https://golang.org/s/go14customimport for details.
12741271

src/cmd/go/help.go

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -269,10 +269,10 @@ unless it is being referred to by that import path. In this way, import comments
269269
let package authors make sure the custom import path is used and not a
270270
direct path to the underlying code hosting site.
271271
272-
If the vendoring experiment is enabled (see 'go help gopath'),
273-
then import path checking is disabled for code found within vendor trees.
274-
This makes it possible to copy code into alternate locations in vendor trees
275-
without needing to update import comments.
272+
If vendoring is enabled (see 'go help gopath'), then import path checking is
273+
disabled for code found within vendor trees. This makes it possible to copy
274+
code into alternate locations in vendor trees without needing to update import
275+
comments.
276276
277277
See https://golang.org/s/go14customimport for details.
278278
`,
@@ -427,9 +427,6 @@ As of Go 1.6 they are on by default. To turn them off, set
427427
GO15VENDOREXPERIMENT=0. In Go 1.7, the environment
428428
variable will stop having any effect.
429429
430-
The vendoring semantics are an experiment, and they may change
431-
in future releases. Once settled, they will be on by default.
432-
433430
See https://golang.org/s/go15vendor for details.
434431
`,
435432
}
@@ -501,7 +498,7 @@ Special-purpose environment variables:
501498
File names in stack traces are rewritten from GOROOT to
502499
GOROOT_FINAL.
503500
GO15VENDOREXPERIMENT
504-
Set to 1 to enable the Go 1.5 vendoring experiment.
501+
Set to 0 to disable vendoring semantics.
505502
GO_EXTLINK_ENABLED
506503
Whether the linker should use external linking mode
507504
when using -linkmode=auto with code that uses cgo.

0 commit comments

Comments
 (0)