From 4d1fc99027ae7f48ecfa6b873523610f25bbada6 Mon Sep 17 00:00:00 2001 From: allencloud Date: Fri, 29 Jul 2016 17:20:59 +0800 Subject: [PATCH] make node ps default to self in swarm node Signed-off-by: allencloud --- contrib/completion/zsh/_docker | 2 +- docs/reference/commandline/index.md | 2 +- docs/reference/commandline/node_ps.md | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/completion/zsh/_docker b/contrib/completion/zsh/_docker index 66dfeea9ef..3bed1d82fd 100644 --- a/contrib/completion/zsh/_docker +++ b/contrib/completion/zsh/_docker @@ -792,7 +792,7 @@ __docker_node_commands() { "ls:List nodes in the swarm" "promote:Promote a node as manager in the swarm" "rm:Remove one or more nodes from the swarm" - "ps:List tasks running on a node" + "ps:List tasks running on a node, defaults to current node" "update:Update a node" ) _describe -t docker-node-commands "docker node command" _docker_node_subcommands diff --git a/docs/reference/commandline/index.md b/docs/reference/commandline/index.md index e74a217f83..761238202c 100644 --- a/docs/reference/commandline/index.md +++ b/docs/reference/commandline/index.md @@ -115,7 +115,7 @@ read the [`dockerd`](dockerd.md) reference page. | [node demote](node_demote.md) | Demotes an existing manager so that it is no longer a manager | | [node inspect](node_inspect.md) | Inspect a node in the swarm | | [node update](node_update.md) | Update attributes for a node | -| [node ps](node_ps.md) | List tasks running on a node | +| [node ps](node_ps.md) | List tasks running on a node | | [node ls](node_ls.md) | List nodes in the swarm | | [node rm](node_rm.md) | Remove one or more nodes from the swarm | diff --git a/docs/reference/commandline/node_ps.md b/docs/reference/commandline/node_ps.md index fc003e9224..2856d2533b 100644 --- a/docs/reference/commandline/node_ps.md +++ b/docs/reference/commandline/node_ps.md @@ -12,9 +12,9 @@ parent = "smn_cli" # node ps ```markdown -Usage: docker node ps [OPTIONS] self|NODE +Usage: docker node ps [OPTIONS] [NODE] -List tasks running on a node +List tasks running on a node, defaults to current node. Options: -a, --all Display all instances