aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaana Burcu Dogan <jbd@google.com>2017-01-06 15:09:10 -0800
committerJaana Burcu Dogan <jbd@google.com>2017-01-07 00:53:18 +0000
commit1fbdae5c3ad9aaaf827bed14a5e1e4cbd547a37c (patch)
treedc1dfdb84b9a7653499b250856c5bcd75ceaa7d3
parent66063b2da8a93b69e23381260f64c05d1589769c (diff)
downloadgo-1fbdae5c3ad9aaaf827bed14a5e1e4cbd547a37c.tar.gz
go-1fbdae5c3ad9aaaf827bed14a5e1e4cbd547a37c.zip
cmd/go: add link to env varible guide to set custom GOPATH
Also moves the GOPATH env variable guide to golang.org/wiki/SettingGOPATH. Fixes #18294. Change-Id: I88a2ce550df7466f8d2388d86bc8476dcf3c2ad6 Reviewed-on: https://go-review.googlesource.com/34918 Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
-rw-r--r--doc/code.html2
-rw-r--r--src/cmd/go/alldocs.go2
-rw-r--r--src/cmd/go/help.go2
3 files changed, 5 insertions, 1 deletions
diff --git a/doc/code.html b/doc/code.html
index 703f38a21a..796431aa14 100644
--- a/doc/code.html
+++ b/doc/code.html
@@ -166,7 +166,7 @@ To learn more about the <code>GOPATH</code> environment variable, see
<p>
To use a custom workspace location,
-<a href="https://golang.org/wiki/EnvVariables#gopath">set the <code>GOPATH</code> environment variable</a>.
+<a href="https://golang.org/wiki/SettingGOPATH">set the <code>GOPATH</code> environment variable</a>.
</p>
<h3 id="ImportPaths">Import paths</h3>
diff --git a/src/cmd/go/alldocs.go b/src/cmd/go/alldocs.go
index 57716a53f8..e93fd6ebed 100644
--- a/src/cmd/go/alldocs.go
+++ b/src/cmd/go/alldocs.go
@@ -935,6 +935,8 @@
// unless that directory holds a Go distribution.
// Run "go env GOPATH" to see the current GOPATH.
//
+// See https://golang.org/wiki/SettingGOPATH to set a custom GOPATH.
+//
// Each directory listed in GOPATH must have a prescribed structure:
//
// The src directory holds source code. The path below src
diff --git a/src/cmd/go/help.go b/src/cmd/go/help.go
index fb69d8ec54..0c663ad463 100644
--- a/src/cmd/go/help.go
+++ b/src/cmd/go/help.go
@@ -295,6 +295,8 @@ to a subdirectory named "go" in the user's home directory
unless that directory holds a Go distribution.
Run "go env GOPATH" to see the current GOPATH.
+See https://golang.org/wiki/SettingGOPATH to set a custom GOPATH.
+
Each directory listed in GOPATH must have a prescribed structure:
The src directory holds source code. The path below src