From: nekral-guest <nekral-guest@5a98b0ae-9ef6-0310-add3-de5d479b70d7>
Date: Sat, 14 Mar 2009 11:09:57 +0000 (+0000)
Subject: 	* man/chgpasswd.8.xml, man/chpasswd.8.xml: Fix the man page in
X-Git-Tag: 4.1.3~92
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=884a2de43711b05134ffbe4322622e688a1af26d;p=shadow

	* man/chgpasswd.8.xml, man/chpasswd.8.xml: Fix the man page in
	case SHA crypt is not supported.
---

diff --git a/ChangeLog b/ChangeLog
index 3ffd3072..1c9f378a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-03-14  Nicolas François  <nicolas.francois@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@centraliens.net>
 
 	* man/vipw.8.xml: MAX_MEMBERS_PER_GROUP is not used by vipw and
diff --git a/man/chgpasswd.8.xml b/man/chgpasswd.8.xml
index 97bb4d3c..7d089ef9 100644
--- a/man/chgpasswd.8.xml
+++ b/man/chgpasswd.8.xml
@@ -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>
diff --git a/man/chpasswd.8.xml b/man/chpasswd.8.xml
index 5f400a9d..5e65a016 100644
--- a/man/chpasswd.8.xml
+++ b/man/chpasswd.8.xml
@@ -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>