From e892a54fa13f8c634fe80e5b32ae783a5da03123 Mon Sep 17 00:00:00 2001 From: Yong Tang Date: Mon, 5 Sep 2016 03:11:14 -0700 Subject: [PATCH] Fix incorrect help output in `docker network ls` As is raised in 26312, in `docker network ls`, the help output was mistaken to `volume names`: ``` -q, --quiet Only display volume names ``` This fix changes the help output to: ``` -q, --quiet Only display network IDs ``` This fix also updates the documentation in: `docs/reference/commandline/network_ls.md` This fix fixes 26312. Signed-off-by: Yong Tang (cherry picked from commit b9e46235fadc6b390e2c04c44b6a865e4ea97cb8) Signed-off-by: Victor Vieux --- api/client/network/list.go | 2 +- docs/reference/commandline/network_ls.md | 2 +- man/docker-network-ls.1.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/api/client/network/list.go b/api/client/network/list.go index c149b985c9..71c8f1a0b6 100644 --- a/api/client/network/list.go +++ b/api/client/network/list.go @@ -41,7 +41,7 @@ func newListCommand(dockerCli *client.DockerCli) *cobra.Command { } flags := cmd.Flags() - flags.BoolVarP(&opts.quiet, "quiet", "q", false, "Only display volume names") + flags.BoolVarP(&opts.quiet, "quiet", "q", false, "Only display network IDs") flags.BoolVar(&opts.noTrunc, "no-trunc", false, "Do not truncate the output") flags.StringSliceVarP(&opts.filter, "filter", "f", []string{}, "Provide filter values (i.e. 'dangling=true')") diff --git a/docs/reference/commandline/network_ls.md b/docs/reference/commandline/network_ls.md index 494fd3a922..3b321470e0 100644 --- a/docs/reference/commandline/network_ls.md +++ b/docs/reference/commandline/network_ls.md @@ -22,7 +22,7 @@ Options: -f, --filter value Provide filter values (i.e. 'dangling=true') (default []) --help Print usage --no-trunc Do not truncate the output - -q, --quiet Only display volume names + -q, --quiet Only display network IDs ``` Lists all the networks the Engine `daemon` knows about. This includes the diff --git a/man/docker-network-ls.1.md b/man/docker-network-ls.1.md index 3eeff05993..bfd87329cc 100644 --- a/man/docker-network-ls.1.md +++ b/man/docker-network-ls.1.md @@ -166,7 +166,7 @@ attached. Do not truncate the output **-q**, **--quiet**=*true*|*false* - Only display numeric IDs + Only display network IDs **--help** Print usage statement