* man/chgpasswd.8.xml, man/chpasswd.8.xml: Fix the man page in

case SHA crypt is not supported.
This commit is contained in:
nekral-guest 2009-03-14 11:09:57 +00:00
parent 5349c79d12
commit 884a2de437
3 changed files with 17 additions and 6 deletions

View File

@ -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> 2009-03-14 Nicolas François <nicolas.francois@centraliens.net>
* man/vipw.8.xml: MAX_MEMBERS_PER_GROUP is not used by vipw and * man/vipw.8.xml: MAX_MEMBERS_PER_GROUP is not used by vipw and

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
Copyright (c) 2006 , Tomasz Kłoczko Copyright (c) 2006 , Tomasz Kłoczko
Copyright (c) 2007 - 2008, Nicolas François Copyright (c) 2007 - 2009, Nicolas François
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without Redistribution and use in source and binary forms, with or without
@ -95,7 +95,10 @@
<term><option>-c</option>, <option>--crypt-method</option></term> <term><option>-c</option>, <option>--crypt-method</option></term>
<listitem> <listitem>
<para>Use the specified method to encrypt the passwords.</para> <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 The available methods are DES, MD5, NONE, and SHA256 or SHA512
if your libc support these methods. if your libc support these methods.
</para> </para>
@ -122,7 +125,7 @@
</para> </para>
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry condition="sha_crypt">
<term><option>-s</option>, <option>--sha-rounds</option></term> <term><option>-s</option>, <option>--sha-rounds</option></term>
<listitem> <listitem>
<para> <para>

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
Copyright (c) 1991 , Julianne Frances Haugh Copyright (c) 1991 , Julianne Frances Haugh
Copyright (c) 2007 - 2008, Nicolas François Copyright (c) 2007 - 2009, Nicolas François
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without Redistribution and use in source and binary forms, with or without
@ -95,7 +95,10 @@
<term><option>-c</option>, <option>--crypt-method</option></term> <term><option>-c</option>, <option>--crypt-method</option></term>
<listitem> <listitem>
<para>Use the specified method to encrypt the passwords.</para> <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 The available methods are DES, MD5, NONE, and SHA256 or SHA512
if your libc support these methods. if your libc support these methods.
</para> </para>
@ -122,7 +125,7 @@
</para> </para>
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry condition="sha_crypt">
<term><option>-s</option>, <option>--sha-rounds</option></term> <term><option>-s</option>, <option>--sha-rounds</option></term>
<listitem> <listitem>
<para> <para>