diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-10-21 12:59:42 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-21 12:59:42 -0400 |
| commit | a1b942ff401a9315dae05d9a3210780823d12839 (patch) | |
| tree | 8da82d1850e9e5d833a9e5faa4457afab634db78 /docs | |
| parent | 9060af971911b6b4c21b2b24d011835954058d30 (diff) | |
| parent | 980b1e87d40eedc175cdc76da668572b91784448 (diff) | |
| download | podman-a1b942ff401a9315dae05d9a3210780823d12839.tar.gz podman-a1b942ff401a9315dae05d9a3210780823d12839.tar.bz2 podman-a1b942ff401a9315dae05d9a3210780823d12839.zip | |
Merge pull request #8034 from rhatdan/options
Switch help messages from using [flags] to [options]
Diffstat (limited to 'docs')
| -rwxr-xr-x | docs/remote-docs.sh | 2 | ||||
| -rw-r--r-- | docs/source/markdown/podman-pod-top.1.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/remote-docs.sh b/docs/remote-docs.sh index a9fda4696..67c731e75 100755 --- a/docs/remote-docs.sh +++ b/docs/remote-docs.sh @@ -78,7 +78,7 @@ function html_fn() { # the command name but not its description. function podman_commands() { $PODMAN help "$@" |\ - awk '/^Available Commands:/{ok=1;next}/^Flags:/{ok=0}ok { print $1 }' |\ + awk '/^Available Commands:/{ok=1;next}/^Options:/{ok=0}ok { print $1 }' |\ grep . } diff --git a/docs/source/markdown/podman-pod-top.1.md b/docs/source/markdown/podman-pod-top.1.md index 6a1fa8c42..1f2ffd662 100644 --- a/docs/source/markdown/podman-pod-top.1.md +++ b/docs/source/markdown/podman-pod-top.1.md @@ -7,7 +7,7 @@ podman\-pod\-top - Display the running processes of containers in a pod **podman pod top** [*options*] *pod* [*format-descriptors*] ## DESCRIPTION -Display the running processes of containers in a pod. The *format-descriptors* are ps (1) compatible AIX format descriptors but extended to print additional information, such as the seccomp mode or the effective capabilities of a given process. The descriptors can either be passed as separated arguments or as a single comma-separated argument. Note that you can also specify options and or flags of ps(1); in this case, Podman will fallback to executing ps with the specified arguments and flags in the container. +Display the running processes of containers in a pod. The *format-descriptors* are ps (1) compatible AIX format descriptors but extended to print additional information, such as the seccomp mode or the effective capabilities of a given process. The descriptors can either be passed as separated arguments or as a single comma-separated argument. Note that you can specify options and/or additionally options of ps(1); in this case, Podman will fallback to executing ps with the specified arguments and options in the container. ## OPTIONS |