Relevant BUGIDs:

Purpose of commit: bugfix

Commit summary:
---------------

2008-08-18  Thorsten Kukuk  <kukuk@thkukuk.de>

        * Makefile.am (M4_FILES): Adjust list.

        * modules/pam_access/pam_access.8.xml: Fix module service
        vs. module type.
        * modules/pam_cracklib/pam_cracklib.8.xml: Likewise.
        * modules/pam_debug/pam_debug.8.xml: Likewise.
        * modules/pam_deny/pam_deny.8.xml: Likewise.
        * modules/pam_echo/pam_echo.8.xml: Likewise.
        * modules/pam_env/pam_env.8.xml: Likewise.
        * modules/pam_exec/pam_exec.8.xml: Likewise.
        * modules/pam_faildelay/pam_faildelay.8.xml: Likewise.
        * modules/pam_filter/pam_filter.8.xml: Likewise.
        * modules/pam_ftp/pam_ftp.8.xml: Likewise.
        * modules/pam_group/pam_group.8.xml: Likewise.
        * modules/pam_issue/pam_issue.8.xml: Likewise.
        * modules/pam_keyinit/pam_keyinit.8.xml: Likewise.
        * modules/pam_lastlog/pam_lastlog.8.xml: Likewise.
        * modules/pam_limits/pam_limits.8.xml: Likewise.
        * modules/pam_listfile/pam_listfile.8.xml: Likewise.
        * modules/pam_localuser/pam_localuser.8.xml: Likewise.
        * modules/pam_loginuid/pam_loginuid.8.xml: Likewise.
        * modules/pam_mail/pam_mail.8.xml: Likewise.
        * modules/pam_mkhomedir/pam_mkhomedir.8.xml: Likewise.
        * modules/pam_motd/pam_motd.8.xml: Likewise.
        * modules/pam_namespace/pam_namespace.8.xml: Likewise.
        * modules/pam_nologin/pam_nologin.8.xml: Likewise.
        * modules/pam_permit/pam_permit.8.xml: Likewise.
        * modules/pam_rhosts/pam_rhosts.8.xml: Likewise.
        * modules/pam_rootok/pam_rootok.8.xml: Likewise.
        * modules/pam_securetty/pam_securetty.8.xml: Likewise.
        * modules/pam_selinux/pam_selinux.8.xml: Likewise.
        * modules/pam_sepermit/pam_sepermit.8.xml: Likewise.
        * modules/pam_shells/pam_shells.8.xml: Likewise.
        * modules/pam_succeed_if/pam_succeed_if.8.xml: Likewise.
        * modules/pam_tally/pam_tally.8.xml: Likewise.
        * modules/pam_time/pam_time.8.xml: Likewise.
        * modules/pam_tty_audit/pam_tty_audit.8.xml: Likewise.
        * modules/pam_umask/pam_umask.8.xml: Likewise.
        * modules/pam_unix/pam_unix.8.xml: Likewise.
        * modules/pam_userdb/pam_userdb.8.xml: Likewise.
        * modules/pam_warn/pam_warn.8.xml: Likewise.
        * modules/pam_wheel/pam_wheel.8.xml: Likewise.
        * modules/pam_xauth/pam_xauth.8.xml: Likewise.

40 files changed, 148 insertions, 141 deletions

diff --git a/modules/pam_access/pam_access.8.xml b/modules/pam_access/pam_access.8.xml
index 68f21bab..ff048593 100644
--- a/modules/pam_access/pam_access.8.xml
+++ b/modules/pam_access/pam_access.8.xml
@@ -59,7 +59,7 @@
     </para>
     <para>
       If Linux PAM is compiled with audit support the module will report
-      when it denies access based on origin (host or tty). 
+      when it denies access based on origin (host or tty).
     </para>
   </refsect1>
 
@@ -159,10 +159,11 @@
     </variablelist>
   </refsect1>
 
-  <refsect1 id="pam_access-services">
-    <title>MODULE SERVICES PROVIDED</title>
+  <refsect1 id="pam_access-types">
+    <title>MODULE TYPES PROVIDED</title>
     <para>
-      All services are supported.
+      All module types (<option>auth</option>, <option>account</option>,
+      <option>password</option> and <option>session</option>) are provided.
     </para>
   </refsect1>
 
diff --git a/modules/pam_cracklib/pam_cracklib.8.xml b/modules/pam_cracklib/pam_cracklib.8.xml
index ee9a5917..2f1eecbc 100644
--- a/modules/pam_cracklib/pam_cracklib.8.xml
+++ b/modules/pam_cracklib/pam_cracklib.8.xml
@@ -376,10 +376,10 @@
     </para>
   </refsect1>
 
-  <refsect1 id="pam_cracklib-services">
-    <title>MODULE SERVICES PROVIDED</title>
+  <refsect1 id="pam_cracklib-types">
+    <title>MODULE TYPES PROVIDED</title>
     <para>
-      Only the <option>password</option> service is supported.
+      Only the <option>password</option> module type is provided.
     </para>
   </refsect1>
 
diff --git a/modules/pam_debug/pam_debug.8.xml b/modules/pam_debug/pam_debug.8.xml
index db775067..3d85f4d8 100644
--- a/modules/pam_debug/pam_debug.8.xml
+++ b/modules/pam_debug/pam_debug.8.xml
@@ -171,11 +171,11 @@
     </para>
   </refsect1>
 
-  <refsect1 id="pam_debug-services">
-    <title>MODULE SERVICES PROVIDED</title>
+  <refsect1 id="pam_debug-types">
+    <title>MODULE TYPES PROVIDED</title>
     <para>
-      The services <option>auth</option>, <option>account</option>,
-      <option>password</option> and <option>session</option> are supported.
+      All module types (<option>auth</option>, <option>account</option>,
+      <option>password</option> and <option>session</option>) are provided.
     </para>
   </refsect1>
 
diff --git a/modules/pam_deny/pam_deny.8.xml b/modules/pam_deny/pam_deny.8.xml
index 4f45fa9a..a9283582 100644
--- a/modules/pam_deny/pam_deny.8.xml
+++ b/modules/pam_deny/pam_deny.8.xml
@@ -38,11 +38,11 @@
     <para>This module does not recognise any options.</para>
   </refsect1>
 
-  <refsect1 id="pam_deny-services">
-    <title>MODULE SERVICES PROVIDED</title>
+  <refsect1 id="pam_deny-types">
+    <title>MODULE TYPES PROVIDED</title>
     <para>
-      All services (<option>account</option>, <option>auth</option>,
-      <option>password</option> and <option>session</option>) are supported.
+      All module types (<option>account</option>, <option>auth</option>,
+      <option>password</option> and <option>session</option>) are provided.
     </para>
   </refsect1>
 
diff --git a/modules/pam_echo/pam_echo.8.xml b/modules/pam_echo/pam_echo.8.xml
index 4f4c2428..d2873cc1 100644
--- a/modules/pam_echo/pam_echo.8.xml
+++ b/modules/pam_echo/pam_echo.8.xml
@@ -96,10 +96,12 @@
     </variablelist>
   </refsect1>
 
-  <refsect1 id="pam_echo-services">
-    <title>MODULE SERVICES PROVIDED</title>
+  <refsect1 id="pam_echo-types">
+    <title>MODULE TYPES PROVIDED</title>
     <para>
-      All services are supported.
+      All module types (<option>auth</option>, <option>account</option>,
+      <option>password</option> and <option>session</option>) are provided.
+
     </para>
   </refsect1>
 
diff --git a/modules/pam_env/pam_env.8.xml b/modules/pam_env/pam_env.8.xml
index ecf0355a..9e9a96a5 100644
--- a/modules/pam_env/pam_env.8.xml
+++ b/modules/pam_env/pam_env.8.xml
@@ -118,11 +118,11 @@
     </variablelist>
   </refsect1>
 
-  <refsect1 id="pam_env-services">
-    <title>MODULE SERVICES PROVIDED</title>
+  <refsect1 id="pam_env-types">
+    <title>MODULE TYPES PROVIDED</title>
     <para>
-      The <option>auth</option> and <option>session</option> services
-      are supported.
+      The <option>auth</option> and <option>session</option> module
+      types are provided.
     </para>
   </refsect1>
 
diff --git a/modules/pam_exec/pam_exec.8.xml b/modules/pam_exec/pam_exec.8.xml
index 3ee5315e..1ee25cab 100644
--- a/modules/pam_exec/pam_exec.8.xml
+++ b/modules/pam_exec/pam_exec.8.xml
@@ -123,11 +123,11 @@
     </para>
   </refsect1>
 
-  <refsect1 id="pam_exec-services">
-    <title>MODULE SERVICES PROVIDED</title>
+  <refsect1 id="pam_exec-types">
+    <title>MODULE TYPES PROVIDED</title>
     <para>
-      The services <option>auth</option>, <option>account</option>,
-      <option>password</option> and <option>session</option> are supported.
+      All module types (<option>auth</option>, <option>account</option>,
+      <option>password</option> and <option>session</option>) are provided.
     </para>
   </refsect1>
 
diff --git a/modules/pam_faildelay/pam_faildelay.8.xml b/modules/pam_faildelay/pam_faildelay.8.xml
index 57b3305a..57107203 100644
--- a/modules/pam_faildelay/pam_faildelay.8.xml
+++ b/modules/pam_faildelay/pam_faildelay.8.xml
@@ -68,10 +68,10 @@
     </variablelist>
   </refsect1>
 
-  <refsect1 id="pam_faildelay-services">
-    <title>MODULE SERVICES PROVIDED</title>
+  <refsect1 id="pam_faildelay-types">
+    <title>MODULE TYPES PROVIDED</title>
     <para>
-      Only the <option>auth</option> service is supported.
+      Only the <option>auth</option> module type is provided.
     </para>
   </refsect1>
 
diff --git a/modules/pam_filter/pam_filter.8.xml b/modules/pam_filter/pam_filter.8.xml
index faf97911..9a9d69b9 100644
--- a/modules/pam_filter/pam_filter.8.xml
+++ b/modules/pam_filter/pam_filter.8.xml
@@ -188,11 +188,11 @@
     </para>
   </refsect1>
 
-  <refsect1 id="pam_filter-services">
-    <title>MODULE SERVICES PROVIDED</title>
+  <refsect1 id="pam_filter-types">
+    <title>MODULE TYPES PROVIDED</title>
     <para>
-      The services <option>auth</option>, <option>account</option>,
-      <option>password</option> and <option>session</option> are supported.
+      All module types (<option>auth</option>, <option>account</option>,
+      <option>password</option> and <option>session</option>) are provided.
     </para>
   </refsect1>
 
diff --git a/modules/pam_ftp/pam_ftp.8.xml b/modules/pam_ftp/pam_ftp.8.xml
index f99256c0..ea985c0d 100644
--- a/modules/pam_ftp/pam_ftp.8.xml
+++ b/modules/pam_ftp/pam_ftp.8.xml
@@ -105,10 +105,10 @@
     </para>
   </refsect1>
 
-  <refsect1 id="pam_ftp-services">
-    <title>MODULE SERVICES PROVIDED</title>
+  <refsect1 id="pam_ftp-types">
+    <title>MODULE TYPES PROVIDED</title>
     <para>
-      Only the <option>auth</option> service is supported.
+      Only the <option>auth</option> module type is provided.
     </para>
   </refsect1>
 
diff --git a/modules/pam_group/pam_group.8.xml b/modules/pam_group/pam_group.8.xml
index 114d0c51..8c0770b8 100644
--- a/modules/pam_group/pam_group.8.xml
+++ b/modules/pam_group/pam_group.8.xml
@@ -65,10 +65,10 @@
     <para>This module does not recognise any options.</para>
   </refsect1>
 
-  <refsect1 id="pam_group-services">
-    <title>MODULE SERVICES PROVIDED</title>
+  <refsect1 id="pam_group-types">
+    <title>MODULE TYPES PROVIDED</title>
     <para>
-      Only the <option>auth</option> service is supported.
+      Only the <option>auth</option> module type is provided.
     </para>
   </refsect1>
 
diff --git a/modules/pam_issue/pam_issue.8.xml b/modules/pam_issue/pam_issue.8.xml
index 916dd5e7..4254ea61 100644
--- a/modules/pam_issue/pam_issue.8.xml
+++ b/modules/pam_issue/pam_issue.8.xml
@@ -146,10 +146,10 @@
     </para>
   </refsect1>
 
-  <refsect1 id="pam_issue-services">
-    <title>MODULE SERVICES PROVIDED</title>
+  <refsect1 id="pam_issue-types">
+    <title>MODULE TYPES PROVIDED</title>
     <para>
-      Only the <option>auth</option> service is supported.
+      Only the <option>auth</option> module type is provided.
     </para>
   </refsect1>
 
diff --git a/modules/pam_keyinit/pam_keyinit.8.xml b/modules/pam_keyinit/pam_keyinit.8.xml
index f3e64b3d..bcc50964 100644
--- a/modules/pam_keyinit/pam_keyinit.8.xml
+++ b/modules/pam_keyinit/pam_keyinit.8.xml
@@ -121,10 +121,10 @@
     </variablelist>
   </refsect1>
 
-  <refsect1 id="pam_keyinit-services">
-    <title>MODULE SERVICES PROVIDED</title>
+  <refsect1 id="pam_keyinit-types">
+    <title>MODULE TYPES PROVIDED</title>
     <para>
-      Only the <emphasis remap='B'>session</emphasis> service is supported.
+      Only the <option>session</option> module type is provided.
     </para>
   </refsect1>
 
diff --git a/modules/pam_lastlog/pam_lastlog.8.xml b/modules/pam_lastlog/pam_lastlog.8.xml
index a738402c..f066ac6a 100644
--- a/modules/pam_lastlog/pam_lastlog.8.xml
+++ b/modules/pam_lastlog/pam_lastlog.8.xml
@@ -140,10 +140,10 @@
     </variablelist>
   </refsect1>
 
-  <refsect1 id="pam_lastlog-services">
-    <title>MODULE SERVICES PROVIDED</title>
+  <refsect1 id="pam_lastlog-types">
+    <title>MODULE TYPES PROVIDED</title>
     <para>
-      Only the <option>session</option> service is supported.
+      Only the <option>session</option> module type is provided.
     </para>
   </refsect1>
 
diff --git a/modules/pam_limits/pam_limits.8.xml b/modules/pam_limits/pam_limits.8.xml
index 05c4d160..a4375e22 100644
--- a/modules/pam_limits/pam_limits.8.xml
+++ b/modules/pam_limits/pam_limits.8.xml
@@ -132,10 +132,10 @@
     </variablelist>
   </refsect1>
 
-  <refsect1 id="pam_limits-services">
-    <title>MODULE SERVICES PROVIDED</title>
+  <refsect1 id="pam_limits-types">
+    <title>MODULE TYPES PROVIDED</title>
     <para>
-      Only the <option>session</option> service is supported.
+      Only the <option>session</option> module type is provided.
     </para>
   </refsect1>
 
diff --git a/modules/pam_listfile/pam_listfile.8.xml b/modules/pam_listfile/pam_listfile.8.xml
index d33cdb1e..4c1fb1fd 100644
--- a/modules/pam_listfile/pam_listfile.8.xml
+++ b/modules/pam_listfile/pam_listfile.8.xml
@@ -175,11 +175,11 @@
     </para>
   </refsect1>
 
-  <refsect1 id="pam_listfile-services">
-    <title>MODULE SERVICES PROVIDED</title>
+  <refsect1 id="pam_listfile-types">
+    <title>MODULE TYPES PROVIDED</title>
     <para>
-      The services <option>auth</option>, <option>account</option>,
-      <option>password</option> and <option>session</option> are supported.
+      All module types (<option>auth</option>, <option>account</option>,
+      <option>password</option> and <option>session</option>) are provided.
     </para>
   </refsect1>
 
diff --git a/modules/pam_localuser/pam_localuser.8.xml b/modules/pam_localuser/pam_localuser.8.xml
index cae98ca1..861fc35a 100644
--- a/modules/pam_localuser/pam_localuser.8.xml
+++ b/modules/pam_localuser/pam_localuser.8.xml
@@ -80,11 +80,11 @@
     </para>
   </refsect1>
 
-  <refsect1 id="pam_localuser-services">
-    <title>MODULE SERVICES PROVIDED</title>
+  <refsect1 id="pam_localuser-types">
+    <title>MODULE TYPES PROVIDED</title>
     <para>
-      All services (<option>account</option>, <option>auth</option>,
-      <option>password</option> and <option>session</option>) are supported.
+      All module types (<option>account</option>, <option>auth</option>,
+      <option>password</option> and <option>session</option>) are provided.
     </para>
   </refsect1>
 
diff --git a/modules/pam_loginuid/pam_loginuid.8.xml b/modules/pam_loginuid/pam_loginuid.8.xml
index 801c88f9..2a146b2c 100644
--- a/modules/pam_loginuid/pam_loginuid.8.xml
+++ b/modules/pam_loginuid/pam_loginuid.8.xml
@@ -57,10 +57,10 @@
     </variablelist>
   </refsect1>
 
-  <refsect1 id="pam_loginuid-services">
-    <title>MODULE SERVICES PROVIDED</title>
+  <refsect1 id="pam_loginuid-types">
+    <title>MODULE TYPES PROVIDED</title>
     <para>
-      The <option>session</option> service is supported.
+      Only the <option>session</option> module type is provided.
     </para>
   </refsect1>
 
diff --git a/modules/pam_mail/pam_mail.8.xml b/modules/pam_mail/pam_mail.8.xml
index 17677c73..a6dff870 100644
--- a/modules/pam_mail/pam_mail.8.xml
+++ b/modules/pam_mail/pam_mail.8.xml
@@ -193,12 +193,12 @@
     </para>
   </refsect1>
 
-  <refsect1 id="pam_mail-services">
-    <title>MODULE SERVICES PROVIDED</title>
+  <refsect1 id="pam_mail-types">
+    <title>MODULE TYPES PROVIDED</title>
     <para>
-      The <emphasis remap='B'>session</emphasis> and
-      <emphasis remap='B'>auth</emphasis> (on establishment and
-      deletion of credentials) services are supported. 
+      The <option>session</option> and
+      <option>auth</option> (on establishment and
+      deletion of credentials) module types are provided.
     </para>
   </refsect1>
 
diff --git a/modules/pam_mkhomedir/pam_mkhomedir.8.xml b/modules/pam_mkhomedir/pam_mkhomedir.8.xml
index aeb619f0..5d66ee23 100644
--- a/modules/pam_mkhomedir/pam_mkhomedir.8.xml
+++ b/modules/pam_mkhomedir/pam_mkhomedir.8.xml
@@ -95,10 +95,10 @@
     </variablelist>
   </refsect1>
 
-  <refsect1 id="pam_mkhomedir-services">
-    <title>MODULE SERVICES PROVIDED</title>
+  <refsect1 id="pam_mkhomedir-types">
+    <title>MODULE TYPES PROVIDED</title>
     <para>
-      Only the <option>session</option> service is supported.
+      Only the <option>session</option> module type is provided.
     </para>
   </refsect1>
 
diff --git a/modules/pam_motd/pam_motd.8.xml b/modules/pam_motd/pam_motd.8.xml
index 69e9efd8..7b9b2437 100644
--- a/modules/pam_motd/pam_motd.8.xml
+++ b/modules/pam_motd/pam_motd.8.xml
@@ -55,10 +55,10 @@
     </variablelist>
   </refsect1>
 
-  <refsect1 id="pam_motd-services">
-    <title>MODULE SERVICES PROVIDED</title>
+  <refsect1 id="pam_motd-types">
+    <title>MODULE TYPES PROVIDED</title>
     <para>
-      Only the <option>session</option> service is supported.
+      Only the <option>session</option> module type is provided.
     </para>
   </refsect1>
 
diff --git a/modules/pam_namespace/pam_namespace.8.xml b/modules/pam_namespace/pam_namespace.8.xml
index bb9b3e34..81328476 100644
--- a/modules/pam_namespace/pam_namespace.8.xml
+++ b/modules/pam_namespace/pam_namespace.8.xml
@@ -237,11 +237,11 @@
     </variablelist>
   </refsect1>
 
-  <refsect1 id="pam_namespace-services">
-    <title>MODULE SERVICES PROVIDED</title>
+  <refsect1 id="pam_namespace-types">
+    <title>MODULE TYPES PROVIDED</title>
     <para>
-      The <option>session</option> service is supported. The module must not
-      be called from multithreaded processes.
+      Only the <option>session</option> module type is provided.
+      The module must not be called from multithreaded processes.
     </para>
   </refsect1>
 
diff --git a/modules/pam_nologin/pam_nologin.8.xml b/modules/pam_nologin/pam_nologin.8.xml
index c9a81792..b30b6bed 100644
--- a/modules/pam_nologin/pam_nologin.8.xml
+++ b/modules/pam_nologin/pam_nologin.8.xml
@@ -68,11 +68,11 @@
     </variablelist>
   </refsect1>
 
-  <refsect1 id="pam_nologin-services">
-    <title>MODULE SERVICES PROVIDED</title>
+  <refsect1 id="pam_nologin-types">
+    <title>MODULE TYPES PROVIDED</title>
     <para>
-      The <option>auth</option> and <option>acct</option> services are
-      supported.
+      The <option>auth</option> and <option>acct</option> module
+      types are provided.
     </para>
   </refsect1>
 
diff --git a/modules/pam_permit/pam_permit.8.xml b/modules/pam_permit/pam_permit.8.xml
index 6ecc34ac..6bb49658 100644
--- a/modules/pam_permit/pam_permit.8.xml
+++ b/modules/pam_permit/pam_permit.8.xml
@@ -47,11 +47,12 @@
     <para> This module does not recognise any options.</para>
   </refsect1>
 
-  <refsect1 id="pam_permit-services">
-    <title>MODULE SERVICES PROVIDED</title>
+  <refsect1 id="pam_permit-types">
+    <title>MODULE TYPES PROVIDED</title>
     <para>
-      The services <option>auth</option>, <option>account</option>,
-      <option>password</option> and <option>session</option> are supported.
+      The <option>auth</option>, <option>account</option>,
+      <option>password</option> and <option>session</option>
+      module types are provided.
     </para>
   </refsect1>
 
diff --git a/modules/pam_rhosts/pam_rhosts.8.xml b/modules/pam_rhosts/pam_rhosts.8.xml
index 194f956e..eb96371d 100644
--- a/modules/pam_rhosts/pam_rhosts.8.xml
+++ b/modules/pam_rhosts/pam_rhosts.8.xml
@@ -89,10 +89,10 @@
     </variablelist>
   </refsect1>
 
-  <refsect1 id="pam_rhosts-services">
-    <title>MODULE SERVICES PROVIDED</title>
+  <refsect1 id="pam_rhosts-types">
+    <title>MODULE TYPES PROVIDED</title>
     <para>
-      Only the <option>auth</option> service is supported.
+      Only the <option>auth</option> module type is provided.
     </para>
   </refsect1>
 
diff --git a/modules/pam_rootok/pam_rootok.8.xml b/modules/pam_rootok/pam_rootok.8.xml
index ed26d357..e2d2441f 100644
--- a/modules/pam_rootok/pam_rootok.8.xml
+++ b/modules/pam_rootok/pam_rootok.8.xml
@@ -54,10 +54,10 @@
     </variablelist>
   </refsect1>
 
-  <refsect1 id="pam_rootok-services">
-    <title>MODULE SERVICES PROVIDED</title>
+  <refsect1 id="pam_rootok-types">
+    <title>MODULE TYPES PROVIDED</title>
     <para>
-      Only the <option>auth</option> service is supported.
+      Only the <option>auth</option> type is provided.
     </para>
   </refsect1>
 
diff --git a/modules/pam_securetty/pam_securetty.8.xml b/modules/pam_securetty/pam_securetty.8.xml
index 0ba44413..dd57705b 100644
--- a/modules/pam_securetty/pam_securetty.8.xml
+++ b/modules/pam_securetty/pam_securetty.8.xml
@@ -64,10 +64,10 @@
     </variablelist>
   </refsect1>
 
-  <refsect1 id="pam_securetty-services">
-    <title>MODULE SERVICES PROVIDED</title>
+  <refsect1 id="pam_securetty-types">
+    <title>MODULE TYPES PROVIDED</title>
     <para>
-      Only the <option>auth</option> service is supported.
+      Only the <option>auth</option> module type is provided.
     </para>
   </refsect1>
 
diff --git a/modules/pam_selinux/pam_selinux.8.xml b/modules/pam_selinux/pam_selinux.8.xml
index d9ff1770..3db26d04 100644
--- a/modules/pam_selinux/pam_selinux.8.xml
+++ b/modules/pam_selinux/pam_selinux.8.xml
@@ -170,10 +170,10 @@
     </variablelist>
   </refsect1>
 
-  <refsect1 id="pam_selinux-services">
-    <title>MODULE SERVICES PROVIDED</title>
+  <refsect1 id="pam_selinux-types">
+    <title>MODULE TYPES PROVIDED</title>
     <para>
-      Only the <option>session</option> service is supported.
+      Only the <option>session</option> module type is provided.
     </para>
   </refsect1>
 
@@ -211,7 +211,7 @@
     <title>EXAMPLES</title>
     <programlisting>
 auth     required  pam_unix.so
-session  required  pam_permit.so    
+session  required  pam_permit.so
 session  optional  pam_selinux.so
     </programlisting>
   </refsect1>
diff --git a/modules/pam_sepermit/pam_sepermit.8.xml b/modules/pam_sepermit/pam_sepermit.8.xml
index c2546b62..da4153bf 100644
--- a/modules/pam_sepermit/pam_sepermit.8.xml
+++ b/modules/pam_sepermit/pam_sepermit.8.xml
@@ -87,11 +87,11 @@
     </variablelist>
   </refsect1>
 
-  <refsect1 id="pam_sepermit-services">
-    <title>MODULE SERVICES PROVIDED</title>
+  <refsect1 id="pam_sepermit-types">
+    <title>MODULE TYPES PROVIDED</title>
     <para>
-      Only the <option>auth</option> and <option>account</option>
-      services are supported.
+      The <option>auth</option> and <option>account</option>
+      module types are provided.
     </para>
   </refsect1>
 
diff --git a/modules/pam_shells/pam_shells.8.xml b/modules/pam_shells/pam_shells.8.xml
index 72191da8..c197a989 100644
--- a/modules/pam_shells/pam_shells.8.xml
+++ b/modules/pam_shells/pam_shells.8.xml
@@ -41,11 +41,11 @@
     <para> This module does not recognise any options.</para>
   </refsect1>
 
-  <refsect1 id="pam_shells-services">
-    <title>MODULE SERVICES PROVIDED</title>
+  <refsect1 id="pam_shells-types">
+    <title>MODULE TYPES PROVIDED</title>
     <para>
-      The services <option>auth</option> and <option>account</option>
-      are supported.
+      The <option>auth</option> and <option>account</option>
+      module types are provided.
     </para>
   </refsect1>
 
diff --git a/modules/pam_succeed_if/pam_succeed_if.8.xml b/modules/pam_succeed_if/pam_succeed_if.8.xml
index e377ae86..c99f6be5 100644
--- a/modules/pam_succeed_if/pam_succeed_if.8.xml
+++ b/modules/pam_succeed_if/pam_succeed_if.8.xml
@@ -215,10 +215,11 @@
     </variablelist>
   </refsect1>
 
-  <refsect1 id="pam_succeed_if-services">
-    <title>MODULE SERVICES PROVIDED</title>
+  <refsect1 id="pam_succeed_if-types">
+    <title>MODULE TYPES PROVIDED</title>
     <para>
-      All services are supported.
+      All module types (<option>account</option>, <option>auth</option>,
+      <option>password</option> and <option>session</option>) are provided.
     </para>
   </refsect1>
 
diff --git a/modules/pam_tally/pam_tally.8.xml b/modules/pam_tally/pam_tally.8.xml
index bd86e80f..831ee1a5 100644
--- a/modules/pam_tally/pam_tally.8.xml
+++ b/modules/pam_tally/pam_tally.8.xml
@@ -119,7 +119,7 @@
         <listitem>
           <para>
             This can be used for <emphasis>auth</emphasis> and
-            <emphasis>account</emphasis> services.
+            <emphasis>account</emphasis> module types.
           </para>
           <variablelist>
             <varlistentry>
@@ -348,11 +348,11 @@
     </variablelist>
   </refsect1>
 
-  <refsect1 id="pam_tally-services">
-    <title>MODULE SERVICES PROVIDED</title>
+  <refsect1 id="pam_tally-types">
+    <title>MODULE TYPES PROVIDED</title>
     <para>
       The <option>auth</option> and <option>account</option>
-      services are supported.
+      module types are provided.
     </para>
   </refsect1>
 
diff --git a/modules/pam_time/pam_time.8.xml b/modules/pam_time/pam_time.8.xml
index 490a793c..8e7f222c 100644
--- a/modules/pam_time/pam_time.8.xml
+++ b/modules/pam_time/pam_time.8.xml
@@ -49,7 +49,7 @@
     </para>
     <para>
       If Linux PAM is compiled with audit support the module will report
-      when it denies access. 
+      when it denies access.
     </para>
   </refsect1>
 
@@ -83,10 +83,10 @@
     </variablelist>
   </refsect1>
 
-  <refsect1 id="pam_time-services">
-    <title>MODULE SERVICES PROVIDED</title>
+  <refsect1 id="pam_time-types">
+    <title>MODULE TYPES PROVIDED</title>
     <para>
-      Only the <option>account</option> service is supported.
+      Only the <option>account</option> type is provided.
     </para>
   </refsect1>
 
diff --git a/modules/pam_tty_audit/pam_tty_audit.8.xml b/modules/pam_tty_audit/pam_tty_audit.8.xml
index f6f0602f..005d2e85 100644
--- a/modules/pam_tty_audit/pam_tty_audit.8.xml
+++ b/modules/pam_tty_audit/pam_tty_audit.8.xml
@@ -80,10 +80,10 @@
     </variablelist>
   </refsect1>
 
-  <refsect1 id="pam_tty_audit-services">
-    <title>MODULE SERVICES PROVIDED</title>
+  <refsect1 id="pam_tty_audit-types">
+    <title>MODULE TYPES PROVIDED</title>
     <para>
-      Only the <emphasis remap='B'>session</emphasis> service is supported.
+      Only the <emphasis remap='B'>session</emphasis> type is supported.
     </para>
   </refsect1>
 
diff --git a/modules/pam_umask/pam_umask.8.xml b/modules/pam_umask/pam_umask.8.xml
index 43eba83b..b2858b57 100644
--- a/modules/pam_umask/pam_umask.8.xml
+++ b/modules/pam_umask/pam_umask.8.xml
@@ -141,10 +141,10 @@
     </para>
   </refsect1>
 
-  <refsect1 id="pam_umask-services">
-    <title>MODULE SERVICES PROVIDED</title>
+  <refsect1 id="pam_umask-types">
+    <title>MODULE TYPES PROVIDED</title>
     <para>
-      Only the <option>session</option> service is supported.
+      Only the <option>session</option> type is provided.
     </para>
   </refsect1>
 
diff --git a/modules/pam_unix/pam_unix.8.xml b/modules/pam_unix/pam_unix.8.xml
index e6a5e7fc..32565b1f 100644
--- a/modules/pam_unix/pam_unix.8.xml
+++ b/modules/pam_unix/pam_unix.8.xml
@@ -85,7 +85,7 @@
     </para>
 
     <para>
-      The session component of this module logs when a user logins 
+      The session component of this module logs when a user logins
       or leave the system.
     </para>
 
@@ -314,10 +314,11 @@
     </para>
   </refsect1>
 
-  <refsect1 id="pam_unix-services">
-    <title>MODULE SERVICES PROVIDED</title>
+  <refsect1 id="pam_unix-types">
+    <title>MODULE TYPES PROVIDED</title>
     <para>
-      All service are supported.
+      All module types (<option>account</option>, <option>auth</option>,
+      <option>password</option> and <option>session</option>) are provided.
     </para>
   </refsect1>
 
diff --git a/modules/pam_userdb/pam_userdb.8.xml b/modules/pam_userdb/pam_userdb.8.xml
index ea2ebfe6..ba971526 100644
--- a/modules/pam_userdb/pam_userdb.8.xml
+++ b/modules/pam_userdb/pam_userdb.8.xml
@@ -189,11 +189,11 @@
     </variablelist>
   </refsect1>
 
-  <refsect1 id="pam_userdb-services">
-    <title>MODULE SERVICES PROVIDED</title>
+  <refsect1 id="pam_userdb-types">
+    <title>MODULE TYPES PROVIDED</title>
     <para>
-      The services <option>auth</option> and <option>account</option>
-      are supported.
+      The <option>auth</option> and <option>account</option> module
+      types are provided.
     </para>
   </refsect1>
 
diff --git a/modules/pam_warn/pam_warn.8.xml b/modules/pam_warn/pam_warn.8.xml
index 04f29283..1764ec92 100644
--- a/modules/pam_warn/pam_warn.8.xml
+++ b/modules/pam_warn/pam_warn.8.xml
@@ -38,11 +38,12 @@
     <para>This module does not recognise any options.</para>
   </refsect1>
 
-  <refsect1 id="pam_warn-services">
-    <title>MODULE SERVICES PROVIDED</title>
+  <refsect1 id="pam_warn-types">
+    <title>MODULE TYPES PROVIDED</title>
     <para>
-      The services <option>auth</option>, <option>account</option>,
-      <option>password</option> and <option>session</option> are supported.
+      The <option>auth</option>, <option>account</option>,
+      <option>password</option> and <option>session</option> module
+      types are provided.
     </para>
   </refsect1>
 
diff --git a/modules/pam_wheel/pam_wheel.8.xml b/modules/pam_wheel/pam_wheel.8.xml
index 1a344d08..c0ae68c6 100644
--- a/modules/pam_wheel/pam_wheel.8.xml
+++ b/modules/pam_wheel/pam_wheel.8.xml
@@ -130,11 +130,11 @@
     </variablelist>
   </refsect1>
 
-  <refsect1 id="pam_wheel-services">
-    <title>MODULE SERVICES PROVIDED</title>
+  <refsect1 id="pam_wheel-types">
+    <title>MODULE TYPES PROVIDED</title>
     <para>
       The <emphasis remap='B'>auth</emphasis> and
-      <emphasis remap='B'>account</emphasis> services are supported.
+      <emphasis remap='B'>account</emphasis> module types are provided.
     </para>
   </refsect1>
 
diff --git a/modules/pam_xauth/pam_xauth.8.xml b/modules/pam_xauth/pam_xauth.8.xml
index 78184fdb..353f1b6e 100644
--- a/modules/pam_xauth/pam_xauth.8.xml
+++ b/modules/pam_xauth/pam_xauth.8.xml
@@ -147,10 +147,10 @@
     </variablelist>
   </refsect1>
 
-  <refsect1 id="pam_xauth-services">
-    <title>MODULE SERVICES PROVIDED</title>
+  <refsect1 id="pam_xauth-types">
+    <title>MODULE TYPES PROVIDED</title>
     <para>
-      Only the <emphasis remap='B'>session</emphasis> service is supported.
+      Only the <emphasis remap='B'>session</emphasis> type is provided.
     </para>
   </refsect1>