diff options
| author | Jess Frazelle <jfrazelle@users.noreply.github.com> | 2015-09-23 15:40:58 -0700 |
|---|---|---|
| committer | Jess Frazelle <jfrazelle@users.noreply.github.com> | 2015-09-23 15:40:58 -0700 |
| commit | a077c46d140ade9b78d81c66fe4b752e6ea25f13 (patch) | |
| tree | 325ffdf779a2ba581cd069d85ce9abf2dfa7b63e | |
| parent | 40adb3fd2cd6a10faa44bbd49a9364e2d71cefe9 (diff) | |
| parent | ee6b81faf2a6d49a53cc79571f5c96be4bdb8db0 (diff) | |
| download | docker-a077c46d140ade9b78d81c66fe4b752e6ea25f13.tar.gz | |
Merge pull request #16523 from coolljt0725/correct_help_message_of_docker_cp
Docs: correct the description of docker cp
| -rw-r--r-- | contrib/completion/fish/docker.fish | 2 | ||||
| -rw-r--r-- | docker/flags.go | 2 | ||||
| -rw-r--r-- | man/docker.1.md | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/contrib/completion/fish/docker.fish b/contrib/completion/fish/docker.fish index 798f1ec3b4..cedd51a210 100644 --- a/contrib/completion/fish/docker.fish +++ b/contrib/completion/fish/docker.fish @@ -109,7 +109,7 @@ complete -c docker -A -f -n '__fish_seen_subcommand_from commit' -s p -l pause - 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 a container's filesystem to the host path" +complete -c docker -f -n '__fish_docker_no_subcommand' -a cp -d "Copy files/folders between a container and the local filesystem" complete -c docker -A -f -n '__fish_seen_subcommand_from cp' -l help -d 'Print usage' # create diff --git a/docker/flags.go b/docker/flags.go index f45da10fda..edd3623548 100644 --- a/docker/flags.go +++ b/docker/flags.go @@ -24,7 +24,7 @@ var dockerCommands = []command{ {"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 a container to a HOSTDIR or to STDOUT"}, + {"cp", "Copy files/folders between a container and the local filesystem"}, {"create", "Create a new container"}, {"diff", "Inspect changes on a container's filesystem"}, {"events", "Get real time events from the server"}, diff --git a/man/docker.1.md b/man/docker.1.md index bee12512aa..ddcfab858b 100644 --- a/man/docker.1.md +++ b/man/docker.1.md @@ -184,7 +184,7 @@ unix://[/path/to/socket] to use. See **docker-commit(1)** for full documentation on the **commit** command. **cp** - Copy files/folders from a container's filesystem to the host + Copy files/folders between a container and the local filesystem See **docker-cp(1)** for full documentation on the **cp** command. **create** |