cmd/go: update docs for GOPROXY default

The default is now "https://proxy.golang.org,direct" not just "https://proxy.golang.org"
(as of CL 178720).

Change-Id: I47e67602e994332b988ed1b75fa57319f3876cc6
Reviewed-on: https://go-review.googlesource.com/c/go/+/178725
Run-TryBot: Russ Cox <rsc@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Bryan C. Mills <bcmills@google.com>

diff --git a/src/cmd/go/alldocs.go b/src/cmd/go/alldocs.go
index 26fb337f86a3cab2f0856ecc8fc6f1ce8d19fc06..94a9dcb983025d7d0498cedc944f46deb92eaee1 100644 (file)
--- a/src/cmd/go/alldocs.go
+++ b/src/cmd/go/alldocs.go
@@ -2579,7 +2579,9 @@
 // The go command can fetch modules from a proxy or connect to source control
 // servers directly, according to the setting of the GOPROXY environment
 // variable (see 'go help env'). The default setting for GOPROXY is
-// "https://proxy.golang.org", the Go module mirror run by Google.
+// "https://proxy.golang.org,direct", which means to try the
+// Go module mirror run by Google and fall back to a direct connection
+// if the proxy reports that it does not have the module (HTTP error 404 or 410).
 // See https://proxy.golang.org/privacy for the service's privacy policy.
 // If GOPROXY is set to the string "direct", downloads use a direct connection
 // to source control servers. Setting GOPROXY to "off" disallows downloading

diff --git a/src/cmd/go/internal/modload/help.go b/src/cmd/go/internal/modload/help.go
index 96fec8451edcee6aabed8a3db340cea4bfa9e7ef..cb996d3546e317e4f894a91d4288f7611c0a9362 100644 (file)
--- a/src/cmd/go/internal/modload/help.go
+++ b/src/cmd/go/internal/modload/help.go
@@ -331,7 +331,9 @@ Module downloading and verification
 The go command can fetch modules from a proxy or connect to source control
 servers directly, according to the setting of the GOPROXY environment
 variable (see 'go help env'). The default setting for GOPROXY is
-"https://proxy.golang.org", the Go module mirror run by Google.
+"https://proxy.golang.org,direct", which means to try the
+Go module mirror run by Google and fall back to a direct connection
+if the proxy reports that it does not have the module (HTTP error 404 or 410).
 See https://proxy.golang.org/privacy for the service's privacy policy.
 If GOPROXY is set to the string "direct", downloads use a direct connection
 to source control servers. Setting GOPROXY to "off" disallows downloading