From 7dad9d5ce45f25750f339642d3b84a81cc2ba98e Mon Sep 17 00:00:00 2001 From: yuexiao-wang Date: Tue, 18 Oct 2016 18:50:11 +0800 Subject: [PATCH] Fix typs from go to Go Signed-off-by: yuexiao-wang --- cli/command/container/inspect.go | 2 +- cli/command/image/inspect.go | 2 +- cli/command/network/inspect.go | 2 +- cli/command/node/inspect.go | 2 +- cli/command/plugin/inspect.go | 2 +- cli/command/service/inspect.go | 2 +- cli/command/system/events.go | 2 +- cli/command/system/info.go | 2 +- cli/command/system/inspect.go | 2 +- cli/command/system/version.go | 2 +- cli/command/volume/inspect.go | 2 +- docs/reference/commandline/events.md | 2 +- docs/reference/commandline/info.md | 2 +- docs/reference/commandline/inspect.md | 2 +- docs/reference/commandline/network_inspect.md | 2 +- docs/reference/commandline/node_inspect.md | 2 +- docs/reference/commandline/plugin_inspect.md | 2 +- docs/reference/commandline/service_inspect.md | 2 +- docs/reference/commandline/system_prune.md | 1 + docs/reference/commandline/version.md | 2 +- docs/reference/commandline/volume_create.md | 1 + docs/reference/commandline/volume_inspect.md | 3 ++- docs/reference/commandline/volume_ls.md | 3 ++- docs/reference/commandline/volume_rm.md | 1 + man/docker-events.1.md | 2 +- man/docker-info.1.md | 2 +- man/docker-network-inspect.1.md | 2 +- man/docker-version.1.md | 2 +- 28 files changed, 30 insertions(+), 25 deletions(-) diff --git a/cli/command/container/inspect.go b/cli/command/container/inspect.go index 0bef51a61d..08a8d244df 100644 --- a/cli/command/container/inspect.go +++ b/cli/command/container/inspect.go @@ -30,7 +30,7 @@ func newInspectCommand(dockerCli *command.DockerCli) *cobra.Command { } flags := cmd.Flags() - flags.StringVarP(&opts.format, "format", "f", "", "Format the output using the given go template") + flags.StringVarP(&opts.format, "format", "f", "", "Format the output using the given Go template") flags.BoolVarP(&opts.size, "size", "s", false, "Display total file sizes") return cmd diff --git a/cli/command/image/inspect.go b/cli/command/image/inspect.go index 11c528ef2a..217863c772 100644 --- a/cli/command/image/inspect.go +++ b/cli/command/image/inspect.go @@ -29,7 +29,7 @@ func newInspectCommand(dockerCli *command.DockerCli) *cobra.Command { } flags := cmd.Flags() - flags.StringVarP(&opts.format, "format", "f", "", "Format the output using the given go template") + flags.StringVarP(&opts.format, "format", "f", "", "Format the output using the given Go template") return cmd } diff --git a/cli/command/network/inspect.go b/cli/command/network/inspect.go index f1f677db9c..1a86855f71 100644 --- a/cli/command/network/inspect.go +++ b/cli/command/network/inspect.go @@ -27,7 +27,7 @@ func newInspectCommand(dockerCli *command.DockerCli) *cobra.Command { }, } - cmd.Flags().StringVarP(&opts.format, "format", "f", "", "Format the output using the given go template") + cmd.Flags().StringVarP(&opts.format, "format", "f", "", "Format the output using the given Go template") return cmd } diff --git a/cli/command/node/inspect.go b/cli/command/node/inspect.go index a11182f082..0812ec5eab 100644 --- a/cli/command/node/inspect.go +++ b/cli/command/node/inspect.go @@ -36,7 +36,7 @@ func newInspectCommand(dockerCli *command.DockerCli) *cobra.Command { } flags := cmd.Flags() - flags.StringVarP(&opts.format, "format", "f", "", "Format the output using the given go template") + flags.StringVarP(&opts.format, "format", "f", "", "Format the output using the given Go template") flags.BoolVar(&opts.pretty, "pretty", false, "Print the information in a human friendly format.") return cmd } diff --git a/cli/command/plugin/inspect.go b/cli/command/plugin/inspect.go index a1cf1f7b0e..e5059629e5 100644 --- a/cli/command/plugin/inspect.go +++ b/cli/command/plugin/inspect.go @@ -32,7 +32,7 @@ func newInspectCommand(dockerCli *command.DockerCli) *cobra.Command { } flags := cmd.Flags() - flags.StringVarP(&opts.format, "format", "f", "", "Format the output using the given go template") + flags.StringVarP(&opts.format, "format", "f", "", "Format the output using the given Go template") return cmd } diff --git a/cli/command/service/inspect.go b/cli/command/service/inspect.go index 054c24383e..deb701bf6d 100644 --- a/cli/command/service/inspect.go +++ b/cli/command/service/inspect.go @@ -37,7 +37,7 @@ func newInspectCommand(dockerCli *command.DockerCli) *cobra.Command { } flags := cmd.Flags() - flags.StringVarP(&opts.format, "format", "f", "", "Format the output using the given go template") + flags.StringVarP(&opts.format, "format", "f", "", "Format the output using the given Go template") flags.BoolVar(&opts.pretty, "pretty", false, "Print the information in a human friendly format.") return cmd } diff --git a/cli/command/system/events.go b/cli/command/system/events.go index 7b5fb592cb..087523051a 100644 --- a/cli/command/system/events.go +++ b/cli/command/system/events.go @@ -45,7 +45,7 @@ func NewEventsCommand(dockerCli *command.DockerCli) *cobra.Command { flags.StringVar(&opts.since, "since", "", "Show all events created since timestamp") flags.StringVar(&opts.until, "until", "", "Stream events until this timestamp") flags.VarP(&opts.filter, "filter", "f", "Filter output based on conditions provided") - flags.StringVar(&opts.format, "format", "", "Format the output using the given go template") + flags.StringVar(&opts.format, "format", "", "Format the output using the given Go template") return cmd } diff --git a/cli/command/system/info.go b/cli/command/system/info.go index 8116ae524a..fb5ea17d7b 100644 --- a/cli/command/system/info.go +++ b/cli/command/system/info.go @@ -37,7 +37,7 @@ func NewInfoCommand(dockerCli *command.DockerCli) *cobra.Command { flags := cmd.Flags() - flags.StringVarP(&opts.format, "format", "f", "", "Format the output using the given go template") + flags.StringVarP(&opts.format, "format", "f", "", "Format the output using the given Go template") return cmd } diff --git a/cli/command/system/inspect.go b/cli/command/system/inspect.go index 015c1b5c6d..d7a24854e7 100644 --- a/cli/command/system/inspect.go +++ b/cli/command/system/inspect.go @@ -35,7 +35,7 @@ func NewInspectCommand(dockerCli *command.DockerCli) *cobra.Command { } flags := cmd.Flags() - flags.StringVarP(&opts.format, "format", "f", "", "Format the output using the given go template") + flags.StringVarP(&opts.format, "format", "f", "", "Format the output using the given Go template") flags.StringVar(&opts.inspectType, "type", "", "Return JSON for specified type") flags.BoolVarP(&opts.size, "size", "s", false, "Display total file sizes if the type is container") diff --git a/cli/command/system/version.go b/cli/command/system/version.go index e77719ec3b..7959bf564f 100644 --- a/cli/command/system/version.go +++ b/cli/command/system/version.go @@ -52,7 +52,7 @@ func NewVersionCommand(dockerCli *command.DockerCli) *cobra.Command { flags := cmd.Flags() - flags.StringVarP(&opts.format, "format", "f", "", "Format the output using the given go template") + flags.StringVarP(&opts.format, "format", "f", "", "Format the output using the given Go template") return cmd } diff --git a/cli/command/volume/inspect.go b/cli/command/volume/inspect.go index ab06e03807..5eb8ad2516 100644 --- a/cli/command/volume/inspect.go +++ b/cli/command/volume/inspect.go @@ -28,7 +28,7 @@ func newInspectCommand(dockerCli *command.DockerCli) *cobra.Command { }, } - cmd.Flags().StringVarP(&opts.format, "format", "f", "", "Format the output using the given go template") + cmd.Flags().StringVarP(&opts.format, "format", "f", "", "Format the output using the given Go template") return cmd } diff --git a/docs/reference/commandline/events.md b/docs/reference/commandline/events.md index c9821814de..cb34eee497 100644 --- a/docs/reference/commandline/events.md +++ b/docs/reference/commandline/events.md @@ -13,7 +13,7 @@ Get real time events from the server Options: -f, --filter value Filter output based on conditions provided (default []) - --format string Format the output using the given go template + --format string Format the output using the given Go template --help Print usage --since string Show all events created since timestamp --until string Stream events until this timestamp diff --git a/docs/reference/commandline/info.md b/docs/reference/commandline/info.md index a880fb7556..12c54d7a32 100644 --- a/docs/reference/commandline/info.md +++ b/docs/reference/commandline/info.md @@ -12,7 +12,7 @@ Usage: docker info [OPTIONS] Display system-wide information Options: - -f, --format string Format the output using the given go template + -f, --format string Format the output using the given Go template --help Print usage ``` diff --git a/docs/reference/commandline/inspect.md b/docs/reference/commandline/inspect.md index 697254a07a..ec61d96cc3 100644 --- a/docs/reference/commandline/inspect.md +++ b/docs/reference/commandline/inspect.md @@ -13,7 +13,7 @@ Return low-level information on one or multiple containers, images, volumes, networks, nodes, services, or tasks identified by name or ID. Options: - -f, --format Format the output using the given go template + -f, --format Format the output using the given Go template --help Print usage -s, --size Display total file sizes if the type is container values are "image" or "container" or "task diff --git a/docs/reference/commandline/network_inspect.md b/docs/reference/commandline/network_inspect.md index 1e0b3e53dd..9603d936dd 100644 --- a/docs/reference/commandline/network_inspect.md +++ b/docs/reference/commandline/network_inspect.md @@ -12,7 +12,7 @@ Usage: docker network inspect [OPTIONS] NETWORK [NETWORK...] Display detailed information on one or more networks Options: - -f, --format string Format the output using the given go template + -f, --format string Format the output using the given Go template --help Print usage ``` diff --git a/docs/reference/commandline/node_inspect.md b/docs/reference/commandline/node_inspect.md index 9edc081f3b..8728605f2a 100644 --- a/docs/reference/commandline/node_inspect.md +++ b/docs/reference/commandline/node_inspect.md @@ -12,7 +12,7 @@ Usage: docker node inspect [OPTIONS] self|NODE [NODE...] Display detailed information on one or more nodes Options: - -f, --format string Format the output using the given go template + -f, --format string Format the output using the given Go template --help Print usage --pretty Print the information in a human friendly format. ``` diff --git a/docs/reference/commandline/plugin_inspect.md b/docs/reference/commandline/plugin_inspect.md index 01f5877e8c..e0b566be99 100755 --- a/docs/reference/commandline/plugin_inspect.md +++ b/docs/reference/commandline/plugin_inspect.md @@ -13,7 +13,7 @@ Usage: docker plugin inspect [OPTIONS] PLUGIN [PLUGIN...] Display detailed information on one or more plugins Options: - -f, --format string Format the output using the given go template + -f, --format string Format the output using the given Go template --help Print usage ``` diff --git a/docs/reference/commandline/service_inspect.md b/docs/reference/commandline/service_inspect.md index fc167d77a8..29286dd7d5 100644 --- a/docs/reference/commandline/service_inspect.md +++ b/docs/reference/commandline/service_inspect.md @@ -12,7 +12,7 @@ Usage: docker service inspect [OPTIONS] SERVICE [SERVICE...] Display detailed information on one or more services Options: - -f, --format string Format the output using the given go template + -f, --format string Format the output using the given Go template --help Print usage --pretty Print the information in a human friendly format. ``` diff --git a/docs/reference/commandline/system_prune.md b/docs/reference/commandline/system_prune.md index 393d96ed9d..6691885e3e 100644 --- a/docs/reference/commandline/system_prune.md +++ b/docs/reference/commandline/system_prune.md @@ -59,6 +59,7 @@ Total reclaimed space: 13.5 MB * [volume ls](volume_ls.md) * [volume inspect](volume_inspect.md) * [volume rm](volume_rm.md) +* [volume prune](volume_prune.md) * [Understand Data Volumes](../../tutorials/dockervolumes.md) * [system df](system_df.md) * [container prune](container_prune.md) diff --git a/docs/reference/commandline/version.md b/docs/reference/commandline/version.md index ee95e6508a..169d077e10 100644 --- a/docs/reference/commandline/version.md +++ b/docs/reference/commandline/version.md @@ -12,7 +12,7 @@ Usage: docker version [OPTIONS] Show the Docker version information Options: - -f, --format string Format the output using the given go template + -f, --format string Format the output using the given Go template --help Print usage ``` diff --git a/docs/reference/commandline/volume_create.md b/docs/reference/commandline/volume_create.md index b05b408736..db9d7a28ce 100644 --- a/docs/reference/commandline/volume_create.md +++ b/docs/reference/commandline/volume_create.md @@ -78,4 +78,5 @@ $ docker volume create --driver local --opt type=nfs --opt o=addr=192.168.1.1,rw * [volume inspect](volume_inspect.md) * [volume ls](volume_ls.md) * [volume rm](volume_rm.md) +* [volume prune](volume_prune.md) * [Understand Data Volumes](../../tutorials/dockervolumes.md) diff --git a/docs/reference/commandline/volume_inspect.md b/docs/reference/commandline/volume_inspect.md index dd748d2706..fba4853178 100644 --- a/docs/reference/commandline/volume_inspect.md +++ b/docs/reference/commandline/volume_inspect.md @@ -12,7 +12,7 @@ Usage: docker volume inspect [OPTIONS] VOLUME [VOLUME...] Display detailed information on one or more volumes Options: - -f, --format string Format the output using the given go template + -f, --format string Format the output using the given Go template --help Print usage ``` @@ -44,4 +44,5 @@ Example output: * [volume create](volume_create.md) * [volume ls](volume_ls.md) * [volume rm](volume_rm.md) +* [volume prune](volume_prune.md) * [Understand Data Volumes](../../tutorials/dockervolumes.md) diff --git a/docs/reference/commandline/volume_ls.md b/docs/reference/commandline/volume_ls.md index fb8c658261..d9dde580d1 100644 --- a/docs/reference/commandline/volume_ls.md +++ b/docs/reference/commandline/volume_ls.md @@ -25,7 +25,7 @@ Options: -q, --quiet Only display volume names ``` -Lists all the volumes Docker knows about. You can filter using the `-f` or `--filter` flag. Refer to the [filtering](#filtering) section for more information about available filter options. +List all the volumes Docker knows about. You can filter using the `-f` or `--filter` flag. Refer to the [filtering](#filtering) section for more information about available filter options. Example output: @@ -170,4 +170,5 @@ vol3: local * [volume create](volume_create.md) * [volume inspect](volume_inspect.md) * [volume rm](volume_rm.md) +* [volume prune](volume_prune.md) * [Understand Data Volumes](../../tutorials/dockervolumes.md) diff --git a/docs/reference/commandline/volume_rm.md b/docs/reference/commandline/volume_rm.md index 2e5e534309..ec54400778 100644 --- a/docs/reference/commandline/volume_rm.md +++ b/docs/reference/commandline/volume_rm.md @@ -30,4 +30,5 @@ Remove one or more volumes. You cannot remove a volume that is in use by a conta * [volume create](volume_create.md) * [volume inspect](volume_inspect.md) * [volume ls](volume_ls.md) +* [volume prune](volume_prune.md) * [Understand Data Volumes](../../tutorials/dockervolumes.md) diff --git a/man/docker-events.1.md b/man/docker-events.1.md index 311020f6ef..11b3e98e5a 100644 --- a/man/docker-events.1.md +++ b/man/docker-events.1.md @@ -47,7 +47,7 @@ Docker networks report the following events: Stream events until this timestamp **--format**="" - Format the output using the given go template + Format the output using the given Go template The `--since` and `--until` parameters can be Unix timestamps, date formatted timestamps, or Go duration strings (e.g. `10m`, `1h30m`) computed diff --git a/man/docker-info.1.md b/man/docker-info.1.md index 810b215363..42f1efe863 100644 --- a/man/docker-info.1.md +++ b/man/docker-info.1.md @@ -33,7 +33,7 @@ available on the volume where `/var/lib/docker` is mounted. Print usage statement **-f**, **--format**="" - Format the output using the given go template + Format the output using the given Go template # EXAMPLES diff --git a/man/docker-network-inspect.1.md b/man/docker-network-inspect.1.md index 3805fb25a8..f27c98cb34 100644 --- a/man/docker-network-inspect.1.md +++ b/man/docker-network-inspect.1.md @@ -103,7 +103,7 @@ $ docker network inspect simple-network # OPTIONS **-f**, **--format**="" - Format the output using the given go template. + Format the output using the given Go template. **--help** Print usage statement diff --git a/man/docker-version.1.md b/man/docker-version.1.md index 04ae3464f8..bb521c4eed 100644 --- a/man/docker-version.1.md +++ b/man/docker-version.1.md @@ -18,7 +18,7 @@ daemon. Print usage statement **-f**, **--format**="" - Format the output using the given go template. + Format the output using the given Go template. # EXAMPLES