From 0a21d2b8d005b36aab520e5ed5ec7e23985a1707 Mon Sep 17 00:00:00 2001 From: Anil Madhavapeddy Date: Tue, 5 Jul 2016 13:18:49 +0100 Subject: [PATCH] make `docker service --help` text for `--endpoint-mode` more consistent Previously: ``` --constraint value Placement constraints (default []) --endpoint-mode string Endpoint mode(Valid values: vip, dnsrr) --restart-condition string Restart when condition is met (none, on_failure, or any) ``` Now: ``` --constraint value Placement constraints (default []) --endpoint-mode string Endpoint mode (vip or dnsrr) --restart-condition string Restart when condition is met (none, on_failure, or any) ``` Signed-off-by: Anil Madhavapeddy (cherry picked from commit 2de9585f5ea798cbff23045d9d19ba239d5e5431) Signed-off-by: Tibor Vass --- api/client/service/opts.go | 2 +- docs/reference/commandline/service_create.md | 2 +- docs/reference/commandline/service_update.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/api/client/service/opts.go b/api/client/service/opts.go index e7ac8513bf..dda2290729 100644 --- a/api/client/service/opts.go +++ b/api/client/service/opts.go @@ -469,7 +469,7 @@ func addServiceFlags(cmd *cobra.Command, opts *serviceOptions) { flags.DurationVar(&opts.update.delay, flagUpdateDelay, time.Duration(0), "Delay between updates") flags.StringSliceVar(&opts.networks, flagNetwork, []string{}, "Network attachments") - flags.StringVar(&opts.endpoint.mode, flagEndpointMode, "", "Endpoint mode(Valid values: vip, dnsrr)") + flags.StringVar(&opts.endpoint.mode, flagEndpointMode, "", "Endpoint mode (vip or dnsrr)") flags.VarP(&opts.endpoint.ports, flagPublish, "p", "Publish a port as a node port") flags.BoolVar(&opts.registryAuth, flagRegistryAuth, false, "Send registry authentication details to Swarm agents") diff --git a/docs/reference/commandline/service_create.md b/docs/reference/commandline/service_create.md index 34e2a7a7e1..699e1732ab 100644 --- a/docs/reference/commandline/service_create.md +++ b/docs/reference/commandline/service_create.md @@ -20,7 +20,7 @@ Create a new service Options: --constraint value Placement constraints (default []) - --endpoint-mode string Endpoint mode(Valid values: VIP, DNSRR) + --endpoint-mode string Endpoint mode (vip or dnsrr) -e, --env value Set environment variables (default []) --help Print usage -l, --label value Service labels (default []) diff --git a/docs/reference/commandline/service_update.md b/docs/reference/commandline/service_update.md index afff2041c4..812c8f9158 100644 --- a/docs/reference/commandline/service_update.md +++ b/docs/reference/commandline/service_update.md @@ -21,7 +21,7 @@ Options: --arg value Service command args (default []) --command value Service command (default []) --constraint value Placement constraints (default []) - --endpoint-mode string Endpoint mode(Valid values: VIP, DNSRR) + --endpoint-mode string Endpoint mode (vip or dnsrr) -e, --env value Set environment variables (default []) --help Print usage --image string Service image tag