diff --git a/ChangeLog b/ChangeLog
index 30096a53..49c9360d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-05-21  Nicolas François  <nicolas.francois@centraliens.net>
+
+	* man/usermod.8.xml, man/userdel.8.xml, man/useradd.8.xml:
+	Harmonize formatting of login.defs and default/useradd variables.
+	Use an <option> tag.
+	* man/usermod.8.xml: Added reference to gshadow(5).
+	* man/login.defs.d/USERDEL_CMD.xml: Shorten the lines of the
+	USERDEL_CMD example.
+
 2009-05-21  Nicolas François  <nicolas.francois@centraliens.net>
 
 	* src/su.c: Use a boolean instead of 0.
diff --git a/man/groupadd.8.xml b/man/groupadd.8.xml
index d84ce967..59da57a2 100644
--- a/man/groupadd.8.xml
+++ b/man/groupadd.8.xml
@@ -122,7 +122,7 @@
 	  </para>
 	  <para>
 	     Example: <option>-K </option><replaceable>GID_MIN</replaceable>=<replaceable>100</replaceable>
-	    <option> -K </option><replaceable>GID_MAX</replaceable>=<replaceable>499</replaceable>
+	    <option>-K </option><replaceable>GID_MAX</replaceable>=<replaceable>499</replaceable>
 	  </para>
 	  <para>
 	    Note: <option>-K </option>
diff --git a/man/login.defs.d/USERDEL_CMD.xml b/man/login.defs.d/USERDEL_CMD.xml
index 6529b51f..40800b25 100644
--- a/man/login.defs.d/USERDEL_CMD.xml
+++ b/man/login.defs.d/USERDEL_CMD.xml
@@ -58,7 +58,8 @@ crontab -r -u $1
 # Remove at jobs.
 # Note that it will remove any jobs owned by the same UID,
 # even if it was shared by a different username.
-find /var/spool/cron/atjobs -name "[^.]*" -type f -user $1 -exec rm {} \;
+AT_SPOOL_DIR=/var/spool/cron/atjobs
+find $AT_SPOOL_DIR -name "[^.]*" -type f -user $1 -delete \;
 
 # Remove print jobs.
 lprm $1
diff --git a/man/useradd.8.xml b/man/useradd.8.xml
index e0196b39..63251a4e 100644
--- a/man/useradd.8.xml
+++ b/man/useradd.8.xml
@@ -194,7 +194,7 @@
 	  <para>
 	    If not specified, <command>useradd</command> will use the
 	    default inactivity period specified by the
-	    <option>INACTIVE</option> variable in the
+	    <option>INACTIVE</option> variable in
 	    <filename>/etc/default/useradd</filename>, or -1 by default.
 	  </para>
 	</listitem>
@@ -279,8 +279,10 @@
 	</term>
 	<listitem>
 	  <para>
-	    Overrides <filename>/etc/login.defs</filename> defaults (UID_MIN, UID_MAX, UMASK,
-	    PASS_MAX_DAYS and others).
+	    Overrides <filename>/etc/login.defs</filename> defaults
+	    (<option>UID_MIN</option>, <option>UID_MAX</option>,
+	    <option>UMASK</option>, <option>PASS_MAX_DAYS</option>
+	    and others).
 	  <para>
 	  </para>
 	    Example: <option>-K </option><replaceable>PASS_MAX_DAYS</replaceable>=<replaceable>-1</replaceable>
@@ -349,7 +351,7 @@
 	  <para>
 	    Do not create a group with the same name as the user, but
 	    add the user to the group specified by the <option>-g</option>
-	    option or by the GROUP variable in
+	    option or by the <option>GROUP</option> variable in
 	    <filename>/etc/default/useradd</filename>.
 	  </para>
 	  <para>
diff --git a/man/userdel.8.xml b/man/userdel.8.xml
index a70a318f..0fdd919e 100644
--- a/man/userdel.8.xml
+++ b/man/userdel.8.xml
@@ -83,7 +83,7 @@
 	    the user's home directory and mail spool, even if another
 	    user uses the same home directory or if the mail spool is not
 	    owned by the specified user.  If
-	    <emphasis>USERGROUPS_ENAB</emphasis> is defined to <emphasis
+	    <option>USERGROUPS_ENAB</option> is defined to <emphasis
 	    remap='I'>yes</emphasis> in <filename>/etc/login.defs</filename>
 	    and if a group exists with the same name as the deleted user,
 	    then this group will be removed, even if it is still the primary
@@ -113,7 +113,7 @@
 	    deleted manually.
 	  </para>
 	  <para>
-	    The mail spool is defined by the <emphasis>MAIL_DIR</emphasis>
+	    The mail spool is defined by the <option>MAIL_DIR</option>
 	    variable in the <filename>login.defs</filename> file.
 	  </para>
 	</listitem>
@@ -233,7 +233,7 @@
     <para>You may not remove any NIS attributes on a NIS client. This must
       be performed on the NIS server.
     </para>
-    <para>If <emphasis>USERGROUPS_ENAB</emphasis> is defined to <emphasis
+    <para>If <option>USERGROUPS_ENAB</option> is defined to <emphasis
       remap='I'>yes</emphasis> in <filename>/etc/login.defs</filename>,
       <command>userdel</command> will delete the group with the same name
       as the user. To avoid inconsistencies in the passwd and group
diff --git a/man/usermod.8.xml b/man/usermod.8.xml
index a040dddb..a2ca332d 100644
--- a/man/usermod.8.xml
+++ b/man/usermod.8.xml
@@ -315,7 +315,7 @@
 	    password), you should also set the
 	    <replaceable>EXPIRE_DATE</replaceable> (for example to
 	    <replaceable>99999</replaceable>, or to the
-	    <replaceable>EXPIRE</replaceable> value from
+	    <option>EXPIRE</option> value from
 	    <filename>/etc/default/useradd</filename>).
 	  </para>
 	</listitem>
@@ -377,6 +377,12 @@
 	  <para>Group account information.</para>
 	</listitem>
       </varlistentry>
+      <varlistentry condition="gshadow">
+	<term><filename>/etc/gshadow</filename></term>
+	<listitem>
+	  <para>Secure group account information.</para>
+	</listitem>
+      </varlistentry>
       <varlistentry>
 	<term><filename>/etc/passwd</filename></term>
 	<listitem>