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

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2009-03-14 11:09:57 +0000 (Sat, 14 Mar 2009)
New Revision: 2512

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/man/chgpasswd.8.xml
   upstream/trunk/man/chpasswd.8.xml
Log:
	* man/chgpasswd.8.xml, man/chpasswd.8.xml: Fix the man page in
	case SHA crypt is not supported.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2009-03-14 11:08:39 UTC (rev 2511)
+++ upstream/trunk/ChangeLog	2009-03-14 11:09:57 UTC (rev 2512)
@@ -1,5 +1,10 @@
 2009-03-14  Nicolas François  <nicolas.francois at centraliens.net>
 
+	* man/chgpasswd.8.xml, man/chpasswd.8.xml: Fix the man page in
+	case SHA crypt is not supported.
+
+2009-03-14  Nicolas François  <nicolas.francois at centraliens.net>
+
 	* man/vipw.8.xml: MAX_MEMBERS_PER_GROUP is not used by vipw and
 	vigr.
 

Modified: upstream/trunk/man/chgpasswd.8.xml
===================================================================
--- upstream/trunk/man/chgpasswd.8.xml	2009-03-14 11:08:39 UTC (rev 2511)
+++ upstream/trunk/man/chgpasswd.8.xml	2009-03-14 11:09:57 UTC (rev 2512)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
    Copyright (c) 2006       , Tomasz Kłoczko
-   Copyright (c) 2007 - 2008, Nicolas François
+   Copyright (c) 2007 - 2009, Nicolas François
    All rights reserved.
   
    Redistribution and use in source and binary forms, with or without
@@ -95,7 +95,10 @@
 	<term><option>-c</option>, <option>--crypt-method</option></term>
 	<listitem>
 	  <para>Use the specified method to encrypt the passwords.</para>
-	  <para>
+	  <para condition="no_sha_crypt">
+	    The available methods are DES, MD5, and NONE.
+	  </para>
+	  <para condition="sha_crypt">
 	    The available methods are DES, MD5, NONE, and SHA256 or SHA512
 	    if your libc support these methods.
 	  </para>
@@ -122,7 +125,7 @@
 	  </para>
 	</listitem>
       </varlistentry>
-      <varlistentry>
+      <varlistentry condition="sha_crypt">
 	<term><option>-s</option>, <option>--sha-rounds</option></term>
 	<listitem>
 	  <para>

Modified: upstream/trunk/man/chpasswd.8.xml
===================================================================
--- upstream/trunk/man/chpasswd.8.xml	2009-03-14 11:08:39 UTC (rev 2511)
+++ upstream/trunk/man/chpasswd.8.xml	2009-03-14 11:09:57 UTC (rev 2512)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
    Copyright (c) 1991       , Julianne Frances Haugh
-   Copyright (c) 2007 - 2008, Nicolas François
+   Copyright (c) 2007 - 2009, Nicolas François
    All rights reserved.
   
    Redistribution and use in source and binary forms, with or without
@@ -95,7 +95,10 @@
 	<term><option>-c</option>, <option>--crypt-method</option></term>
 	<listitem>
 	  <para>Use the specified method to encrypt the passwords.</para>
-	  <para>
+	  <para condition="no_sha_crypt">
+	    The available methods are DES, MD5, and NONE.
+	  </para>
+	  <para condition="sha_crypt">
 	    The available methods are DES, MD5, NONE, and SHA256 or SHA512
 	    if your libc support these methods.
 	  </para>
@@ -122,7 +125,7 @@
 	  </para>
 	</listitem>
       </varlistentry>
-      <varlistentry>
+      <varlistentry condition="sha_crypt">
 	<term><option>-s</option>, <option>--sha-rounds</option></term>
 	<listitem>
 	  <para>