1 files changed, 13 insertions, 17 deletions
diff --git a/usr/src/man/man1/ps.1 b/usr/src/man/man1/ps.1
index 5eb0b70f3b..43a8b5b0a4 100644
--- a/usr/src/man/man1/ps.1
+++ b/usr/src/man/man1/ps.1
@@ -44,13 +44,12 @@
 .\" Portions Copyright (c) 1992, X/Open Company Limited All Rights Reserved
 .\" Copyright (c) 2009, Sun Microsystems, Inc. All Rights Reserved
 .\" Copyright (c) 2013 Gary Mills
-.\" Copyright (c) 2018, Joyent, Inc.
+.\" Copyright 2019 Joyent, Inc.
 .\"
-.TH PS 1 "August 22, 2018"
+.TH PS 1 "August 28, 2019"
 .SH NAME
 ps \- report process status
 .SH SYNOPSIS
-.LP
 .nf
 \fBps\fR [\fB-aAcdefjHlLPWyZ\fR] [\fB-g\fR \fIgrplist\fR] [\fB-h\fR \fIlgrplist\fR]
      [\fB-n\fR \fInamelist\fR] [\fB-o\fR \fIformat\fR]... [\fB-p\fR \fIproclist\fR]
@@ -59,7 +58,6 @@ ps \- report process status
 .fi
 
 .SH DESCRIPTION
-.LP
 The \fBps\fR command prints information about active processes. Without
 options, \fBps\fR prints information about processes that have the same
 effective user \fBID\fR and the same controlling terminal as the invoker. The
@@ -71,8 +69,10 @@ displayed is controlled by the options.
 Some options accept lists as arguments. Items in a list can be either separated
 by commas or else enclosed in quotes and separated by commas or spaces. Values
 for \fIproclist\fR and \fIgrplist\fR must be numeric.
-.SH OPTIONS
+.sp
 .LP
+The \fBps\fR command also accepts BSD-style options.  See \fBps\fR(1b).
+.SH OPTIONS
 The following options are supported:
 .sp
 .ne 2
@@ -372,9 +372,9 @@ Many of the options shown are used to select processes to list. If any are
 specified, the default list is ignored and \fBps\fR selects the processes
 represented by the inclusive OR of all the selection-criteria options.
 .SH DISPLAY FORMATS
-.LP
-Under the \fB-f\fR option, \fBps\fR tries to determine the command name and
-arguments given when the process was created by examining the user block.
+Under the \fB-f\fR option, \fBps\fR uses the \fB\fB/proc/\fInnnnn\fR\fB/cmdline\fR\fR
+file to read the full process arguments. The process may have changed these
+since it was started.
 Failing this, the command name is printed, as it would have appeared without
 the \fB-f\fR option, in square brackets.
 .sp
@@ -605,8 +605,8 @@ The execution time for the lwp being reported.
 \fB\fBCMD\fR(all)\fR
 .ad
 .RS 14n
-The command name (the full command name and its arguments, up to a limit of 80
-characters, are printed under the \fB-f\fR option).
+The command name (or, with the \fB-f\fR option, the full current process
+arguments).
 .RE
 
 .sp
@@ -664,7 +664,6 @@ lwp.
 A process that has exited and has a parent, but has not yet been waited for by
 the parent, is marked \fB<defunct>\fR\&.
 .SS "\fB-o\fR format"
-.LP
 The \fB-o\fR option allows the output format to be specified under user
 control.
 .sp
@@ -882,9 +881,9 @@ is a version of the argument list as it was passed to the command when it
 started, or is a version of the arguments as they might have been modified by
 the application. Applications cannot depend on being able to modify their
 argument list and having that modification be reflected in the output of
-\fBps\fR. The illumos implementation limits the string to 80 bytes; the string
-is the version of the argument list as it was passed to the command when it
-started.
+\fBps\fR. However, the current implementation will display the full modified
+process arguments when given the \fB-f\fR argument; otherwise this is the
+initial process arguments, but limited to 80 bytes.
 .RE
 
 .sp
@@ -1241,7 +1240,6 @@ ctid	CTID
 .TE
 
 .SH EXAMPLES
-.LP
 \fBExample 1 \fRUsing \fBps\fR Command
 .sp
 .LP
@@ -1289,7 +1287,6 @@ number of text columns to display.
 .RE
 
 .SH EXIT STATUS
-.LP
 The following exit values are returned:
 .sp
 .ne 2
@@ -1382,7 +1379,6 @@ Standard	See \fBstandards\fR(7).
 .BR zones (7),
 .BR getty (8)
 .SH NOTES
-.LP
 Things can change while \fBps\fR is running. The snapshot it gives is true only
 for a split-second, and it might not be accurate by the time you see it. Some
 data printed for defunct processes is irrelevant.