New upstream version 4.6upstream/4.6

20 files changed, 272 insertions, 138 deletions

diff --git a/man/README.md b/man/README.md
new file mode 100644
index 00000000..ebe2728f
--- /dev/null
+++ b/man/README.md
@@ -0,0 +1,10 @@
+The [official releases](https://github.com/shadow-maint/shadow/releases) ship
+with pre-built manpages.
+
+The content of the man pages however is dependent on compile flags. So the
+pre-built ones might not fit your version of shadow.  To build them yourself use
+`--enable-man`. Furthermore the following build requirements will be needed:
+- xsltproc
+- docbook 4
+- docbook stylesheets
+- xml2po
diff --git a/man/chage.1.xml b/man/chage.1.xml
index d05617d3..6ec6e840 100644
--- a/man/chage.1.xml
+++ b/man/chage.1.xml
@@ -83,7 +83,7 @@
       The <command>chage</command> command changes the number of days between
       password changes and the date of the last password change. This
       information is used by the system to determine when a user must change
-      his/her password.
+      their password.
     </para>
   </refsect1>
 
@@ -168,7 +168,7 @@
 	  <para>
 	    Set the minimum number of days between password changes to
 	    <replaceable>MIN_DAYS</replaceable>. A value of zero for this field
-	    indicates that the user may change his/her password at any time.
+	    indicates that the user may change their password at any time.
 	  </para>
 	</listitem>
       </varlistentry>
@@ -181,8 +181,8 @@
 	    Set the maximum number of days during which a password is valid. 
 	    When <replaceable>MAX_DAYS</replaceable> plus
 	    <replaceable>LAST_DAY</replaceable> is less than the current
-	    day, the user will be required to change his/her password before
-	    being able to use his/her account. This occurrence can be planned for
+	    day, the user will be required to change their password before
+	    being able to use their account. This occurrence can be planned for
 	    in advance by use of the <option>-W</option> option, which
 	    provides the user with advance warning.
 	  </para>
@@ -214,7 +214,7 @@
 	    Set the number of days of warning before a password change is
 	    required. The <replaceable>WARN_DAYS</replaceable> option is the
 	    number of days prior to the password expiring that a user will
-	    be warned his/her password is about to expire.
+	    be warned their password is about to expire.
 	  </para>
 	</listitem>
       </varlistentry>
@@ -235,7 +235,7 @@
     </para>
     <para>The <command>chage</command> command is restricted to the root
       user, except for the <option>-l</option> option, which may be used by
-      an unprivileged user to determine when his/her password or account is due
+      an unprivileged user to determine when their password or account is due
       to expire.
     </para>
   </refsect1>
diff --git a/man/groupadd.8.xml b/man/groupadd.8.xml
index 93d8b6f7..1e58f093 100644
--- a/man/groupadd.8.xml
+++ b/man/groupadd.8.xml
@@ -212,6 +212,23 @@
 	  </para>
 	</listitem>
       </varlistentry>
+      <varlistentry>
+	<term>
+	  <option>-P</option>, <option>--prefix</option>&nbsp;<replaceable>PREFIX_DIR</replaceable>
+	</term>
+	<listitem>
+	  <para>
+	    Apply changes in the <replaceable>PREFIX_DIR</replaceable>
+	    directory and use the configuration files from the
+	    <replaceable>PREFIX_DIR</replaceable> directory.
+		This option does not chroot and is intended for preparing 
+		a cross-compilation target.
+		Some limitations: NIS and LDAP users/groups are not verified.
+		PAM authentication is using the host files.
+		No SELINUX support.
+	  </para>
+	</listitem>
+      </varlistentry>
     </variablelist>
   </refsect1>
 
diff --git a/man/groupdel.8.xml b/man/groupdel.8.xml
index 438e9e54..41116617 100644
--- a/man/groupdel.8.xml
+++ b/man/groupdel.8.xml
@@ -109,6 +109,23 @@
 	  </para>
 	</listitem>
       </varlistentry>
+      <varlistentry>
+	<term>
+	  <option>-P</option>, <option>--prefix</option>&nbsp;<replaceable>PREFIX_DIR</replaceable>
+	</term>
+	<listitem>
+	  <para>
+	    Apply changes in the <replaceable>PREFIX_DIR</replaceable>
+	    directory and use the configuration files from the
+	    <replaceable>PREFIX_DIR</replaceable> directory.
+		This option does not chroot and is intended for preparing 
+		a cross-compilation target.
+		Some limitations: NIS and LDAP users/groups are not verified.
+		PAM authentication is using the host files.
+		No SELINUX support.
+	  </para>
+	</listitem>
+      </varlistentry>
     </variablelist>
   </refsect1>
 
diff --git a/man/groupmems.8.xml b/man/groupmems.8.xml
index 40d04210..1432ea42 100644
--- a/man/groupmems.8.xml
+++ b/man/groupmems.8.xml
@@ -85,7 +85,7 @@
     <title>DESCRIPTION</title>
     <para>
       The <command>groupmems</command> command allows a user to administer
-      his/her own group membership list without the requirement of
+      their own group membership list without the requirement of
       superuser privileges. The <command>groupmems</command> utility is for
       systems that configure its users to be in their own name sake primary
       group (i.e., guest / guest).
diff --git a/man/groupmod.8.xml b/man/groupmod.8.xml
index 46666252..b381c33a 100644
--- a/man/groupmod.8.xml
+++ b/man/groupmod.8.xml
@@ -186,6 +186,23 @@
 	  </para>
 	</listitem>
       </varlistentry>
+      <varlistentry>
+	<term>
+	  <option>-P</option>, <option>--prefix</option>&nbsp;<replaceable>PREFIX_DIR</replaceable>
+	</term>
+	<listitem>
+	  <para>
+	    Apply changes in the <replaceable>PREFIX_DIR</replaceable>
+	    directory and use the configuration files from the
+	    <replaceable>PREFIX_DIR</replaceable> directory.
+		This option does not chroot and is intended for preparing 
+		a cross-compilation target.
+		Some limitations: NIS and LDAP users/groups are not verified.
+		PAM authentication is using the host files.
+		No SELINUX support.
+	  </para>
+	</listitem>
+      </varlistentry>
     </variablelist>
   </refsect1>
 
@@ -239,43 +256,61 @@
 	<varlistentry>
 	  <term><replaceable>0</replaceable></term>
 	  <listitem>
-	    <para>success</para>
+	    <para>E_SUCCESS: success</para>
 	  </listitem>
 	</varlistentry>
 	<varlistentry>
 	  <term><replaceable>2</replaceable></term>
 	  <listitem>
-	    <para>invalid command syntax</para>
+	    <para>E_USAGE: invalid command syntax</para>
 	  </listitem>
 	</varlistentry>
 	<varlistentry>
 	  <term><replaceable>3</replaceable></term>
 	  <listitem>
-	    <para>invalid argument to option</para>
+	    <para>E_BAD_ARG: invalid argument to option</para>
 	  </listitem>
 	</varlistentry>
 	<varlistentry>
 	  <term><replaceable>4</replaceable></term>
 	  <listitem>
-	    <para>specified group doesn't exist</para>
+	    <para>E_GID_IN_USE: specified group doesn't exist</para>
 	  </listitem>
 	</varlistentry>
 	<varlistentry>
 	  <term><replaceable>6</replaceable></term>
 	  <listitem>
-	    <para>specified group doesn't exist</para>
+	    <para>E_NOTFOUND: specified group doesn't exist</para>
 	  </listitem>
 	</varlistentry>
 	<varlistentry>
 	  <term><replaceable>9</replaceable></term>
 	  <listitem>
-	    <para>group name already in use</para>
+	    <para>E_NAME_IN_USE: group name already in use</para>
 	  </listitem>
 	</varlistentry>
 	<varlistentry>
 	  <term><replaceable>10</replaceable></term>
 	  <listitem>
-	    <para>can't update group file</para>
+	    <para>E_GRP_UPDATE: can't update group file</para>
+	  </listitem>
+	</varlistentry>
+	<varlistentry>
+	  <term><replaceable>11</replaceable></term>
+	  <listitem>
+	    <para>E_CLEANUP_SERVICE: can't setup cleanup service</para>
+	  </listitem>
+	</varlistentry>
+	<varlistentry>
+	  <term><replaceable>12</replaceable></term>
+	  <listitem>
+	    <para>E_PAM_USERNAME: can't determine your username for use with pam</para>
+	  </listitem>
+	</varlistentry>
+	<varlistentry>
+	  <term><replaceable>13</replaceable></term>
+	  <listitem>
+	    <para>E_PAM_ERROR: pam returned an error, see syslog facility id groupmod for the PAM error message</para>
 	  </listitem>
 	</varlistentry>
       </variablelist>
diff --git a/man/passwd.1.xml b/man/passwd.1.xml
index e678448c..0e8ba328 100644
--- a/man/passwd.1.xml
+++ b/man/passwd.1.xml
@@ -88,7 +88,7 @@
     <title>DESCRIPTION</title>
     <para>
       The <command>passwd</command> command changes passwords for user accounts.
-      A normal user may only change the password for his/her own account, while
+      A normal user may only change the password for their own account, while
       the superuser may change the password for any account.
       <command>passwd</command> also changes the account or associated
       password validity period.
@@ -97,7 +97,7 @@
     <refsect2 id='password_changes'>
       <title>Password Changes</title>
       <para>
-	The user is first prompted for his/her old password, if one is
+	The user is first prompted for their old password, if one is
 	present. This password is then encrypted and compared against the
 	stored password. The user has only one chance to enter the correct
 	password. The superuser is permitted to bypass this step so that
@@ -206,7 +206,7 @@
 	<listitem>
 	  <para>
 	    Immediately expire an account's password. This in effect can
-	    force a user to change his/her password at the user's next login.
+	    force a user to change their password at the user's next login.
 	  </para>
 	</listitem>
       </varlistentry>
@@ -273,7 +273,7 @@
 	  <para>
 	    Set the minimum number of days between password changes to
 	    <replaceable>MIN_DAYS</replaceable>. A value of zero for this field
-	    indicates that the user may change his/her password at any time.
+	    indicates that the user may change their password at any time.
 	  </para>
 	</listitem>
       </varlistentry>
@@ -349,7 +349,7 @@
 	    Set the number of days of warning before a password change is
 	    required. The <replaceable>WARN_DAYS</replaceable> option is
 	    the number of days prior to the password expiring that a user
-	    will be warned that his/her password is about to expire.
+	    will be warned that their password is about to expire.
 	  </para>
 	</listitem>
       </varlistentry>
@@ -363,6 +363,11 @@
 	    <replaceable>MAX_DAYS</replaceable>, the password is required
 	    to be changed.
 	  </para>
+	  <para>
+	    Passing the number <emphasis remap='I'>-1</emphasis> as
+	    <replaceable>MAX_DAYS</replaceable> will remove checking a
+	    password's validity.
+	  </para>
 	</listitem>
       </varlistentry>
     </variablelist>
diff --git a/man/po/da.po b/man/po/da.po
index 89302670..3d789fcb 100644
--- a/man/po/da.po
+++ b/man/po/da.po
@@ -4307,7 +4307,7 @@ msgstr ""
 #: passwd.1.xml:89(para)
 msgid ""
 "The <command>passwd</command> command changes passwords for user accounts. A "
-"normal user may only change the password for his/her own account, while the "
+"normal user may only change the password for their own account, while the "
 "superuser may change the password for any account. <command>passwd</command> "
 "also changes the account or associated password validity period."
 msgstr ""
@@ -4318,7 +4318,7 @@ msgstr ""
 
 #: passwd.1.xml:99(para)
 msgid ""
-"The user is first prompted for his/her old password, if one is present. This "
+"The user is first prompted for their old password, if one is present. This "
 "password is then encrypted and compared against the stored password. The "
 "user has only one chance to enter the correct password. The superuser is "
 "permitted to bypass this step so that forgotten passwords may be changed."
@@ -4435,7 +4435,7 @@ msgstr "<option>-e</option>, <option>--expire</option>"
 #: passwd.1.xml:207(para)
 msgid ""
 "Immediately expire an account's password. This in effect can force a user to "
-"change his/her password at the user's next login."
+"change their password at the user's next login."
 msgstr ""
 "Angiv øjeblikkelig en kontos adgangskode som udløbet. Dette kan tvinge en "
 "bruger til at ændre sin adgangskode ved brugerens næste logind."
@@ -4504,7 +4504,7 @@ msgstr ""
 msgid ""
 "Set the minimum number of days between password changes to "
 "<replaceable>MIN_DAYS</replaceable>. A value of zero for this field "
-"indicates that the user may change his/her password at any time."
+"indicates that the user may change their password at any time."
 msgstr ""
 
 #: passwd.1.xml:291(term)
@@ -4553,7 +4553,7 @@ msgstr ""
 msgid ""
 "Set the number of days of warning before a password change is required. The "
 "<replaceable>WARN_DAYS</replaceable> option is the number of days prior to "
-"the password expiring that a user will be warned that his/her password is "
+"the password expiring that a user will be warned that their password is "
 "about to expire."
 msgstr ""
 
@@ -6892,7 +6892,7 @@ msgstr "-l"
 
 #: groupmems.8.xml:86(para)
 msgid ""
-"The <command>groupmems</command> command allows a user to administer his/her "
+"The <command>groupmems</command> command allows a user to administer their "
 "own group membership list without the requirement of superuser privileges. "
 "The <command>groupmems</command> utility is for systems that configure its "
 "users to be in their own name sake primary group (i.e., guest / guest)."
@@ -7975,7 +7975,7 @@ msgstr "ændr udløbsinformation om brugeradgangskode"
 msgid ""
 "The <command>chage</command> command changes the number of days between "
 "password changes and the date of the last password change. This information "
-"is used by the system to determine when a user must change his/her password."
+"is used by the system to determine when a user must change their password."
 msgstr ""
 
 #: chage.1.xml:92(para)
@@ -8057,8 +8057,8 @@ msgstr ""
 msgid ""
 "Set the maximum number of days during which a password is valid. When "
 "<replaceable>MAX_DAYS</replaceable> plus <replaceable>LAST_DAY</replaceable> "
-"is less than the current day, the user will be required to change his/her "
-"password before being able to use his/her account. This occurrence can be "
+"is less than the current day, the user will be required to change their "
+"password before being able to use their account. This occurrence can be "
 "planned for in advance by use of the <option>-W</option> option, which "
 "provides the user with advance warning."
 msgstr ""
@@ -8080,7 +8080,7 @@ msgstr ""
 msgid ""
 "Set the number of days of warning before a password change is required. The "
 "<replaceable>WARN_DAYS</replaceable> option is the number of days prior to "
-"the password expiring that a user will be warned his/her password is about "
+"the password expiring that a user will be warned their password is about "
 "to expire."
 msgstr ""
 
@@ -8105,7 +8105,7 @@ msgstr ""
 msgid ""
 "The <command>chage</command> command is restricted to the root user, except "
 "for the <option>-l</option> option, which may be used by an unprivileged "
-"user to determine when his/her password or account is due to expire."
+"user to determine when their password or account is due to expire."
 msgstr ""
 "Kommandoen <command>chage</command> er begrænset til administratorbrugeren "
 "(root), undtaget for tilvalget <option>-l</option>, som kan bruges af en "
diff --git a/man/po/de.po b/man/po/de.po
index 340e15d8..3ae1efd0 100644
--- a/man/po/de.po
+++ b/man/po/de.po
@@ -5459,7 +5459,7 @@ msgstr "ändert das Passwort eines Benutzers"
 #: passwd.1.xml:89(para)
 msgid ""
 "The <command>passwd</command> command changes passwords for user accounts. A "
-"normal user may only change the password for his/her own account, while the "
+"normal user may only change the password for their own account, while the "
 "superuser may change the password for any account. <command>passwd</command> "
 "also changes the account or associated password validity period."
 msgstr ""
@@ -5475,7 +5475,7 @@ msgstr "Verändern des Passworts"
 
 #: passwd.1.xml:99(para)
 msgid ""
-"The user is first prompted for his/her old password, if one is present. This "
+"The user is first prompted for their old password, if one is present. This "
 "password is then encrypted and compared against the stored password. The "
 "user has only one chance to enter the correct password. The superuser is "
 "permitted to bypass this step so that forgotten passwords may be changed."
@@ -5625,7 +5625,7 @@ msgstr "<option>-e</option>, <option>--expire</option>"
 #: passwd.1.xml:207(para)
 msgid ""
 "Immediately expire an account's password. This in effect can force a user to "
-"change his/her password at the user's next login."
+"change their password at the user's next login."
 msgstr ""
 "Lässt das Passwort eines Kontos sofort verfallen. Im Ergebnis kann damit "
 "erreicht werden, dass ein Benutzer beim nächsten Login das Passwort ändern "
@@ -5709,7 +5709,7 @@ msgstr ""
 msgid ""
 "Set the minimum number of days between password changes to "
 "<replaceable>MIN_DAYS</replaceable>. A value of zero for this field "
-"indicates that the user may change his/her password at any time."
+"indicates that the user may change their password at any time."
 msgstr ""
 "Setzt die Anzahl von Tagen, die mindestens zwischen zwei Änderungen eines "
 "Passworts vergehen müssen, auf <replaceable>MIN_TAGE</replaceable>. Ein Wert "
@@ -5776,7 +5776,7 @@ msgstr ""
 msgid ""
 "Set the number of days of warning before a password change is required. The "
 "<replaceable>WARN_DAYS</replaceable> option is the number of days prior to "
-"the password expiring that a user will be warned that his/her password is "
+"the password expiring that a user will be warned that their password is "
 "about to expire."
 msgstr ""
 "Legt die Anzahl der Tage fest, an denen der Benutzer eine Warnung erhält, "
@@ -8773,7 +8773,7 @@ msgstr "-l"
 # SB: 1. I don't understand "sake"? A typo? But of what? 2. I think we shouldn't have the notorious guest account here as an example.
 #: groupmems.8.xml:86(para)
 msgid ""
-"The <command>groupmems</command> command allows a user to administer his/her "
+"The <command>groupmems</command> command allows a user to administer their "
 "own group membership list without the requirement of superuser privileges. "
 "The <command>groupmems</command> utility is for systems that configure its "
 "users to be in their own name sake primary group (i.e., guest / guest)."
@@ -10266,7 +10266,7 @@ msgstr "ändert die Information zum Passwortverfall"
 msgid ""
 "The <command>chage</command> command changes the number of days between "
 "password changes and the date of the last password change. This information "
-"is used by the system to determine when a user must change his/her password."
+"is used by the system to determine when a user must change their password."
 msgstr ""
 "Der Befehl <command>chage</command> verändert die Anzahl der Tage zwischen "
 "dem letzten Wechsel des Passworts und dem nächsten Wechsel. Mit dieser "
@@ -10386,8 +10386,8 @@ msgstr ""
 msgid ""
 "Set the maximum number of days during which a password is valid. When "
 "<replaceable>MAX_DAYS</replaceable> plus <replaceable>LAST_DAY</replaceable> "
-"is less than the current day, the user will be required to change his/her "
-"password before being able to use his/her account. This occurrence can be "
+"is less than the current day, the user will be required to change their "
+"password before being able to use their account. This occurrence can be "
 "planned for in advance by use of the <option>-W</option> option, which "
 "provides the user with advance warning."
 msgstr ""
@@ -10419,7 +10419,7 @@ msgstr ""
 msgid ""
 "Set the number of days of warning before a password change is required. The "
 "<replaceable>WARN_DAYS</replaceable> option is the number of days prior to "
-"the password expiring that a user will be warned his/her password is about "
+"the password expiring that a user will be warned their password is about "
 "to expire."
 msgstr ""
 "Legt die Anzahl der Tage fest, an denen der Benutzer eine Warnung erhält, "
@@ -10454,7 +10454,7 @@ msgstr ""
 msgid ""
 "The <command>chage</command> command is restricted to the root user, except "
 "for the <option>-l</option> option, which may be used by an unprivileged "
-"user to determine when his/her password or account is due to expire."
+"user to determine when their password or account is due to expire."
 msgstr ""
 "Der Befehl <command>chage</command> kann nur von Root ausgeführt werden. "
 "Alle anderen Benutzer können nur die Option <option>-l</option> verwenden, "
diff --git a/man/po/fr.po b/man/po/fr.po
index 48ef2fd1..37b55237 100644
--- a/man/po/fr.po
+++ b/man/po/fr.po
@@ -5490,7 +5490,7 @@ msgstr "Modifier le mot de passe d'un utilisateur"
 #: passwd.1.xml:89(para)
 msgid ""
 "The <command>passwd</command> command changes passwords for user accounts. A "
-"normal user may only change the password for his/her own account, while the "
+"normal user may only change the password for their own account, while the "
 "superuser may change the password for any account. <command>passwd</command> "
 "also changes the account or associated password validity period."
 msgstr ""
@@ -5506,7 +5506,7 @@ msgstr "Modifications du mot de passe"
 
 #: passwd.1.xml:99(para)
 msgid ""
-"The user is first prompted for his/her old password, if one is present. This "
+"The user is first prompted for their old password, if one is present. This "
 "password is then encrypted and compared against the stored password. The "
 "user has only one chance to enter the correct password. The superuser is "
 "permitted to bypass this step so that forgotten passwords may be changed."
@@ -5656,7 +5656,7 @@ msgstr "<option>-e</option>, <option>--expire</option>"
 #: passwd.1.xml:207(para)
 msgid ""
 "Immediately expire an account's password. This in effect can force a user to "
-"change his/her password at the user's next login."
+"change their password at the user's next login."
 msgstr ""
 "Annuler immédiatement la validité du mot de passe d'un compte. Ceci permet "
 "d'obliger un utilisateur à changer son mot de passe lors de sa prochaine "
@@ -5744,7 +5744,7 @@ msgstr ""
 msgid ""
 "Set the minimum number of days between password changes to "
 "<replaceable>MIN_DAYS</replaceable>. A value of zero for this field "
-"indicates that the user may change his/her password at any time."
+"indicates that the user may change their password at any time."
 msgstr ""
 "Définir le nombre minimum de jours entre chaque changement de mot de passe à "
 "<replaceable>MIN_DAYS</replaceable>. Une valeur de zéro pour ce champ "
@@ -5812,7 +5812,7 @@ msgstr ""
 msgid ""
 "Set the number of days of warning before a password change is required. The "
 "<replaceable>WARN_DAYS</replaceable> option is the number of days prior to "
-"the password expiring that a user will be warned that his/her password is "
+"the password expiring that a user will be warned that their password is "
 "about to expire."
 msgstr ""
 "Configurer le nombre de jours d'avertissement avant que le changement de mot "
@@ -8835,7 +8835,7 @@ msgstr "-l"
 
 #: groupmems.8.xml:86(para)
 msgid ""
-"The <command>groupmems</command> command allows a user to administer his/her "
+"The <command>groupmems</command> command allows a user to administer their "
 "own group membership list without the requirement of superuser privileges. "
 "The <command>groupmems</command> utility is for systems that configure its "
 "users to be in their own name sake primary group (i.e., guest / guest)."
@@ -10319,7 +10319,7 @@ msgstr "Modifier les informations de validité d'un mot de passe"
 msgid ""
 "The <command>chage</command> command changes the number of days between "
 "password changes and the date of the last password change. This information "
-"is used by the system to determine when a user must change his/her password."
+"is used by the system to determine when a user must change their password."
 msgstr ""
 "La commande <command>chage</command> modifie le nombre de jours entre les "
 "changements de mot de passe et la date du dernier changement. Ces "
@@ -10438,8 +10438,8 @@ msgstr ""
 msgid ""
 "Set the maximum number of days during which a password is valid. When "
 "<replaceable>MAX_DAYS</replaceable> plus <replaceable>LAST_DAY</replaceable> "
-"is less than the current day, the user will be required to change his/her "
-"password before being able to use his/her account. This occurrence can be "
+"is less than the current day, the user will be required to change their "
+"password before being able to use their account. This occurrence can be "
 "planned for in advance by use of the <option>-W</option> option, which "
 "provides the user with advance warning."
 msgstr ""
@@ -10472,7 +10472,7 @@ msgstr ""
 msgid ""
 "Set the number of days of warning before a password change is required. The "
 "<replaceable>WARN_DAYS</replaceable> option is the number of days prior to "
-"the password expiring that a user will be warned his/her password is about "
+"the password expiring that a user will be warned their password is about "
 "to expire."
 msgstr ""
 "Configurer le nombre de jours d'avertissement avant que le changement de mot "
@@ -10507,7 +10507,7 @@ msgstr ""
 msgid ""
 "The <command>chage</command> command is restricted to the root user, except "
 "for the <option>-l</option> option, which may be used by an unprivileged "
-"user to determine when his/her password or account is due to expire."
+"user to determine when their password or account is due to expire."
 msgstr ""
 "La commande <command>chage</command> est réservée à l'utilisateur root, sauf "
 "pour l'option <option>-l</option>, qui peut être utilisée par un utilisateur "
diff --git a/man/po/it.po b/man/po/it.po
index 79e8475a..b9f275a6 100644
--- a/man/po/it.po
+++ b/man/po/it.po
@@ -5714,7 +5714,7 @@ msgstr "cambia la password utente"
 #: passwd.1.xml:89(para)
 msgid ""
 "The <command>passwd</command> command changes passwords for user accounts. A "
-"normal user may only change the password for his/her own account, while the "
+"normal user may only change the password for their own account, while the "
 "superuser may change the password for any account. <command>passwd</command> "
 "also changes the account or associated password validity period."
 msgstr ""
@@ -5731,7 +5731,7 @@ msgstr "Modifiche delle password"
 # type: Plain text
 #: passwd.1.xml:99(para)
 msgid ""
-"The user is first prompted for his/her old password, if one is present. This "
+"The user is first prompted for their old password, if one is present. This "
 "password is then encrypted and compared against the stored password. The "
 "user has only one chance to enter the correct password. The superuser is "
 "permitted to bypass this step so that forgotten passwords may be changed."
@@ -5892,7 +5892,7 @@ msgstr "<option>-e</option>, <option>--expire</option>"
 #: passwd.1.xml:207(para)
 msgid ""
 "Immediately expire an account's password. This in effect can force a user to "
-"change his/her password at the user's next login."
+"change their password at the user's next login."
 msgstr ""
 "Fa scadere subito la password dell'utente. Il che ha l'effetto di forzare un "
 "cambio password al successivo accesso da parte dell'utente."
@@ -5978,7 +5978,7 @@ msgstr ""
 msgid ""
 "Set the minimum number of days between password changes to "
 "<replaceable>MIN_DAYS</replaceable>. A value of zero for this field "
-"indicates that the user may change his/her password at any time."
+"indicates that the user may change their password at any time."
 msgstr ""
 "Imposta il numero minimo di giorni tra i cambi di password a "
 "<replaceable>MIN_GIORNI</replaceable>. Un valore pari a zero indica che "
@@ -6050,7 +6050,7 @@ msgstr ""
 msgid ""
 "Set the number of days of warning before a password change is required. The "
 "<replaceable>WARN_DAYS</replaceable> option is the number of days prior to "
-"the password expiring that a user will be warned that his/her password is "
+"the password expiring that a user will be warned that their password is "
 "about to expire."
 msgstr ""
 "Imposta il numero di giorni di preavviso prima che sia obbligatorio cambiare "
@@ -9144,7 +9144,7 @@ msgstr "-l"
 
 #: groupmems.8.xml:86(para)
 msgid ""
-"The <command>groupmems</command> command allows a user to administer his/her "
+"The <command>groupmems</command> command allows a user to administer their "
 "own group membership list without the requirement of superuser privileges. "
 "The <command>groupmems</command> utility is for systems that configure its "
 "users to be in their own name sake primary group (i.e., guest / guest)."
@@ -10707,7 +10707,7 @@ msgstr "cambia le informazioni sulla scadenza della password"
 msgid ""
 "The <command>chage</command> command changes the number of days between "
 "password changes and the date of the last password change. This information "
-"is used by the system to determine when a user must change his/her password."
+"is used by the system to determine when a user must change their password."
 msgstr ""
 "<command>chage</command> modifica il numero minimo di giorni tra i cambi di "
 "password e la data dell'ultimo cambio. Queste informazioni sono usate dal "
@@ -10832,8 +10832,8 @@ msgstr ""
 msgid ""
 "Set the maximum number of days during which a password is valid. When "
 "<replaceable>MAX_DAYS</replaceable> plus <replaceable>LAST_DAY</replaceable> "
-"is less than the current day, the user will be required to change his/her "
-"password before being able to use his/her account. This occurrence can be "
+"is less than the current day, the user will be required to change their "
+"password before being able to use their account. This occurrence can be "
 "planned for in advance by use of the <option>-W</option> option, which "
 "provides the user with advance warning."
 msgstr ""
@@ -10868,7 +10868,7 @@ msgstr ""
 msgid ""
 "Set the number of days of warning before a password change is required. The "
 "<replaceable>WARN_DAYS</replaceable> option is the number of days prior to "
-"the password expiring that a user will be warned his/her password is about "
+"the password expiring that a user will be warned their password is about "
 "to expire."
 msgstr ""
 "Imposta il numero di giorni di preavviso prima che sia obbligatorio cambiare "
@@ -10905,7 +10905,7 @@ msgstr ""
 msgid ""
 "The <command>chage</command> command is restricted to the root user, except "
 "for the <option>-l</option> option, which may be used by an unprivileged "
-"user to determine when his/her password or account is due to expire."
+"user to determine when their password or account is due to expire."
 msgstr ""
 "L'uso del comando <command>chage</command> è permesso solo all'utente root, "
 "tranne per l'opzione <option>-l</option>, che può essere usata da un utente "
diff --git a/man/po/pl.po b/man/po/pl.po
index c003c728..8a125fbf 100644
--- a/man/po/pl.po
+++ b/man/po/pl.po
@@ -4659,7 +4659,7 @@ msgstr "zmiana hasła użytkownika"
 #: passwd.1.xml:89(para)
 msgid ""
 "The <command>passwd</command> command changes passwords for user accounts. A "
-"normal user may only change the password for his/her own account, while the "
+"normal user may only change the password for their own account, while the "
 "superuser may change the password for any account. <command>passwd</command> "
 "also changes the account or associated password validity period."
 msgstr ""
@@ -4670,7 +4670,7 @@ msgstr ""
 
 #: passwd.1.xml:99(para)
 msgid ""
-"The user is first prompted for his/her old password, if one is present. This "
+"The user is first prompted for their old password, if one is present. This "
 "password is then encrypted and compared against the stored password. The "
 "user has only one chance to enter the correct password. The superuser is "
 "permitted to bypass this step so that forgotten passwords may be changed."
@@ -4776,7 +4776,7 @@ msgstr "<option>-e</option>, <option>--expire</option>"
 #: passwd.1.xml:207(para)
 msgid ""
 "Immediately expire an account's password. This in effect can force a user to "
-"change his/her password at the user's next login."
+"change their password at the user's next login."
 msgstr ""
 
 #: passwd.1.xml:220(term)
@@ -4845,7 +4845,7 @@ msgstr ""
 msgid ""
 "Set the minimum number of days between password changes to "
 "<replaceable>MIN_DAYS</replaceable>. A value of zero for this field "
-"indicates that the user may change his/her password at any time."
+"indicates that the user may change their password at any time."
 msgstr ""
 "Utawia minimalną liczbę dni pomiędzy zmianami hasła na "
 "<replaceable>MIN_DAYS</replaceable>. Wartość zerowa oznacza, że użytkownik "
@@ -4901,7 +4901,7 @@ msgstr ""
 msgid ""
 "Set the number of days of warning before a password change is required. The "
 "<replaceable>WARN_DAYS</replaceable> option is the number of days prior to "
-"the password expiring that a user will be warned that his/her password is "
+"the password expiring that a user will be warned that their password is "
 "about to expire."
 msgstr ""
 
@@ -7455,7 +7455,7 @@ msgstr "-l"
 
 #: groupmems.8.xml:86(para)
 msgid ""
-"The <command>groupmems</command> command allows a user to administer his/her "
+"The <command>groupmems</command> command allows a user to administer their "
 "own group membership list without the requirement of superuser privileges. "
 "The <command>groupmems</command> utility is for systems that configure its "
 "users to be in their own name sake primary group (i.e., guest / guest)."
@@ -8833,7 +8833,7 @@ msgstr "zmiana informacji o terminie ważności hasła użytkownika"
 msgid ""
 "The <command>chage</command> command changes the number of days between "
 "password changes and the date of the last password change. This information "
-"is used by the system to determine when a user must change his/her password."
+"is used by the system to determine when a user must change their password."
 msgstr ""
 "Polecenie <command>chage</command> zmienia liczbę dni pomiędzy zmianami "
 "hasła i datę ostatniej zmiany hasła. Informację tę system wykorzystuje do "
@@ -8947,8 +8947,8 @@ msgstr ""
 msgid ""
 "Set the maximum number of days during which a password is valid. When "
 "<replaceable>MAX_DAYS</replaceable> plus <replaceable>LAST_DAY</replaceable> "
-"is less than the current day, the user will be required to change his/her "
-"password before being able to use his/her account. This occurrence can be "
+"is less than the current day, the user will be required to change their "
+"password before being able to use their account. This occurrence can be "
 "planned for in advance by use of the <option>-W</option> option, which "
 "provides the user with advance warning."
 msgstr ""
@@ -8980,7 +8980,7 @@ msgstr ""
 msgid ""
 "Set the number of days of warning before a password change is required. The "
 "<replaceable>WARN_DAYS</replaceable> option is the number of days prior to "
-"the password expiring that a user will be warned his/her password is about "
+"the password expiring that a user will be warned their password is about "
 "to expire."
 msgstr ""
 "Ustawia na <replaceable>DNI_OSTRZ</replaceable> liczbę dni przed upływem "
@@ -9013,7 +9013,7 @@ msgstr ""
 msgid ""
 "The <command>chage</command> command is restricted to the root user, except "
 "for the <option>-l</option> option, which may be used by an unprivileged "
-"user to determine when his/her password or account is due to expire."
+"user to determine when their password or account is due to expire."
 msgstr ""
 "Polecenia chage może użyć tylko użytkownik root, za wyjątkiem opcji <option>-"
 "l</option>. Może się nią posłużyć się użytkownik nieuprzywilejowany  do "
diff --git a/man/po/ru.po b/man/po/ru.po
index ef552bec..f3978255 100644
--- a/man/po/ru.po
+++ b/man/po/ru.po
@@ -5700,7 +5700,7 @@ msgstr "изменяет пароль пользователя"
 #: passwd.1.xml:89(para)
 msgid ""
 "The <command>passwd</command> command changes passwords for user accounts. A "
-"normal user may only change the password for his/her own account, while the "
+"normal user may only change the password for their own account, while the "
 "superuser may change the password for any account. <command>passwd</command> "
 "also changes the account or associated password validity period."
 msgstr ""
@@ -5718,7 +5718,7 @@ msgstr "Изменение пароля"
 # type: Content of: <refentry><refsect1><refsect2><para>
 #: passwd.1.xml:99(para)
 msgid ""
-"The user is first prompted for his/her old password, if one is present. This "
+"The user is first prompted for their old password, if one is present. This "
 "password is then encrypted and compared against the stored password. The "
 "user has only one chance to enter the correct password. The superuser is "
 "permitted to bypass this step so that forgotten passwords may be changed."
@@ -5876,7 +5876,7 @@ msgstr "<option>-e</option>, <option>--expire</option>"
 #: passwd.1.xml:207(para)
 msgid ""
 "Immediately expire an account's password. This in effect can force a user to "
-"change his/her password at the user's next login."
+"change their password at the user's next login."
 msgstr ""
 "Немедленно сделать пароль устаревшим. В результате это заставит пользователя "
 "изменить пароль при следующем входе в систему."
@@ -5962,7 +5962,7 @@ msgstr ""
 msgid ""
 "Set the minimum number of days between password changes to "
 "<replaceable>MIN_DAYS</replaceable>. A value of zero for this field "
-"indicates that the user may change his/her password at any time."
+"indicates that the user may change their password at any time."
 msgstr ""
 "Задать <replaceable>минимальное количество дней</replaceable> между сменами "
 "пароля. Нулевое значение этого поля указывает на то, что пользователь может "
@@ -6030,7 +6030,7 @@ msgstr ""
 msgid ""
 "Set the number of days of warning before a password change is required. The "
 "<replaceable>WARN_DAYS</replaceable> option is the number of days prior to "
-"the password expiring that a user will be warned that his/her password is "
+"the password expiring that a user will be warned that their password is "
 "about to expire."
 msgstr ""
 "Установить число дней выдачи предупреждения, перед тем как потребуется смена "
@@ -9182,7 +9182,7 @@ msgstr "-l"
 
 #: groupmems.8.xml:86(para)
 msgid ""
-"The <command>groupmems</command> command allows a user to administer his/her "
+"The <command>groupmems</command> command allows a user to administer their "
 "own group membership list without the requirement of superuser privileges. "
 "The <command>groupmems</command> utility is for systems that configure its "
 "users to be in their own name sake primary group (i.e., guest / guest)."
@@ -10700,7 +10700,7 @@ msgstr "изменяет информацию об устаревании пар
 msgid ""
 "The <command>chage</command> command changes the number of days between "
 "password changes and the date of the last password change. This information "
-"is used by the system to determine when a user must change his/her password."
+"is used by the system to determine when a user must change their password."
 msgstr ""
 "Программа <command>chage</command> изменяет количество дней между датой "
 "смены пароля и датой последней смены пароля. Эта информация используется "
@@ -10820,8 +10820,8 @@ msgstr ""
 msgid ""
 "Set the maximum number of days during which a password is valid. When "
 "<replaceable>MAX_DAYS</replaceable> plus <replaceable>LAST_DAY</replaceable> "
-"is less than the current day, the user will be required to change his/her "
-"password before being able to use his/her account. This occurrence can be "
+"is less than the current day, the user will be required to change their "
+"password before being able to use their account. This occurrence can be "
 "planned for in advance by use of the <option>-W</option> option, which "
 "provides the user with advance warning."
 msgstr ""
@@ -10854,7 +10854,7 @@ msgstr ""
 msgid ""
 "Set the number of days of warning before a password change is required. The "
 "<replaceable>WARN_DAYS</replaceable> option is the number of days prior to "
-"the password expiring that a user will be warned his/her password is about "
+"the password expiring that a user will be warned their password is about "
 "to expire."
 msgstr ""
 "Установить количество дней выдачи предупреждения, перед тем как потребуется "
@@ -10890,7 +10890,7 @@ msgstr ""
 msgid ""
 "The <command>chage</command> command is restricted to the root user, except "
 "for the <option>-l</option> option, which may be used by an unprivileged "
-"user to determine when his/her password or account is due to expire."
+"user to determine when their password or account is due to expire."
 msgstr ""
 "Программа <command>chage</command> работает только от суперпользователя, за "
 "исключением вызова с параметром <option>-l</option>, который может "
diff --git a/man/po/shadow-man-pages.pot b/man/po/shadow-man-pages.pot
index 05cef7f2..507057fe 100644
--- a/man/po/shadow-man-pages.pot
+++ b/man/po/shadow-man-pages.pot
@@ -2492,7 +2492,7 @@ msgid "change user password"
 msgstr ""
 
 #: passwd.1.xml:89(para)
-msgid "The <command>passwd</command> command changes passwords for user accounts. A normal user may only change the password for his/her own account, while the superuser may change the password for any account. <command>passwd</command> also changes the account or associated password validity period."
+msgid "The <command>passwd</command> command changes passwords for user accounts. A normal user may only change the password for their own account, while the superuser may change the password for any account. <command>passwd</command> also changes the account or associated password validity period."
 msgstr ""
 
 #: passwd.1.xml:98(title)
@@ -2500,7 +2500,7 @@ msgid "Password Changes"
 msgstr ""
 
 #: passwd.1.xml:99(para)
-msgid "The user is first prompted for his/her old password, if one is present. This password is then encrypted and compared against the stored password. The user has only one chance to enter the correct password. The superuser is permitted to bypass this step so that forgotten passwords may be changed."
+msgid "The user is first prompted for their old password, if one is present. This password is then encrypted and compared against the stored password. The user has only one chance to enter the correct password. The superuser is permitted to bypass this step so that forgotten passwords may be changed."
 msgstr ""
 
 #: passwd.1.xml:107(para)
@@ -2572,7 +2572,7 @@ msgid "<option>-e</option>, <option>--expire</option>"
 msgstr ""
 
 #: passwd.1.xml:207(para)
-msgid "Immediately expire an account's password. This in effect can force a user to change his/her password at the user's next login."
+msgid "Immediately expire an account's password. This in effect can force a user to change their password at the user's next login."
 msgstr ""
 
 #: passwd.1.xml:220(term)
@@ -2612,7 +2612,7 @@ msgid "<option>-n</option>, <option>--mindays</option>&nbsp;<replaceable>MIN_DAY
 msgstr ""
 
 #: passwd.1.xml:273(para) chage.1.xml:168(para)
-msgid "Set the minimum number of days between password changes to <replaceable>MIN_DAYS</replaceable>. A value of zero for this field indicates that the user may change his/her password at any time."
+msgid "Set the minimum number of days between password changes to <replaceable>MIN_DAYS</replaceable>. A value of zero for this field indicates that the user may change their password at any time."
 msgstr ""
 
 #: passwd.1.xml:291(term)
@@ -2644,7 +2644,7 @@ msgid "<option>-w</option>, <option>--warndays</option>&nbsp;<replaceable>WARN_D
 msgstr ""
 
 #: passwd.1.xml:348(para)
-msgid "Set the number of days of warning before a password change is required. The <replaceable>WARN_DAYS</replaceable> option is the number of days prior to the password expiring that a user will be warned that his/her password is about to expire."
+msgid "Set the number of days of warning before a password change is required. The <replaceable>WARN_DAYS</replaceable> option is the number of days prior to the password expiring that a user will be warned that their password is about to expire."
 msgstr ""
 
 #: passwd.1.xml:357(term)
@@ -4169,7 +4169,7 @@ msgid "-l"
 msgstr ""
 
 #: groupmems.8.xml:86(para)
-msgid "The <command>groupmems</command> command allows a user to administer his/her own group membership list without the requirement of superuser privileges. The <command>groupmems</command> utility is for systems that configure its users to be in their own name sake primary group (i.e., guest / guest)."
+msgid "The <command>groupmems</command> command allows a user to administer their own group membership list without the requirement of superuser privileges. The <command>groupmems</command> utility is for systems that configure its users to be in their own name sake primary group (i.e., guest / guest)."
 msgstr ""
 
 #: groupmems.8.xml:94(para)
@@ -4863,7 +4863,7 @@ msgid "change user password expiry information"
 msgstr ""
 
 #: chage.1.xml:82(para)
-msgid "The <command>chage</command> command changes the number of days between password changes and the date of the last password change. This information is used by the system to determine when a user must change his/her password."
+msgid "The <command>chage</command> command changes the number of days between password changes and the date of the last password change. This information is used by the system to determine when a user must change their password."
 msgstr ""
 
 #: chage.1.xml:92(para)
@@ -4915,7 +4915,7 @@ msgid "<option>-M</option>, <option>--maxdays</option>&nbsp;<replaceable>MAX_DAY
 msgstr ""
 
 #: chage.1.xml:180(para)
-msgid "Set the maximum number of days during which a password is valid. When <replaceable>MAX_DAYS</replaceable> plus <replaceable>LAST_DAY</replaceable> is less than the current day, the user will be required to change his/her password before being able to use his/her account. This occurrence can be planned for in advance by use of the <option>-W</option> option, which provides the user with advance warning."
+msgid "Set the maximum number of days during which a password is valid. When <replaceable>MAX_DAYS</replaceable> plus <replaceable>LAST_DAY</replaceable> is less than the current day, the user will be required to change their password before being able to use their account. This occurrence can be planned for in advance by use of the <option>-W</option> option, which provides the user with advance warning."
 msgstr ""
 
 #: chage.1.xml:189(para)
@@ -4927,7 +4927,7 @@ msgid "<option>-W</option>, <option>--warndays</option>&nbsp;<replaceable>WARN_D
 msgstr ""
 
 #: chage.1.xml:213(para)
-msgid "Set the number of days of warning before a password change is required. The <replaceable>WARN_DAYS</replaceable> option is the number of days prior to the password expiring that a user will be warned his/her password is about to expire."
+msgid "Set the number of days of warning before a password change is required. The <replaceable>WARN_DAYS</replaceable> option is the number of days prior to the password expiring that a user will be warned their password is about to expire."
 msgstr ""
 
 #: chage.1.xml:222(para)
@@ -4939,7 +4939,7 @@ msgid "The <command>chage</command> program requires a shadow password file to b
 msgstr ""
 
 #: chage.1.xml:236(para)
-msgid "The <command>chage</command> command is restricted to the root user, except for the <option>-l</option> option, which may be used by an unprivileged user to determine when his/her password or account is due to expire."
+msgid "The <command>chage</command> command is restricted to the root user, except for the <option>-l</option> option, which may be used by an unprivileged user to determine when their password or account is due to expire."
 msgstr ""
 
 #: chage.1.xml:301(replaceable)
diff --git a/man/po/sv.po b/man/po/sv.po
index b09740df..4059527d 100644
--- a/man/po/sv.po
+++ b/man/po/sv.po
@@ -4806,7 +4806,7 @@ msgstr "ändra användarlösenord"
 #, fuzzy
 msgid ""
 "The <command>passwd</command> command changes passwords for user accounts. A "
-"normal user may only change the password for his/her own account, while the "
+"normal user may only change the password for their own account, while the "
 "superuser may change the password for any account. <command>passwd</command> "
 "also changes the account or associated password validity period."
 msgstr ""
@@ -4824,7 +4824,7 @@ msgstr "Lösenordsändringar"
 #: passwd.1.xml:99(para)
 #, fuzzy
 msgid ""
-"The user is first prompted for his/her old password, if one is present. This "
+"The user is first prompted for their old password, if one is present. This "
 "password is then encrypted and compared against the stored password. The "
 "user has only one chance to enter the correct password. The superuser is "
 "permitted to bypass this step so that forgotten passwords may be changed."
@@ -4969,7 +4969,7 @@ msgstr "<option>-e</option>, <option>--expire</option>"
 #: passwd.1.xml:207(para)
 msgid ""
 "Immediately expire an account's password. This in effect can force a user to "
-"change his/her password at the user's next login."
+"change their password at the user's next login."
 msgstr ""
 "Lösenordet för ett konto sätts omedelbart som utgånget. Detta kan tvinga en "
 "användare att ändra sitt lösenord vid nästa inloggningsförsök."
@@ -5051,7 +5051,7 @@ msgstr ""
 msgid ""
 "Set the minimum number of days between password changes to "
 "<replaceable>MIN_DAYS</replaceable>. A value of zero for this field "
-"indicates that the user may change his/her password at any time."
+"indicates that the user may change their password at any time."
 msgstr ""
 "Sätter minimalt antal dagar mellan lösenordsändringar till "
 "<replaceable>MIN_DAGAR</replaceable>. Ett nollvärde för detta fält betyder "
@@ -5128,7 +5128,7 @@ msgstr ""
 msgid ""
 "Set the number of days of warning before a password change is required. The "
 "<replaceable>WARN_DAYS</replaceable> option is the number of days prior to "
-"the password expiring that a user will be warned that his/her password is "
+"the password expiring that a user will be warned that their password is "
 "about to expire."
 msgstr ""
 "Sätter antalet dagar för varning före ett lösenord behöver ändras. Flaggan "
@@ -7671,7 +7671,7 @@ msgstr "-l"
 
 #: groupmems.8.xml:86(para)
 msgid ""
-"The <command>groupmems</command> command allows a user to administer his/her "
+"The <command>groupmems</command> command allows a user to administer their "
 "own group membership list without the requirement of superuser privileges. "
 "The <command>groupmems</command> utility is for systems that configure its "
 "users to be in their own name sake primary group (i.e., guest / guest)."
@@ -9064,7 +9064,7 @@ msgstr "ändra åldringsinformation för användarlösenord"
 msgid ""
 "The <command>chage</command> command changes the number of days between "
 "password changes and the date of the last password change. This information "
-"is used by the system to determine when a user must change his/her password."
+"is used by the system to determine when a user must change their password."
 msgstr ""
 
 #: chage.1.xml:92(para)
@@ -9156,8 +9156,8 @@ msgstr ""
 msgid ""
 "Set the maximum number of days during which a password is valid. When "
 "<replaceable>MAX_DAYS</replaceable> plus <replaceable>LAST_DAY</replaceable> "
-"is less than the current day, the user will be required to change his/her "
-"password before being able to use his/her account. This occurrence can be "
+"is less than the current day, the user will be required to change their "
+"password before being able to use their account. This occurrence can be "
 "planned for in advance by use of the <option>-W</option> option, which "
 "provides the user with advance warning."
 msgstr ""
@@ -9181,7 +9181,7 @@ msgstr ""
 msgid ""
 "Set the number of days of warning before a password change is required. The "
 "<replaceable>WARN_DAYS</replaceable> option is the number of days prior to "
-"the password expiring that a user will be warned his/her password is about "
+"the password expiring that a user will be warned their password is about "
 "to expire."
 msgstr ""
 
@@ -9206,7 +9206,7 @@ msgstr ""
 msgid ""
 "The <command>chage</command> command is restricted to the root user, except "
 "for the <option>-l</option> option, which may be used by an unprivileged "
-"user to determine when his/her password or account is due to expire."
+"user to determine when their password or account is due to expire."
 msgstr ""
 
 #: chage.1.xml:301(replaceable)
diff --git a/man/po/zh_CN.po b/man/po/zh_CN.po
index fd4c4ca3..71288870 100644
--- a/man/po/zh_CN.po
+++ b/man/po/zh_CN.po
@@ -5037,7 +5037,7 @@ msgstr "更改用户密码"
 #: passwd.1.xml:89(para)
 msgid ""
 "The <command>passwd</command> command changes passwords for user accounts. A "
-"normal user may only change the password for his/her own account, while the "
+"normal user may only change the password for their own account, while the "
 "superuser may change the password for any account. <command>passwd</command> "
 "also changes the account or associated password validity period."
 msgstr ""
@@ -5051,7 +5051,7 @@ msgstr "密码更改"
 
 #: passwd.1.xml:99(para)
 msgid ""
-"The user is first prompted for his/her old password, if one is present. This "
+"The user is first prompted for their old password, if one is present. This "
 "password is then encrypted and compared against the stored password. The "
 "user has only one chance to enter the correct password. The superuser is "
 "permitted to bypass this step so that forgotten passwords may be changed."
@@ -5181,7 +5181,7 @@ msgstr "<option>-e</option>, <option>--expire</option>"
 #: passwd.1.xml:207(para)
 msgid ""
 "Immediately expire an account's password. This in effect can force a user to "
-"change his/her password at the user's next login."
+"change their password at the user's next login."
 msgstr "让一个账户的密码立即过期。这可以强制一个用户下次登录时更改密码。"
 
 #: passwd.1.xml:220(term)
@@ -5255,7 +5255,7 @@ msgstr ""
 msgid ""
 "Set the minimum number of days between password changes to "
 "<replaceable>MIN_DAYS</replaceable>. A value of zero for this field "
-"indicates that the user may change his/her password at any time."
+"indicates that the user may change their password at any time."
 msgstr ""
 "在密码更改之间的最小天数设置为 <replaceable>MIN_DAYS</replaceable>。此字段中"
 "的 0 值表示用户可以在任何时间更改其密码。"
@@ -5316,7 +5316,7 @@ msgstr ""
 msgid ""
 "Set the number of days of warning before a password change is required. The "
 "<replaceable>WARN_DAYS</replaceable> option is the number of days prior to "
-"the password expiring that a user will be warned that his/her password is "
+"the password expiring that a user will be warned that their password is "
 "about to expire."
 msgstr ""
 "设置在要求更改密码之前警告的天数。<replaceable>WARN_DAYS</replaceable> 选项是"
@@ -7867,7 +7867,7 @@ msgstr "-l"
 
 #: groupmems.8.xml:86(para)
 msgid ""
-"The <command>groupmems</command> command allows a user to administer his/her "
+"The <command>groupmems</command> command allows a user to administer their "
 "own group membership list without the requirement of superuser privileges. "
 "The <command>groupmems</command> utility is for systems that configure its "
 "users to be in their own name sake primary group (i.e., guest / guest)."
@@ -9112,7 +9112,7 @@ msgstr "更改用户密码过期信息"
 msgid ""
 "The <command>chage</command> command changes the number of days between "
 "password changes and the date of the last password change. This information "
-"is used by the system to determine when a user must change his/her password."
+"is used by the system to determine when a user must change their password."
 msgstr ""
 
 #: chage.1.xml:92(para)
@@ -9209,8 +9209,8 @@ msgstr ""
 msgid ""
 "Set the maximum number of days during which a password is valid. When "
 "<replaceable>MAX_DAYS</replaceable> plus <replaceable>LAST_DAY</replaceable> "
-"is less than the current day, the user will be required to change his/her "
-"password before being able to use his/her account. This occurrence can be "
+"is less than the current day, the user will be required to change their "
+"password before being able to use their account. This occurrence can be "
 "planned for in advance by use of the <option>-W</option> option, which "
 "provides the user with advance warning."
 msgstr ""
@@ -9240,7 +9240,7 @@ msgstr ""
 msgid ""
 "Set the number of days of warning before a password change is required. The "
 "<replaceable>WARN_DAYS</replaceable> option is the number of days prior to "
-"the password expiring that a user will be warned his/her password is about "
+"the password expiring that a user will be warned their password is about "
 "to expire."
 msgstr ""
 "设置在要求更改密码之前几天开始警告。<replaceable>WARN_DAYS</replaceable> 选项"
@@ -9267,7 +9267,7 @@ msgstr "<command>chage</command> 需要有一个影子密码文件才可用。"
 msgid ""
 "The <command>chage</command> command is restricted to the root user, except "
 "for the <option>-l</option> option, which may be used by an unprivileged "
-"user to determine when his/her password or account is due to expire."
+"user to determine when their password or account is due to expire."
 msgstr ""
 "只有 root 才可以使用 <command>chage</command>，一个特殊情况是 <option>-l</"
 "option> 选项，用来让非特权用户觉得自己的密码或账户何时过期。"
diff --git a/man/su.1.xml b/man/su.1.xml
index 24143c38..4b413fc8 100644
--- a/man/su.1.xml
+++ b/man/su.1.xml
@@ -85,12 +85,16 @@
     <cmdsynopsis>
       <command>su</command>
       <arg choice='opt'>
-	<replaceable>options</replaceable>
+          <replaceable>options</replaceable>
       </arg>
       <arg choice='opt'>
-	<arg choice='plain'>
-	  <replaceable>username</replaceable>
-	</arg>
+          <replaceable>-</replaceable>
+      </arg>
+      <arg choice='opt'>
+          <replaceable>username</replaceable>
+          <arg choice='opt'>
+              <replaceable>args</replaceable>
+          </arg>
       </arg>
     </cmdsynopsis>
   </refsynopsisdiv>
@@ -98,26 +102,21 @@
   <refsect1 id='description'>
     <title>DESCRIPTION</title>
     <para>
-      The <command>su</command> command is used to become another user during
-      a login session. Invoked without a <option>username</option>, 
-      <command>su</command> defaults to
-      becoming the superuser. The optional argument <option>-</option> may
-      be used to provide an environment similar to what the user would
-      expect had the user logged in directly.
-    </para>
-
-    <para>
-      Additional arguments may be provided after the username, in which case
-      they are supplied to the user's login shell. In particular, an
-      argument of <option>-c</option> will cause the next argument to be
-      treated as a command by most command interpreters. The command will be
-      executed by the shell specified in <filename>/etc/passwd</filename>
-      for the target user.
+      The <command>su</command> command is used to become another user during a
+      login session. Invoked without a <option>username</option>,
+      <command>su</command> defaults to becoming the superuser. The
+      <option>-</option> option may be used to provide an environment similar
+      to what the user would expect had the user logged in directly. The
+      <option>-c</option> option may be used to treat the next argument as a
+      command by most shells.
     </para>
 
     <para>
-      You can use the <option>--</option> argument to separate
-      <command>su</command> options from the arguments supplied to the shell.
+      Options are recognized everywhere in the argument list. You can use the
+      <option>--</option> argument to stop option parsing. The
+      <option>-</option> option is special: it is also recognized after
+      <option>--</option>, but has to be placed before
+      <option>username</option>.
     </para>
 
     <para>The user will be prompted for a password, if appropriate. Invalid
diff --git a/man/useradd.8.xml b/man/useradd.8.xml
index 8d56301c..582b39c7 100644
--- a/man/useradd.8.xml
+++ b/man/useradd.8.xml
@@ -455,6 +455,23 @@
       </varlistentry>
       <varlistentry>
 	<term>
+	  <option>-P</option>, <option>--prefix</option>&nbsp;<replaceable>PREFIX_DIR</replaceable>
+	</term>
+	<listitem>
+	  <para>
+	    Apply changes in the <replaceable>PREFIX_DIR</replaceable>
+	    directory and use the configuration files from the
+	    <replaceable>PREFIX_DIR</replaceable> directory.
+		This option does not chroot and is intended for preparing 
+		a cross-compilation target.
+		Some limitations: NIS and LDAP users/groups are not verified.
+		PAM authentication is using the host files.
+		No SELINUX support.
+	  </para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+	<term>
 	  <option>-s</option>, <option>--shell</option>&nbsp;<replaceable>SHELL</replaceable>
 	</term>
 	<listitem>
diff --git a/man/userdel.8.xml b/man/userdel.8.xml
index 3f95a8d9..b086383b 100644
--- a/man/userdel.8.xml
+++ b/man/userdel.8.xml
@@ -156,6 +156,23 @@
       </varlistentry>
       <varlistentry>
 	<term>
+	  <option>-P</option>, <option>--prefix</option>&nbsp;<replaceable>PREFIX_DIR</replaceable>
+	</term>
+	<listitem>
+	  <para>
+	    Apply changes in the <replaceable>PREFIX_DIR</replaceable>
+	    directory and use the configuration files from the
+	    <replaceable>PREFIX_DIR</replaceable> directory.
+		This option does not chroot and is intended for preparing 
+		a cross-compilation target.
+		Some limitations: NIS and LDAP users/groups are not verified.
+		PAM authentication is using the host files.
+		No SELINUX support.
+	  </para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+	<term>
 	  <option>-Z</option>, <option>--selinux-user</option>
 	</term>
 	<listitem>
diff --git a/man/usermod.8.xml b/man/usermod.8.xml
index 6cd469c6..7fea2981 100644
--- a/man/usermod.8.xml
+++ b/man/usermod.8.xml
@@ -321,6 +321,23 @@
       </varlistentry>
       <varlistentry>
 	<term>
+	  <option>-P</option>, <option>--prefix</option>&nbsp;<replaceable>PREFIX_DIR</replaceable>
+	</term>
+	<listitem>
+	  <para>
+	    Apply changes in the <replaceable>PREFIX_DIR</replaceable>
+	    directory and use the configuration files from the
+	    <replaceable>PREFIX_DIR</replaceable> directory.
+		This option does not chroot and is intended for preparing 
+		a cross-compilation target.
+		Some limitations: NIS and LDAP users/groups are not verified.
+		PAM authentication is using the host files.
+		No SELINUX support.
+	  </para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+	<term>
 	  <option>-s</option>, <option>--shell</option>&nbsp;<replaceable>SHELL</replaceable>
 	</term>
 	<listitem>