From 1b91555700d88e2f44cdddb3822a77bae7efd722 Mon Sep 17 00:00:00 2001 From: Aaron Lehmann Date: Wed, 29 Mar 2017 13:58:14 -0700 Subject: [PATCH] Merge pull request #32200 from yuexiao-wang/update-usage fix inconsistency for docker service ps (cherry picked from commit 278b36e5ce2f3be6d2db9a9b39b1e7357aaeab7b) Signed-off-by: Sebastiaan van Stijn --- docs/reference/commandline/service.md | 2 +- docs/reference/commandline/service_ps.md | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/docs/reference/commandline/service.md b/docs/reference/commandline/service.md index 6256c9f0fb..7ae0224ac0 100644 --- a/docs/reference/commandline/service.md +++ b/docs/reference/commandline/service.md @@ -28,7 +28,7 @@ Commands: inspect Display detailed information on one or more services logs Fetch the logs of a service ls List services - ps List the tasks of a service + ps List the tasks of one or more services rm Remove one or more services scale Scale one or multiple replicated services update Update a service diff --git a/docs/reference/commandline/service_ps.md b/docs/reference/commandline/service_ps.md index 91c946c405..51e8604c7e 100644 --- a/docs/reference/commandline/service_ps.md +++ b/docs/reference/commandline/service_ps.md @@ -17,7 +17,7 @@ aliases: ["/engine/reference/commandline/service_tasks/"] # service ps ```Markdown -Usage: docker service ps [OPTIONS] SERVICE +Usage: docker service ps [OPTIONS] SERVICE [SERVICE...] List the tasks of one or more services @@ -147,12 +147,10 @@ ID NAME IMAGE NODE DESIRED STATE CURRENT STATE 8eaxrb2fqpbn redis.10 redis:3.0.6 manager1 Running Running 8 seconds ``` - #### desired-state The `desired-state` filter can take the values `running`, `shutdown`, or `accepted`. - ### Formatting The formatting options (`--format`) pretty-prints tasks output @@ -176,7 +174,7 @@ output the data exactly as the template declares or, when using the `table` directive, includes column headers as well. The following example uses a template without headers and outputs the -`ID` and `Driver` entries separated by a colon for all tasks: +`Name` and `Image` entries separated by a colon for all tasks: ```bash $ docker service ps --format "{{.Name}}: {{.Image}}" top