Merge pull request #18167 from duglin/FixTagHelp

Add more to tag's -f flag's help
Upstream-commit: 097bc4881f37d4154c88874ee16fbaf1e346a193
Component: engine

components/engine/api/client/tag.go

@@ -14,7 +14,7 @@ import (
 // Usage: docker tag [OPTIONS] IMAGE[:TAG] [REGISTRYHOST/][USERNAME/]NAME[:TAG]
 func (cli *DockerCli) CmdTag(args ...string) error {
 	cmd := Cli.Subcmd("tag", []string{"IMAGE[:TAG] [REGISTRYHOST/][USERNAME/]NAME[:TAG]"}, Cli.DockerCommands["tag"].Description, true)
-	force := cmd.Bool([]string{"f", "-force"}, false, "Force")
+	force := cmd.Bool([]string{"f", "-force"}, false, "Force the tagging even if there's a conflict")
 	cmd.Require(flag.Exact, 2)
 
 	cmd.ParseFlags(args, true)

components/engine/docs/reference/commandline/tag.md

@@ -14,7 +14,7 @@ parent = "smn_cli"
 
     Tag an image into a repository
 
-      -f, --force=false    Force
+      -f, --force=false    Force the tagging even if there's a conflict
       --help=false         Print usage
 
 You can group your images together using names and tags, and then upload them