diff --git a/winsup/utils/utils.sgml b/winsup/utils/utils.sgml
index badd89be2..926904c1e 100644
--- a/winsup/utils/utils.sgml
+++ b/winsup/utils/utils.sgml
@@ -711,7 +711,7 @@ Other options:
passwd changes passwords for user accounts.
A normal user may only change the password for their own account,
-the administrators may change the password for any account.
+but administrators may change passwords on any account.
passwd also changes account information, such as
password expiry dates and intervals.
@@ -722,34 +722,15 @@ enter the correct password. The administrators are permitted to
bypass this step so that forgotten passwords may be changed.
The user is then prompted for a replacement password.
-passwd will prompt again and compare the second entry
-against the first. Both entries are require to match in order for the
-password to be changed.
+passwd will prompt twice for this replacement and
+compare the second entry against the first. Both entries are require to
+match in order for the password to be changed.
After the password has been entered, password aging information
is checked to see if the user is permitted to change their password
at this time. If not, passwd refuses to change the
password and exits.
-Password expiry and length: The password aging information may be
-changed by the administrators with the -x,
--n and -i options. The
--x option is used to set the maximum number of days
-a password remains valid. After max days, the
-password is required to be changed. The -n option is
-used to set the minimum number of days before a password may be changed.
-The user will not be permitted to change the password until
-min days have elapsed. The -i
-option is used to disable an account after the password has been expired
-for a number of days. After a user account has had an expired password
-for inact days, the user may no longer sign on to
-the account. Allowed values for the above options are 0 to 999. The
--L option sets the minimum length of allowed passwords
-for users, which doesn't belong to the administrators group, to
-len characters. Allowed values for the minimum
-password length are 0 to 14. In any of the above cases, a value of 0
-means `no restrictions'.
-
Account maintenance: User accounts may be locked and unlocked with the
-l and -u flags. The
-l option disables an account. The -u
@@ -758,6 +739,26 @@ option re-enables an account.
The account status may be given with the -S
option. The status information is self explanatory.
+Administrators can also use passwd to change
+system-wide password expiry and length requirements with the
+-i, -n, -x,
+and -L options. The -i
+option is used to disable an account after the password has been expired
+for a number of days. After a user account has had an expired password
+for NUM days, the user may no longer sign on to
+the account. The -n option is
+used to set the minimum number of days before a password may be changed.
+The user will not be permitted to change the password until
+MINDAYS days have elapsed. The
+-x option is used to set the maximum number of days
+a password remains valid. After MAXDAYS days, the
+password is required to be changed. Allowed values for the above options
+are 0 to 999. The -L option sets the minimum length of
+allowed passwords for users who don't belong to the administrators group
+to LEN characters. Allowed values for the minimum
+password length are 0 to 14. In any of the above cases, a value of 0
+means `no restrictions'.
+
Limitations: Users may not be able to change their password on
some systems.
@@ -782,10 +783,36 @@ With no options, ps outputs the long format by default
The ps program gives the status of all the
Cygwin processes running on the system (ps = "process status"). Due
to the limitations of simulating a POSIX environment under Windows,
-there is little information to give. The PID column is the process ID
-you need to give to the kill command. The WINPID
-column is the process ID that's displayed by NT's Task Manager
-program.
+there is little information to give.
+
+
+
+The PID column is the process ID you need to give to the
+kill command. The PPID is the parent process ID,
+and PGID is the process group ID. The WINPID column is the process
+ID displayed by NT's Task Manager program. The TTY column gives which
+pseudo-terminal a process is running on, or a '?'
+for services. The UID column shows which user owns each process.
+STIME is the time the process was started, and COMMAND gives the name
+of the program running.
+
+
+
+By default ps will only show processes owned by the
+current user. With either the -a or -e
+option, all user's processes (and system processes) are listed. There are
+historical UNIX reasons for the synonomous options, which are functionally
+identical. The -f option outputs a "full" listing with
+usernames for UIDs. The -l option is the default display
+mode, showing a "long" listing with all the above columns. The other display
+option is -s, which outputs a shorter listing of just
+PID, TTY, STIME, and COMMAND. The -u option allows you
+to show only processes owned by a specific user. The -W
+option causes ps show non-Cygwin Windows processes as
+well as Cygwin processes. The WINPID is also the PID, and they can be killed
+with the Cygwin kill command's -f
+option.
+