* man/login.defs.d/ENCRYPT_METHOD.xml,

	man/login.defs.d/MD5_CRYPT_ENAB.xml,
	man/login.defs.d/SHA_CRYPT_MIN_ROUNDS.xml: Updated note for PAM
	enabled versions. These variables are only used for group
	passwords in this case.

diff --git a/ChangeLog b/ChangeLog
index d02b062a38573928cb2fd4307f6b0234436b6be9..56cb2dcd1583300b71ef892b6aaaed5455736cc5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-05-09  Nicolas François  <nicolas.francois@centraliens.net>
+
+       * man/login.defs.d/ENCRYPT_METHOD.xml,
+       man/login.defs.d/MD5_CRYPT_ENAB.xml,
+       man/login.defs.d/SHA_CRYPT_MIN_ROUNDS.xml: Updated note for PAM
+       enabled versions. These variables are only used for group
+       passwords in this case.
+
 2009-05-09  Nicolas François  <nicolas.francois@centraliens.net>
 
        * man/chpasswd.8.xml: Sorted options alphabetically.

diff --git a/man/login.defs.d/ENCRYPT_METHOD.xml b/man/login.defs.d/ENCRYPT_METHOD.xml
index b91c57375ff774ce583cd4176fac223c89a4b03d..c0687bea4f1a98f6a8ca1c3d0f117f3fa2b06ce6 100644 (file)
--- a/man/login.defs.d/ENCRYPT_METHOD.xml
+++ b/man/login.defs.d/ENCRYPT_METHOD.xml
@@ -54,9 +54,11 @@
       Note: this parameter overrides the <option>MD5_CRYPT_ENAB</option>
       variable.
     </para>
-    <para>
-      Note: if you use PAM, it is recommended to set this variable
-      consistently with the PAM modules configuration.
+    <para condition="pam">
+      Note: This only affect the generation of group passwords.
+      The generation of user passwords is done by PAM and subject to the
+      PAM configuration. It is recommended to set this variable
+      consistently with the PAM configuration.
     </para>
   </listitem>
 </varlistentry>

diff --git a/man/login.defs.d/MD5_CRYPT_ENAB.xml b/man/login.defs.d/MD5_CRYPT_ENAB.xml
index 39bc4ca2282d2e8470ccb2de63907632ec12a027..d27588c3db4a0ee9227d6a66131eb9c12600a54a 100644 (file)
--- a/man/login.defs.d/MD5_CRYPT_ENAB.xml
+++ b/man/login.defs.d/MD5_CRYPT_ENAB.xml
@@ -50,9 +50,11 @@
       This variable is deprecated. You should use
       <option>ENCRYPT_METHOD</option>.
     </para>
-    <para>
-      Note: if you use PAM, it is recommended to set this variable
-      consistently with the PAM modules configuration.
+    <para condition="pam">
+      Note: This only affect the generation of group passwords.
+      The generation of user passwords is done by PAM and subject to the
+      PAM configuration. It is recommended to set this variable
+      consistently with the PAM configuration.
     </para>
   </listitem>
 </varlistentry>

diff --git a/man/login.defs.d/SHA_CRYPT_MIN_ROUNDS.xml b/man/login.defs.d/SHA_CRYPT_MIN_ROUNDS.xml
index 908bd1873301f9e191b55b69db7aa21bc2f1e91f..f0a692825d21ced2952ba4560d352525483c02f3 100644 (file)
--- a/man/login.defs.d/SHA_CRYPT_MIN_ROUNDS.xml
+++ b/man/login.defs.d/SHA_CRYPT_MIN_ROUNDS.xml
@@ -59,5 +59,11 @@
       <option>SHA_CRYPT_MAX_ROUNDS</option>, the highest value will be
       used.
     </para>
+    <para condition="pam">
+      Note: This only affect the generation of group passwords.
+      The generation of user passwords is done by PAM and subject to the
+      PAM configuration. It is recommended to set this variable
+      consistently with the PAM configuration.
+    </para>
   </listitem>
 </varlistentry>