Merge pull request #6640 from ostezer/commands.go-linguistics-1

docker help -> grammatical correction (pos. adj. apost.)

api/client/commands.go

@@ -55,7 +55,7 @@ func (cli *DockerCli) CmdHelp(args ...string) error {
 		{"attach", "Attach to a running container"},
 		{"build", "Build an image from a Dockerfile"},
 		{"commit", "Create a new image from a container's changes"},
-		{"cp", "Copy files/folders from the containers filesystem to the host path"},
+		{"cp", "Copy files/folders from a container's filesystem to the host path"},
 		{"diff", "Inspect changes on a container's filesystem"},
 		{"events", "Get real time events from the server"},
 		{"export", "Stream the contents of a container as a tar archive"},

contrib/completion/fish/docker.fish

@@ -85,7 +85,7 @@ complete -c docker -A -f -n '__fish_seen_subcommand_from commit' -l run -d 'Conf
 complete -c docker -A -f -n '__fish_seen_subcommand_from commit' -a '(__fish_print_docker_containers all)' -d "Container"
 
 # cp
-complete -c docker -f -n '__fish_docker_no_subcommand' -a cp -d 'Copy files/folders from the containers filesystem to the host path'
+complete -c docker -f -n '__fish_docker_no_subcommand' -a cp -d 'Copy files/folders from a container's filesystem to the host path'
 
 # diff
 complete -c docker -f -n '__fish_docker_no_subcommand' -a diff -d "Inspect changes on a container's filesystem"

docs/man/docker-cp.1.md

@@ -8,7 +8,7 @@ docker-cp - Copy files/folders from the PATH to the HOSTPATH
 **docker cp** CONTAINER:PATH HOSTPATH
 
 # DESCRIPTION
-Copy files/folders from the containers filesystem to the host
+Copy files/folders from a container's filesystem to the host
 path. Paths are relative to the root of the filesystem. Files
 can be copied from a running or stopped container.
 

docs/man/docker.1.md

@@ -87,7 +87,7 @@ unix://[/path/to/socket] to use.
   Create a new image from a container's changes
 
 **docker-cp(1)**
-  Copy files/folders from the containers filesystem to the host at path
+  Copy files/folders from a container's filesystem to the host at path
 
 **docker-diff(1)**
   Inspect changes on a container's filesystem

docs/sources/reference/commandline/cli.md

@@ -329,7 +329,7 @@ maintainable way.
 
 ## cp
 
-Copy files/folders from the containers filesystem to the host
+Copy files/folders from a container's filesystem to the host
 path.  Paths are relative to the root of the filesystem.
 
     Usage: docker cp CONTAINER:PATH HOSTPATH