* 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 3ffd3072a929f679c2e8c6fd5c6346a5a7065988..1c9f378a8e9f28691312ce49983d03fbc57bcfd8 100644 (file)
--- 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 97bb4d3c1263ec86c81ce8de7c4787a2c0c3a796..7d089ef9862d3243a56f67e86a60523c305e0990 100644 (file)
--- 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 5f400a9db4f6e234a6c37c4c8681d602f3364304..5e65a01630768c2a2a6f8c1ace61d44322d2e447 100644 (file)
--- 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>