[release-branch.go1.4] cmd/go: regenerate doc.go

««« CL 183000043 / 871468f5ceaf
cmd/go: regenerate doc.go

Move change from CL 170770043 to correct file and regenerate docs
for changes from CL 164120043.

LGTM=adg
R=golang-codereviews, adg, bradfitz
CC=golang-codereviews
https://golang.org/cl/183000043

»»»

LGTM=minux
R=bradfitz, minux
CC=golang-codereviews
https://golang.org/cl/181490043

diff --git a/src/cmd/go/doc.go b/src/cmd/go/doc.go
index 43a31594405b11e63f05dec16a3910fc41c08c71..879fc7f8ba6907c499b1c2e28b98e8654684fc4c 100644 (file)
--- a/src/cmd/go/doc.go
+++ b/src/cmd/go/doc.go
@@ -317,7 +317,7 @@ Download and install packages and dependencies
 
 Usage:
 
-       go get [-d] [-fix] [-t] [-u] [build flags] [packages]
+       go get [-d] [-f] [-fix] [-t] [-u] [build flags] [packages]
 
 Get downloads and installs the packages named by the import paths,
 along with their dependencies.
@@ -325,6 +325,11 @@ along with their dependencies.
 The -d flag instructs get to stop after downloading the packages; that is,
 it instructs get not to install the packages.
 
+The -f flag, valid only when -u is set, forces get -u not to verify that
+each package has been checked out from the source control repository
+implied by its import path. This can be useful if the source is a local fork
+of the original.
+
 The -fix flag instructs get to run the fix tool on the downloaded packages
 before resolving dependencies or building the code.
 

diff --git a/src/cmd/go/generate.go b/src/cmd/go/generate.go
index a83cce8f7acedae2e4ccb71da6bb44bb5ec2cf69..2772452dd52ab7a9ee636eb402a71bf1d4f9e42e 100644 (file)
--- a/src/cmd/go/generate.go
+++ b/src/cmd/go/generate.go
@@ -45,7 +45,7 @@ The arguments are space-separated tokens or double-quoted strings
 passed to the generator as individual arguments when it is run.
 
 Quoted strings use Go syntax and are evaluated before execution; a
-quoted string appears a single argument to the generator.
+quoted string appears as a single argument to the generator.
 
 Go generate sets several variables when it runs the generator: