diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2018-07-24 08:20:54 -0400 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-07-24 14:21:06 +0000 |
| commit | 07fe4e51cb2fb5efa291320b07b36bad366822c5 (patch) | |
| tree | 4b93900de2ffb2bb983dd366843c39287dc5081c /docs/podman-top.1.md | |
| parent | 3c5ce9b8bfabc737822861583ede4807f245d7ab (diff) | |
| download | podman-07fe4e51cb2fb5efa291320b07b36bad366822c5.tar.gz podman-07fe4e51cb2fb5efa291320b07b36bad366822c5.tar.bz2 podman-07fe4e51cb2fb5efa291320b07b36bad366822c5.zip | |
Vendor in latest containers/psgo code
Fixes spaces and sorting on capabilties and Descriptors
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Closes: #1148
Approved by: vrothberg
Diffstat (limited to 'docs/podman-top.1.md')
| -rw-r--r-- | docs/podman-top.1.md | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/docs/podman-top.1.md b/docs/podman-top.1.md index 76cc573d6..3422b3f37 100644 --- a/docs/podman-top.1.md +++ b/docs/podman-top.1.md @@ -24,23 +24,23 @@ to run containers such as CRI-O, the last started container could be from either The following descriptors are supported in addition to the AIX format descriptors mentioned in ps (1): -**pcpu, group, ppid, user, args, comm, rgroup, nice, pid, pgid, etime, ruser, time, tty, vsz** +**args,comm,etime,group,nice,pcpu,pgid,pid,ppid,rgroup,ruser,time,tty,user,vsz** -**capinh** - - Set of inheritable capabilities. See capabilities (7) for more information. - -**capprm** +**capbnd** - Set of permitted capabilities. See capabilities (7) for more information. + Set of bounding capabilities. See capabilities (7) for more information. **capeff** Set of effective capabilities. See capabilities (7) for more information. -**capbnd** +**capinh** - Set of bounding capabilities. See capabilities (7) for more information. + Set of inheritable capabilities. See capabilities (7) for more information. + +**capprm** + + Set of permitted capabilities. See capabilities (7) for more information. **seccomp** |