[Pkg-shadow-commits] r2877 - in upstream/trunk: . man

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2009-05-09 13:16:03 +0000 (Sat, 09 May 2009)
New Revision: 2877

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/man/chpasswd.8.xml
Log:
	* man/chpasswd.8.xml: Sorted options alphabetically.

Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2009-05-09 13:15:57 UTC (rev 2876)
+++ upstream/trunk/ChangeLog	2009-05-09 13:16:03 UTC (rev 2877)
@@ -1,5 +1,9 @@
 2009-05-09  Nicolas François  <nicolas.francois at centraliens.net>
 
+	* man/chpasswd.8.xml: Sorted options alphabetically.
+
+2009-05-09  Nicolas François  <nicolas.francois at centraliens.net>
+
 	* NEWS, src/newusers.c, src/Makefile.am: Added support for
 	changing the passwords with PAM.
 	* src/newusers.c: Split the usage string in smaller parts to

Modified: upstream/trunk/man/chpasswd.8.xml
===================================================================
--- upstream/trunk/man/chpasswd.8.xml	2009-05-09 13:15:57 UTC (rev 2876)
+++ upstream/trunk/man/chpasswd.8.xml	2009-05-09 13:16:03 UTC (rev 2877)
@@ -111,14 +111,6 @@
       The options which apply to the <command>chpasswd</command> command
       are:
     </para>
-    <variablelist remap='IP'>
-      <varlistentry>
-	<term><option>-h</option>, <option>--help</option></term>
-	<listitem>
-	  <para>Display help message and exit.</para>
-	</listitem>
-      </varlistentry>
-    </variablelist>
     <variablelist remap='IP' condition="no_pam">
       <varlistentry>
 	<term><option>-c</option>, <option>--crypt-method</option></term>
@@ -139,7 +131,17 @@
 	  <para>Supplied passwords are in encrypted form.</para>
 	</listitem>
       </varlistentry>
+    </variablelist>
+    <variablelist remap='IP'>
       <varlistentry>
+	<term><option>-h</option>, <option>--help</option></term>
+	<listitem>
+	  <para>Display help message and exit.</para>
+	</listitem>
+      </varlistentry>
+    </variablelist>
+    <variablelist remap='IP' condition="no_pam">
+      <varlistentry>
 	<term><option>-m</option>, <option>--md5</option></term>
 	<listitem>
 	  <para>