emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

Merge commit 'refs/merge-requests/13' of git://gitorious.org/procps/procps into merge-requests/13

Browse Source 
Conflicts:
	pgrep.c
	ps/output.c
	ps/ps.1
This commit is contained in:
Craig Small
2013-09-11 21:34:05 +10:00
parent 5e4d9d5a92 91d225f3b8
commit dd6f24dbed
12 changed files with 350 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
ps/ps.1
View File

@ -1299,6 +1299,10 @@ format is displayed. (alias
.BR sig_ignore , \ sigignore ).
T}
ipcns IPCNS T{
Unique inode number describing the namespace the process belongs to. See namespaces(7).
T}
label LABEL T{
security label, most commonly used for SELinux context data. This is for
the
@ -1335,6 +1339,14 @@ min_flt MINFLT T{
The number of minor page faults that have occurred with this process.
T}
mntns MNTNS T{
Unique inode number describing the namespace the process belongs to. See namespaces(7).
T}
netns NETNS T{
Unique inode number describing the namespace the process belongs to. See namespaces(7).
T}
ni NI T{
nice value. This ranges from 19 (nicest) to \-20 (not nice to others),
see
@ -1403,6 +1415,10 @@ a number representing the process ID (alias
.BR tgid ).
T}
pidns PIDNS T{
Unique inode number describing the namespace the process belongs to. See namespaces(7).
T}
pmem %MEM T{
see
.BR %mem .
@ -1735,6 +1751,14 @@ see
.BR euser , \ uname ).
T}
userns USERNS T{
Unique inode number describing the namespace the process belongs to. See namespaces(7).
T}
utsns UTSNS T{
Unique inode number describing the namespace the process belongs to. See namespaces(7).
T}
uunit UUNIT T{
displays systemd user unit which a process belongs to.
T}