diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-10-13 20:36:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-13 20:36:46 +0200 |
| commit | 6a548df54605366d401ebef74d086c668b722832 (patch) | |
| tree | 79da879b78311cd0cbbfcd4a1681035fb3ff562e /docs/source/markdown | |
| parent | 3e2d7a992a7a6c1abd09bc519dd20276051bf727 (diff) | |
| parent | 8f603a76f6d7a0a34e5dcb677b8a9e5b87ba0157 (diff) | |
| download | podman-6a548df54605366d401ebef74d086c668b722832.tar.gz podman-6a548df54605366d401ebef74d086c668b722832.tar.bz2 podman-6a548df54605366d401ebef74d086c668b722832.zip | |
Merge pull request #8007 from ashley-cui/formatting
Restore --format: container stats & pod ps
Diffstat (limited to 'docs/source/markdown')
| -rw-r--r-- | docs/source/markdown/podman-pod-ps.1.md | 5 | ||||
| -rw-r--r-- | docs/source/markdown/podman-stats.1.md | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/docs/source/markdown/podman-pod-ps.1.md b/docs/source/markdown/podman-pod-ps.1.md index 035c20c7f..3df4403b7 100644 --- a/docs/source/markdown/podman-pod-ps.1.md +++ b/docs/source/markdown/podman-pod-ps.1.md @@ -68,11 +68,10 @@ Valid placeholders for the Go template are listed below: | .Name | Name of pod | | .Status | Status of pod | | .Labels | All the labels assigned to the pod | -| .ContainerInfo | Show the names, ids and/or statuses of containers (only shows 9 unless no-trunc is specified) | | .NumberOfContainers | Show the number of containers attached to pod | | .Cgroup | Cgroup path of pod | -| .UsePodCgroup | Whether containers use the Cgroup of the pod | - +| .Created | Creation time of pod | +| .InfraID | Pod infra container ID | **--sort** Sort by created, ID, name, status, or number of containers diff --git a/docs/source/markdown/podman-stats.1.md b/docs/source/markdown/podman-stats.1.md index 741873c3f..042da26d1 100644 --- a/docs/source/markdown/podman-stats.1.md +++ b/docs/source/markdown/podman-stats.1.md @@ -47,12 +47,11 @@ Valid placeholders for the Go template are listed below: | **Placeholder** | **Description** | | --------------- | --------------- | -| .Pod | Pod ID | | .ID | Container ID | | .Name | Container Name | -| .CPU | CPU percentage | +| .CPUPerc | CPU percentage | | .MemUsage | Memory usage | -| .Mem | Memory percentage | +| .MemPerc | Memory percentage | | .NetIO | Network IO | | .BlockIO | Block IO | | .PIDS | Number of PIDs | |