Merge pull request moby#25330 from yongtang/docs-service-create-updat…

…e-user Update docs in `docker service create/update` for flag `--user`
tiborvass · Aug 2, 2016 · 50c08f0 · 50c08f0
2 parents b47df1d + 80a3755
commit 50c08f0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/api/client/service/opts.go b/api/client/service/opts.go
@@ -489,7 +489,7 @@ func addServiceFlags(cmd *cobra.Command, opts *serviceOptions) {
 	flags.StringVar(&opts.name, flagName, "", "Service name")
 
 	flags.StringVarP(&opts.workdir, flagWorkdir, "w", "", "Working directory inside the container")
-	flags.StringVarP(&opts.user, flagUser, "u", "", "Username or UID")
+	flags.StringVarP(&opts.user, flagUser, "u", "", "Username or UID (format: <name|uid>[:<group|gid>])")
 
 	flags.Var(&opts.resources.limitCPU, flagLimitCPU, "Limit CPUs")
 	flags.Var(&opts.resources.limitMemBytes, flagLimitMemory, "Limit Memory")

diff --git a/docs/reference/commandline/service_create.md b/docs/reference/commandline/service_create.md
@@ -42,7 +42,7 @@ Options:
       --update-delay duration          Delay between updates
       --update-failure-action string   Action on update failure (pause|continue) (default "pause")
       --update-parallelism uint        Maximum number of tasks updated simultaneously (0 to update all at once) (default 1)
-  -u, --user string                    Username or UID
+  -u, --user string                    Username or UID (format: <name|uid>[:<group|gid>])
       --with-registry-auth             Send registry authentication details to Swarm agents
   -w, --workdir string                 Working directory inside the container
 ```

diff --git a/docs/reference/commandline/service_update.md b/docs/reference/commandline/service_update.md
@@ -50,7 +50,7 @@ Options:
       --update-delay duration          Delay between updates
       --update-failure-action string   Action on update failure (pause|continue) (default "pause")
       --update-parallelism uint        Maximum number of tasks updated simultaneously (0 to update all at once) (default 1)
-  -u, --user string                    Username or UID
+  -u, --user string                    Username or UID (format: <name|uid>[:<group|gid>])
       --with-registry-auth             Send registry authentication details to Swarm agents
   -w, --workdir string                 Working directory inside the container
 ```