--- Linux-PAM-1.0/doc/man/pam_getenv.3.xml	2006-06-25 21:01:00.000000000 +0200
+++ Linux-PAM/doc/man/pam_getenv.3.xml	2008-06-22 09:47:28.000000000 +0200
@@ -32,9 +32,9 @@
     <para>
       The <function>pam_getenv</function> function searches the
       PAM environment list as associated with the handle
-      <emphasis>pamh</emphasis> for a string that matches the string
-      pointed to by <emphasis>name</emphasis>. The return values are
-      of the form: "<emphasis>name=value</emphasis>".
+      <emphasis>pamh</emphasis> for an item that matches the string
+      pointed to by <emphasis>name</emphasis> and returns the value
+      of the environment variable.
     </para>
   </refsect1>
 
--- Linux-PAM-1.0/doc/man/pam_prompt.3.xml	2006-05-04 08:56:08.000000000 +0200
+++ Linux-PAM/doc/man/pam_prompt.3.xml	2008-06-22 09:47:29.000000000 +0200
@@ -44,7 +44,11 @@
     <title>DESCRIPTION</title>
     <para>
       The <function>pam_prompt</function> function constructs a message
-      from the specified format string and arguments and passes it to
+      from the specified format string and arguments and passes it to the
+      conversation function as set by the service. Upon successful return,
+      <emphasis>response</emphasis> is set to point to a string
+      returned from the conversation function. This string is allocated
+      on heap and should be freed.
     </para>
   </refsect1>
 
--- Linux-PAM-1.0/doc/sag/pam_access.xml	2006-10-13 13:33:18.000000000 +0200
+++ Linux-PAM/doc/sag/pam_access.xml	2008-08-20 20:56:21.000000000 +0200
@@ -19,9 +19,9 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
      href="../../modules/pam_access/pam_access.8.xml" xpointer='xpointer(//refsect1[@id = "pam_access-options"]/*)'/>
   </section>
-  <section id='sag-pam_access-services'>
+  <section id='sag-pam_access-types'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../modules/pam_access/pam_access.8.xml" xpointer='xpointer(//refsect1[@id = "pam_access-services"]/*)'/>
+     href="../../modules/pam_access/pam_access.8.xml" xpointer='xpointer(//refsect1[@id = "pam_access-types"]/*)'/>
   </section>
   <section id='sag-pam_access-return_values'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--- Linux-PAM-1.0/doc/sag/pam_cracklib.xml	2006-06-28 14:01:13.000000000 +0200
+++ Linux-PAM/doc/sag/pam_cracklib.xml	2008-08-20 20:56:21.000000000 +0200
@@ -15,9 +15,9 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
      href="../../modules/pam_cracklib/pam_cracklib.8.xml" xpointer='xpointer(//refsect1[@id = "pam_cracklib-options"]/*)'/>
   </section>
-  <section id='sag-pam_cracklib-services'>
+  <section id='sag-pam_cracklib-types'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../modules/pam_cracklib/pam_cracklib.8.xml" xpointer='xpointer(//refsect1[@id = "pam_cracklib-services"]/*)'/>
+     href="../../modules/pam_cracklib/pam_cracklib.8.xml" xpointer='xpointer(//refsect1[@id = "pam_cracklib-types"]/*)'/>
   </section>
   <section id='sag-pam_cracklib-return_values'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--- Linux-PAM-1.0/doc/sag/pam_debug.xml	2006-06-28 14:01:13.000000000 +0200
+++ Linux-PAM/doc/sag/pam_debug.xml	2008-08-20 20:56:21.000000000 +0200
@@ -15,9 +15,9 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
      href="../../modules/pam_debug/pam_debug.8.xml" xpointer='xpointer(//refsect1[@id = "pam_debug-options"]/*)'/>
   </section>
-  <section id='sag-pam_debug-services'>
+  <section id='sag-pam_debug-types'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../modules/pam_debug/pam_debug.8.xml" xpointer='xpointer(//refsect1[@id = "pam_debug-services"]/*)'/>
+     href="../../modules/pam_debug/pam_debug.8.xml" xpointer='xpointer(//refsect1[@id = "pam_debug-types"]/*)'/>
   </section>
   <section id='sag-pam_debug-return_values'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--- Linux-PAM-1.0/doc/sag/pam_deny.xml	2006-06-28 14:01:13.000000000 +0200
+++ Linux-PAM/doc/sag/pam_deny.xml	2008-08-20 20:56:21.000000000 +0200
@@ -15,9 +15,9 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
      href="../../modules/pam_deny/pam_deny.8.xml" xpointer='xpointer(//refsect1[@id = "pam_deny-options"]/*)'/>
   </section>
-  <section id='sag-pam_deny-services'>
+  <section id='sag-pam_deny-types'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../modules/pam_deny/pam_deny.8.xml" xpointer='xpointer(//refsect1[@id = "pam_deny-services"]/*)'/>
+     href="../../modules/pam_deny/pam_deny.8.xml" xpointer='xpointer(//refsect1[@id = "pam_deny-types"]/*)'/>
   </section>
   <section id='sag-pam_deny-return_values'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--- Linux-PAM-1.0/doc/sag/pam_echo.xml	2006-10-13 13:33:18.000000000 +0200
+++ Linux-PAM/doc/sag/pam_echo.xml	2008-08-20 20:56:21.000000000 +0200
@@ -15,9 +15,9 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
      href="../../modules/pam_echo/pam_echo.8.xml" xpointer='xpointer(//refsect1[@id = "pam_echo-options"]/*)'/>
   </section>
-  <section id='sag-pam_echo-services'>
+  <section id='sag-pam_echo-types'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../modules/pam_echo/pam_echo.8.xml" xpointer='xpointer(//refsect1[@id = "pam_echo-services"]/*)'/>
+     href="../../modules/pam_echo/pam_echo.8.xml" xpointer='xpointer(//refsect1[@id = "pam_echo-types"]/*)'/>
   </section>
   <section id='sag-pam_echo-return_values'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--- Linux-PAM-1.0/doc/sag/pam_env.xml	2006-10-13 13:33:18.000000000 +0200
+++ Linux-PAM/doc/sag/pam_env.xml	2008-08-20 20:56:21.000000000 +0200
@@ -19,9 +19,9 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
      href="../../modules/pam_env/pam_env.8.xml" xpointer='xpointer(//refsect1[@id = "pam_env-options"]/*)'/>
   </section>
-  <section id='sag-pam_env-services'>
+  <section id='sag-pam_env-types'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../modules/pam_env/pam_env.8.xml" xpointer='xpointer(//refsect1[@id = "pam_env-services"]/*)'/>
+     href="../../modules/pam_env/pam_env.8.xml" xpointer='xpointer(//refsect1[@id = "pam_env-types"]/*)'/>
   </section>
   <section id='sag-pam_env-return_values'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--- Linux-PAM-1.0/doc/sag/pam_exec.xml	2006-10-13 13:33:18.000000000 +0200
+++ Linux-PAM/doc/sag/pam_exec.xml	2008-08-20 20:56:22.000000000 +0200
@@ -15,9 +15,9 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
      href="../../modules/pam_exec/pam_exec.8.xml" xpointer='xpointer(//refsect1[@id = "pam_exec-options"]/*)'/>
   </section>
-  <section id='sag-pam_exec-services'>
+  <section id='sag-pam_exec-types'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../modules/pam_exec/pam_exec.8.xml" xpointer='xpointer(//refsect1[@id = "pam_exec-services"]/*)'/>
+     href="../../modules/pam_exec/pam_exec.8.xml" xpointer='xpointer(//refsect1[@id = "pam_exec-types"]/*)'/>
   </section>
   <section id='sag-pam_exec-return_values'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--- Linux-PAM-1.0/doc/sag/pam_faildelay.xml	2006-11-08 12:21:41.000000000 +0100
+++ Linux-PAM/doc/sag/pam_faildelay.xml	2008-08-20 20:56:22.000000000 +0200
@@ -15,9 +15,9 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
      href="../../modules/pam_faildelay/pam_faildelay.8.xml" xpointer='xpointer(//refsect1[@id = "pam_faildelay-options"]/*)'/>
   </section>
-  <section id='sag-pam_faildelay-services'>
+  <section id='sag-pam_faildelay-types'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../modules/pam_faildelay/pam_faildelay.8.xml" xpointer='xpointer(//refsect1[@id = "pam_faildelay-services"]/*)'/>
+     href="../../modules/pam_faildelay/pam_faildelay.8.xml" xpointer='xpointer(//refsect1[@id = "pam_faildelay-types"]/*)'/>
   </section>
   <section id='sag-pam_faildelay-return_values'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--- Linux-PAM-1.0/doc/sag/pam_filter.xml	2006-06-28 14:01:13.000000000 +0200
+++ Linux-PAM/doc/sag/pam_filter.xml	2008-08-20 20:56:22.000000000 +0200
@@ -15,9 +15,9 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
      href="../../modules/pam_filter/pam_filter.8.xml" xpointer='xpointer(//refsect1[@id = "pam_filter-options"]/*)'/>
   </section>
-  <section id='sag-pam_filter-services'>
+  <section id='sag-pam_filter-types'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../modules/pam_filter/pam_filter.8.xml" xpointer='xpointer(//refsect1[@id = "pam_filter-services"]/*)'/>
+     href="../../modules/pam_filter/pam_filter.8.xml" xpointer='xpointer(//refsect1[@id = "pam_filter-types"]/*)'/>
   </section>
   <section id='sag-pam_filter-return_values'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--- Linux-PAM-1.0/doc/sag/pam_ftp.xml	2006-06-28 14:01:13.000000000 +0200
+++ Linux-PAM/doc/sag/pam_ftp.xml	2008-08-20 20:56:22.000000000 +0200
@@ -15,9 +15,9 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
      href="../../modules/pam_ftp/pam_ftp.8.xml" xpointer='xpointer(//refsect1[@id = "pam_ftp-options"]/*)'/>
   </section>
-  <section id='sag-pam_ftp-services'>
+  <section id='sag-pam_ftp-types'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../modules/pam_ftp/pam_ftp.8.xml" xpointer='xpointer(//refsect1[@id = "pam_ftp-services"]/*)'/>
+     href="../../modules/pam_ftp/pam_ftp.8.xml" xpointer='xpointer(//refsect1[@id = "pam_ftp-types"]/*)'/>
   </section>
   <section id='sag-pam_ftp-return_values'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--- Linux-PAM-1.0/doc/sag/pam_group.xml	2006-10-13 13:33:18.000000000 +0200
+++ Linux-PAM/doc/sag/pam_group.xml	2008-08-20 20:56:22.000000000 +0200
@@ -19,9 +19,9 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
      href="../../modules/pam_group/pam_group.8.xml" xpointer='xpointer(//refsect1[@id = "pam_group-options"]/*)'/>
   </section>
-  <section id='sag-pam_group-services'>
+  <section id='sag-pam_group-types'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../modules/pam_group/pam_group.8.xml" xpointer='xpointer(//refsect1[@id = "pam_group-services"]/*)'/>
+     href="../../modules/pam_group/pam_group.8.xml" xpointer='xpointer(//refsect1[@id = "pam_group-types"]/*)'/>
   </section>
   <section id='sag-pam_group-return_values'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--- Linux-PAM-1.0/doc/sag/pam_issue.xml	2006-06-28 14:01:13.000000000 +0200
+++ Linux-PAM/doc/sag/pam_issue.xml	2008-08-20 20:56:22.000000000 +0200
@@ -15,9 +15,9 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
      href="../../modules/pam_issue/pam_issue.8.xml" xpointer='xpointer(//refsect1[@id = "pam_issue-options"]/*)'/>
   </section>
-  <section id='sag-pam_issue-services'>
+  <section id='sag-pam_issue-types'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../modules/pam_issue/pam_issue.8.xml" xpointer='xpointer(//refsect1[@id = "pam_issue-services"]/*)'/>
+     href="../../modules/pam_issue/pam_issue.8.xml" xpointer='xpointer(//refsect1[@id = "pam_issue-types"]/*)'/>
   </section>
   <section id='sag-pam_issue-return_values'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--- Linux-PAM-1.0/doc/sag/pam_keyinit.xml	2006-06-28 14:01:13.000000000 +0200
+++ Linux-PAM/doc/sag/pam_keyinit.xml	2008-08-20 20:56:22.000000000 +0200
@@ -15,9 +15,9 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
      href="../../modules/pam_keyinit/pam_keyinit.8.xml" xpointer='xpointer(//refsect1[@id = "pam_keyinit-options"]/*)'/>
   </section>
-  <section id='sag-pam_keyinit-services'>
+  <section id='sag-pam_keyinit-types'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../modules/pam_keyinit/pam_keyinit.8.xml" xpointer='xpointer(//refsect1[@id = "pam_keyinit-services"]/*)'/>
+     href="../../modules/pam_keyinit/pam_keyinit.8.xml" xpointer='xpointer(//refsect1[@id = "pam_keyinit-types"]/*)'/>
   </section>
   <section id='sag-pam_keyinit-return_values'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--- Linux-PAM-1.0/doc/sag/pam_lastlog.xml	2006-06-28 14:01:13.000000000 +0200
+++ Linux-PAM/doc/sag/pam_lastlog.xml	2008-08-20 20:56:22.000000000 +0200
@@ -15,9 +15,9 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
      href="../../modules/pam_lastlog/pam_lastlog.8.xml" xpointer='xpointer(//refsect1[@id = "pam_lastlog-options"]/*)'/>
   </section>
-  <section id='sag-pam_lastlog-services'>
+  <section id='sag-pam_lastlog-types'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../modules/pam_lastlog/pam_lastlog.8.xml" xpointer='xpointer(//refsect1[@id = "pam_lastlog-services"]/*)'/>
+     href="../../modules/pam_lastlog/pam_lastlog.8.xml" xpointer='xpointer(//refsect1[@id = "pam_lastlog-types"]/*)'/>
   </section>
   <section id='sag-pam_lastlog-return_values'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--- Linux-PAM-1.0/doc/sag/pam_limits.xml	2006-10-13 13:33:18.000000000 +0200
+++ Linux-PAM/doc/sag/pam_limits.xml	2008-08-20 20:56:22.000000000 +0200
@@ -19,9 +19,9 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
      href="../../modules/pam_limits/pam_limits.8.xml" xpointer='xpointer(//refsect1[@id = "pam_limits-options"]/*)'/>
   </section>
-  <section id='sag-pam_limits-services'>
+  <section id='sag-pam_limits-types'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../modules/pam_limits/pam_limits.8.xml" xpointer='xpointer(//refsect1[@id = "pam_limits-services"]/*)'/>
+     href="../../modules/pam_limits/pam_limits.8.xml" xpointer='xpointer(//refsect1[@id = "pam_limits-types"]/*)'/>
   </section>
   <section id='sag-pam_limits-return_values'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--- Linux-PAM-1.0/doc/sag/pam_listfile.xml	2006-06-28 14:01:13.000000000 +0200
+++ Linux-PAM/doc/sag/pam_listfile.xml	2008-08-20 20:56:22.000000000 +0200
@@ -15,9 +15,9 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
      href="../../modules/pam_listfile/pam_listfile.8.xml" xpointer='xpointer(//refsect1[@id = "pam_listfile-options"]/*)'/>
   </section>
-  <section id='sag-pam_listfile-services'>
+  <section id='sag-pam_listfile-types'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../modules/pam_listfile/pam_listfile.8.xml" xpointer='xpointer(//refsect1[@id = "pam_listfile-services"]/*)'/>
+     href="../../modules/pam_listfile/pam_listfile.8.xml" xpointer='xpointer(//refsect1[@id = "pam_listfile-types"]/*)'/>
   </section>
   <section id='sag-pam_listfile-return_values'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--- Linux-PAM-1.0/doc/sag/pam_localuser.xml	2006-06-28 14:01:13.000000000 +0200
+++ Linux-PAM/doc/sag/pam_localuser.xml	2008-08-20 20:56:22.000000000 +0200
@@ -15,9 +15,9 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
      href="../../modules/pam_localuser/pam_localuser.8.xml" xpointer='xpointer(//refsect1[@id = "pam_localuser-options"]/*)'/>
   </section>
-  <section id='sag-pam_localuser-services'>
+  <section id='sag-pam_localuser-types'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../modules/pam_localuser/pam_localuser.8.xml" xpointer='xpointer(//refsect1[@id = "pam_localuser-services"]/*)'/>
+     href="../../modules/pam_localuser/pam_localuser.8.xml" xpointer='xpointer(//refsect1[@id = "pam_localuser-types"]/*)'/>
   </section>
   <section id='sag-pam_localuser-return_values'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--- Linux-PAM-1.0/doc/sag/pam_loginuid.xml	2006-08-29 18:21:31.000000000 +0200
+++ Linux-PAM/doc/sag/pam_loginuid.xml	2008-08-20 20:56:22.000000000 +0200
@@ -15,9 +15,9 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
      href="../../modules/pam_loginuid/pam_loginuid.8.xml" xpointer='xpointer(//refsect1[@id = "pam_loginuid-options"]/*)'/>
   </section>
-  <section id='sag-pam_loginuid-services'>
+  <section id='sag-pam_loginuid-types'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../modules/pam_loginuid/pam_loginuid.8.xml" xpointer='xpointer(//refsect1[@id = "pam_loginuid-services"]/*)'/>
+     href="../../modules/pam_loginuid/pam_loginuid.8.xml" xpointer='xpointer(//refsect1[@id = "pam_loginuid-types"]/*)'/>
   </section>
   <section id='sag-pam_loginuid-return_values'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--- Linux-PAM-1.0/doc/sag/pam_mail.xml	2006-06-28 14:01:14.000000000 +0200
+++ Linux-PAM/doc/sag/pam_mail.xml	2008-08-20 20:56:22.000000000 +0200
@@ -15,9 +15,9 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
      href="../../modules/pam_mail/pam_mail.8.xml" xpointer='xpointer(//refsect1[@id = "pam_mail-options"]/*)'/>
   </section>
-  <section id='sag-pam_mail-services'>
+  <section id='sag-pam_mail-types'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../modules/pam_mail/pam_mail.8.xml" xpointer='xpointer(//refsect1[@id = "pam_mail-services"]/*)'/>
+     href="../../modules/pam_mail/pam_mail.8.xml" xpointer='xpointer(//refsect1[@id = "pam_mail-types"]/*)'/>
   </section>
   <section id='sag-pam_mail-return_values'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--- Linux-PAM-1.0/doc/sag/pam_mkhomedir.xml	2006-06-28 14:01:14.000000000 +0200
+++ Linux-PAM/doc/sag/pam_mkhomedir.xml	2008-08-20 20:56:22.000000000 +0200
@@ -15,9 +15,9 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
      href="../../modules/pam_mkhomedir/pam_mkhomedir.8.xml" xpointer='xpointer(//refsect1[@id = "pam_mkhomedir-options"]/*)'/>
   </section>
-  <section id='sag-pam_mkhomedir-services'>
+  <section id='sag-pam_mkhomedir-types'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../modules/pam_mkhomedir/pam_mkhomedir.8.xml" xpointer='xpointer(//refsect1[@id = "pam_mkhomedir-services"]/*)'/>
+     href="../../modules/pam_mkhomedir/pam_mkhomedir.8.xml" xpointer='xpointer(//refsect1[@id = "pam_mkhomedir-types"]/*)'/>
   </section>
   <section id='sag-pam_mkhomedir-return_values'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--- Linux-PAM-1.0/doc/sag/pam_motd.xml	2006-06-28 14:01:14.000000000 +0200
+++ Linux-PAM/doc/sag/pam_motd.xml	2008-08-20 20:56:23.000000000 +0200
@@ -15,9 +15,9 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
      href="../../modules/pam_motd/pam_motd.8.xml" xpointer='xpointer(//refsect1[@id = "pam_motd-options"]/*)'/>
   </section>
-  <section id='sag-pam_motd-services'>
+  <section id='sag-pam_motd-types'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../modules/pam_motd/pam_motd.8.xml" xpointer='xpointer(//refsect1[@id = "pam_motd-services"]/*)'/>
+     href="../../modules/pam_motd/pam_motd.8.xml" xpointer='xpointer(//refsect1[@id = "pam_motd-types"]/*)'/>
   </section>
   <section id='sag-pam_motd-return_values'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--- Linux-PAM-1.0/doc/sag/pam_namespace.xml	2006-10-13 13:33:18.000000000 +0200
+++ Linux-PAM/doc/sag/pam_namespace.xml	2008-08-20 20:56:23.000000000 +0200
@@ -19,9 +19,9 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
      href="../../modules/pam_namespace/pam_namespace.8.xml" xpointer='xpointer(//refsect1[@id = "pam_namespace-options"]/*)'/>
   </section>
-  <section id='sag-pam_namespace-services'>
+  <section id='sag-pam_namespace-types'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../modules/pam_namespace/pam_namespace.8.xml" xpointer='xpointer(//refsect1[@id = "pam_namespace-services"]/*)'/>
+     href="../../modules/pam_namespace/pam_namespace.8.xml" xpointer='xpointer(//refsect1[@id = "pam_namespace-types"]/*)'/>
   </section>
   <section id='sag-pam_namespace-return_values'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--- Linux-PAM-1.0/doc/sag/pam_nologin.xml	2006-06-28 14:01:14.000000000 +0200
+++ Linux-PAM/doc/sag/pam_nologin.xml	2008-08-20 20:56:23.000000000 +0200
@@ -15,9 +15,9 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
      href="../../modules/pam_nologin/pam_nologin.8.xml" xpointer='xpointer(//refsect1[@id = "pam_nologin-options"]/*)'/>
   </section>
-  <section id='sag-pam_nologin-services'>
+  <section id='sag-pam_nologin-types'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../modules/pam_nologin/pam_nologin.8.xml" xpointer='xpointer(//refsect1[@id = "pam_nologin-services"]/*)'/>
+     href="../../modules/pam_nologin/pam_nologin.8.xml" xpointer='xpointer(//refsect1[@id = "pam_nologin-types"]/*)'/>
   </section>
   <section id='sag-pam_nologin-return_values'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--- Linux-PAM-1.0/doc/sag/pam_permit.xml	2006-06-28 14:01:14.000000000 +0200
+++ Linux-PAM/doc/sag/pam_permit.xml	2008-08-20 20:56:23.000000000 +0200
@@ -15,9 +15,9 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
      href="../../modules/pam_permit/pam_permit.8.xml" xpointer='xpointer(//refsect1[@id = "pam_permit-options"]/*)'/>
   </section>
-  <section id='sag-pam_permit-services'>
+  <section id='sag-pam_permit-types'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../modules/pam_permit/pam_permit.8.xml" xpointer='xpointer(//refsect1[@id = "pam_permit-services"]/*)'/>
+     href="../../modules/pam_permit/pam_permit.8.xml" xpointer='xpointer(//refsect1[@id = "pam_permit-types"]/*)'/>
   </section>
   <section id='sag-pam_permit-return_values'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--- Linux-PAM-1.0/doc/sag/pam_rhosts.xml	2006-06-28 14:01:14.000000000 +0200
+++ Linux-PAM/doc/sag/pam_rhosts.xml	2008-08-20 20:56:23.000000000 +0200
@@ -15,9 +15,9 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
      href="../../modules/pam_rhosts/pam_rhosts.8.xml" xpointer='xpointer(//refsect1[@id = "pam_rhosts-options"]/*)'/>
   </section>
-  <section id='sag-pam_rhosts-services'>
+  <section id='sag-pam_rhosts-types'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../modules/pam_rhosts/pam_rhosts.8.xml" xpointer='xpointer(//refsect1[@id = "pam_rhosts-services"]/*)'/>
+     href="../../modules/pam_rhosts/pam_rhosts.8.xml" xpointer='xpointer(//refsect1[@id = "pam_rhosts-types"]/*)'/>
   </section>
   <section id='sag-pam_rhosts-return_values'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--- Linux-PAM-1.0/doc/sag/pam_rootok.xml	2006-06-28 14:01:14.000000000 +0200
+++ Linux-PAM/doc/sag/pam_rootok.xml	2008-08-20 20:56:23.000000000 +0200
@@ -15,9 +15,9 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
      href="../../modules/pam_rootok/pam_rootok.8.xml" xpointer='xpointer(//refsect1[@id = "pam_rootok-options"]/*)'/>
   </section>
-  <section id='sag-pam_rootok-services'>
+  <section id='sag-pam_rootok-types'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../modules/pam_rootok/pam_rootok.8.xml" xpointer='xpointer(//refsect1[@id = "pam_rootok-services"]/*)'/>
+     href="../../modules/pam_rootok/pam_rootok.8.xml" xpointer='xpointer(//refsect1[@id = "pam_rootok-types"]/*)'/>
   </section>
   <section id='sag-pam_rootok-return_values'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--- Linux-PAM-1.0/doc/sag/pam_securetty.xml	2006-06-28 14:01:14.000000000 +0200
+++ Linux-PAM/doc/sag/pam_securetty.xml	2008-08-20 20:56:23.000000000 +0200
@@ -15,9 +15,9 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
      href="../../modules/pam_securetty/pam_securetty.8.xml" xpointer='xpointer(//refsect1[@id = "pam_securetty-options"]/*)'/>
   </section>
-  <section id='sag-pam_securetty-services'>
+  <section id='sag-pam_securetty-types'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../modules/pam_securetty/pam_securetty.8.xml" xpointer='xpointer(//refsect1[@id = "pam_securetty-services"]/*)'/>
+     href="../../modules/pam_securetty/pam_securetty.8.xml" xpointer='xpointer(//refsect1[@id = "pam_securetty-types"]/*)'/>
   </section>
   <section id='sag-pam_securetty-return_values'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--- Linux-PAM-1.0/doc/sag/pam_sepermit.xml	2008-01-29 16:38:35.000000000 +0100
+++ Linux-PAM/doc/sag/pam_sepermit.xml	2008-08-20 20:56:23.000000000 +0200
@@ -15,9 +15,9 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
      href="../../modules/pam_sepermit/pam_sepermit.8.xml" xpointer='xpointer(//refsect1[@id = "pam_sepermit-options"]/*)'/>
   </section>
-  <section id='sag-pam_sepermit-services'>
+  <section id='sag-pam_sepermit-types'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../modules/pam_sepermit/pam_sepermit.8.xml" xpointer='xpointer(//refsect1[@id = "pam_sepermit-services"]/*)'/>
+     href="../../modules/pam_sepermit/pam_sepermit.8.xml" xpointer='xpointer(//refsect1[@id = "pam_sepermit-types"]/*)'/>
   </section>
   <section id='sag-pam_sepermit-return_values'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--- Linux-PAM-1.0/doc/sag/pam_shells.xml	2006-06-28 14:01:14.000000000 +0200
+++ Linux-PAM/doc/sag/pam_shells.xml	2008-08-20 20:56:23.000000000 +0200
@@ -15,9 +15,9 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
      href="../../modules/pam_shells/pam_shells.8.xml" xpointer='xpointer(//refsect1[@id = "pam_shells-options"]/*)'/>
   </section>
-  <section id='sag-pam_shells-services'>
+  <section id='sag-pam_shells-types'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../modules/pam_shells/pam_shells.8.xml" xpointer='xpointer(//refsect1[@id = "pam_shells-services"]/*)'/>
+     href="../../modules/pam_shells/pam_shells.8.xml" xpointer='xpointer(//refsect1[@id = "pam_shells-types"]/*)'/>
   </section>
   <section id='sag-pam_shells-return_values'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--- Linux-PAM-1.0/doc/sag/pam_succeed_if.xml	2006-06-28 14:01:14.000000000 +0200
+++ Linux-PAM/doc/sag/pam_succeed_if.xml	2008-08-20 20:56:23.000000000 +0200
@@ -15,9 +15,9 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
      href="../../modules/pam_succeed_if/pam_succeed_if.8.xml" xpointer='xpointer(//refsect1[@id = "pam_succeed_if-options"]/*)'/>
   </section>
-  <section id='sag-pam_succeed_if-services'>
+  <section id='sag-pam_succeed_if-types'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../modules/pam_succeed_if/pam_succeed_if.8.xml" xpointer='xpointer(//refsect1[@id = "pam_succeed_if-services"]/*)'/>
+     href="../../modules/pam_succeed_if/pam_succeed_if.8.xml" xpointer='xpointer(//refsect1[@id = "pam_succeed_if-types"]/*)'/>
   </section>
   <section id='sag-pam_succeed_if-return_values'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--- Linux-PAM-1.0/doc/sag/pam_tally.xml	2006-06-28 14:01:14.000000000 +0200
+++ Linux-PAM/doc/sag/pam_tally.xml	2008-08-20 20:56:23.000000000 +0200
@@ -19,9 +19,9 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
      href="../../modules/pam_tally/pam_tally.8.xml" xpointer='xpointer(//refsect1[@id = "pam_tally-options"]/*)'/>
   </section>
-  <section id='sag-pam_tally-services'>
+  <section id='sag-pam_tally-types'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../modules/pam_tally/pam_tally.8.xml" xpointer='xpointer(//refsect1[@id = "pam_tally-services"]/*)'/>
+     href="../../modules/pam_tally/pam_tally.8.xml" xpointer='xpointer(//refsect1[@id = "pam_tally-types"]/*)'/>
   </section>
   <section id='sag-pam_tally-return_values'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--- Linux-PAM-1.0/doc/sag/pam_time.xml	2006-10-13 13:33:18.000000000 +0200
+++ Linux-PAM/doc/sag/pam_time.xml	2008-08-20 20:56:23.000000000 +0200
@@ -19,9 +19,9 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
      href="../../modules/pam_time/pam_time.8.xml" xpointer='xpointer(//refsect1[@id = "pam_time-options"]/*)'/>
   </section>
-  <section id='sag-pam_time-services'>
+  <section id='sag-pam_time-types'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../modules/pam_time/pam_time.8.xml" xpointer='xpointer(//refsect1[@id = "pam_time-services"]/*)'/>
+     href="../../modules/pam_time/pam_time.8.xml" xpointer='xpointer(//refsect1[@id = "pam_time-types"]/*)'/>
   </section>
   <section id='sag-pam_time-return_values'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--- Linux-PAM-1.0/doc/sag/pam_tty_audit.xml	2008-01-29 16:38:35.000000000 +0100
+++ Linux-PAM/doc/sag/pam_tty_audit.xml	2008-08-20 20:56:23.000000000 +0200
@@ -15,9 +15,9 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
      href="../../modules/pam_tty_audit/pam_tty_audit.8.xml" xpointer='xpointer(//refsect1[@id = "pam_tty_audit-options"]/*)'/>
   </section>
-  <section id='sag-pam_tty_audit-services'>
+  <section id='sag-pam_tty_audit-types'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../modules/pam_tty_audit/pam_tty_audit.8.xml" xpointer='xpointer(//refsect1[@id = "pam_tty_audit-services"]/*)'/>
+     href="../../modules/pam_tty_audit/pam_tty_audit.8.xml" xpointer='xpointer(//refsect1[@id = "pam_tty_audit-types"]/*)'/>
   </section>
   <section id='sag-pam_tty_audit-return_values'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--- Linux-PAM-1.0/doc/sag/pam_umask.xml	2006-06-28 14:01:14.000000000 +0200
+++ Linux-PAM/doc/sag/pam_umask.xml	2008-08-20 20:56:23.000000000 +0200
@@ -15,9 +15,9 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
      href="../../modules/pam_umask/pam_umask.8.xml" xpointer='xpointer(//refsect1[@id = "pam_umask-options"]/*)'/>
   </section>
-  <section id='sag-pam_umask-services'>
+  <section id='sag-pam_umask-types'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../modules/pam_umask/pam_umask.8.xml" xpointer='xpointer(//refsect1[@id = "pam_umask-services"]/*)'/>
+     href="../../modules/pam_umask/pam_umask.8.xml" xpointer='xpointer(//refsect1[@id = "pam_umask-types"]/*)'/>
   </section>
   <section id='sag-pam_umask-return_values'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--- Linux-PAM-1.0/doc/sag/pam_unix.xml	2006-09-20 15:46:03.000000000 +0200
+++ Linux-PAM/doc/sag/pam_unix.xml	2008-08-20 20:56:23.000000000 +0200
@@ -15,9 +15,9 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
      href="../../modules/pam_unix/pam_unix.8.xml" xpointer='xpointer(//refsect1[@id = "pam_unix-options"]/*)'/>
   </section>
-  <section id='sag-pam_unix-services'>
+  <section id='sag-pam_unix-types'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../modules/pam_unix/pam_unix.8.xml" xpointer='xpointer(//refsect1[@id = "pam_unix-services"]/*)'/>
+     href="../../modules/pam_unix/pam_unix.8.xml" xpointer='xpointer(//refsect1[@id = "pam_unix-types"]/*)'/>
   </section>
   <section id='sag-pam_unix-return_values'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--- Linux-PAM-1.0/doc/sag/pam_userdb.xml	2006-06-28 14:01:14.000000000 +0200
+++ Linux-PAM/doc/sag/pam_userdb.xml	2008-08-20 20:56:23.000000000 +0200
@@ -15,9 +15,9 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
      href="../../modules/pam_userdb/pam_userdb.8.xml" xpointer='xpointer(//refsect1[@id = "pam_userdb-options"]/*)'/>
   </section>
-  <section id='sag-pam_userdb-services'>
+  <section id='sag-pam_userdb-types'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../modules/pam_userdb/pam_userdb.8.xml" xpointer='xpointer(//refsect1[@id = "pam_userdb-services"]/*)'/>
+     href="../../modules/pam_userdb/pam_userdb.8.xml" xpointer='xpointer(//refsect1[@id = "pam_userdb-types"]/*)'/>
   </section>
   <section id='sag-pam_userdb-return_values'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--- Linux-PAM-1.0/doc/sag/pam_warn.xml	2006-06-28 14:01:14.000000000 +0200
+++ Linux-PAM/doc/sag/pam_warn.xml	2008-08-20 20:56:23.000000000 +0200
@@ -15,9 +15,9 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
      href="../../modules/pam_warn/pam_warn.8.xml" xpointer='xpointer(//refsect1[@id = "pam_warn-options"]/*)'/>
   </section>
-  <section id='sag-pam_warn-services'>
+  <section id='sag-pam_warn-types'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../modules/pam_warn/pam_warn.8.xml" xpointer='xpointer(//refsect1[@id = "pam_warn-services"]/*)'/>
+     href="../../modules/pam_warn/pam_warn.8.xml" xpointer='xpointer(//refsect1[@id = "pam_warn-types"]/*)'/>
   </section>
   <section id='sag-pam_warn-return_values'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--- Linux-PAM-1.0/doc/sag/pam_wheel.xml	2006-06-28 14:01:14.000000000 +0200
+++ Linux-PAM/doc/sag/pam_wheel.xml	2008-08-20 20:56:23.000000000 +0200
@@ -15,9 +15,9 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
      href="../../modules/pam_wheel/pam_wheel.8.xml" xpointer='xpointer(//refsect1[@id = "pam_wheel-options"]/*)'/>
   </section>
-  <section id='sag-pam_wheel-services'>
+  <section id='sag-pam_wheel-types'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../modules/pam_wheel/pam_wheel.8.xml" xpointer='xpointer(//refsect1[@id = "pam_wheel-services"]/*)'/>
+     href="../../modules/pam_wheel/pam_wheel.8.xml" xpointer='xpointer(//refsect1[@id = "pam_wheel-types"]/*)'/>
   </section>
   <section id='sag-pam_wheel-return_values'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--- Linux-PAM-1.0/doc/sag/pam_xauth.xml	2006-06-28 14:01:14.000000000 +0200
+++ Linux-PAM/doc/sag/pam_xauth.xml	2008-08-20 20:56:24.000000000 +0200
@@ -15,9 +15,9 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
      href="../../modules/pam_xauth/pam_xauth.8.xml" xpointer='xpointer(//refsect1[@id = "pam_xauth-options"]/*)'/>
   </section>
-  <section id='sag-pam_xauth-services'>
+  <section id='sag-pam_xauth-types'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../modules/pam_xauth/pam_xauth.8.xml" xpointer='xpointer(//refsect1[@id = "pam_xauth-services"]/*)'/>
+     href="../../modules/pam_xauth/pam_xauth.8.xml" xpointer='xpointer(//refsect1[@id = "pam_xauth-types"]/*)'/>
   </section>
   <section id='sag-pam_xauth-return_values'>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--- Linux-PAM-1.0/modules/pam_access/pam_access.8.xml	2007-12-07 16:40:01.000000000 +0100
+++ Linux-PAM/modules/pam_access/pam_access.8.xml	2008-08-20 20:56:24.000000000 +0200
@@ -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>
 
@@ -231,7 +232,7 @@
         <refentrytitle>access.conf</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
       <citerefentry>
-        <refentrytitle>pam.d</refentrytitle><manvolnum>8</manvolnum>
+        <refentrytitle>pam.d</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
       <citerefentry>
         <refentrytitle>pam</refentrytitle><manvolnum>8</manvolnum>
--- Linux-PAM-1.0/modules/pam_cracklib/pam_cracklib.8.xml	2007-11-06 15:58:54.000000000 +0100
+++ Linux-PAM/modules/pam_cracklib/pam_cracklib.8.xml	2008-08-20 20:56:25.000000000 +0200
@@ -281,7 +281,7 @@
               than 10.
             </para>
             <para>
-              (N &gt; 0) This is the minimum number of upper
+              (N &lt; 0) This is the minimum number of upper
               case letters that must be met for a new password.
             </para>
           </listitem>
@@ -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 he <option>password</option> service is supported.
+      Only the <option>password</option> module type is provided.
     </para>
   </refsect1>
 
@@ -495,7 +495,7 @@
 	<refentrytitle>pam.conf</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
       <citerefentry>
-	<refentrytitle>pam.d</refentrytitle><manvolnum>8</manvolnum>
+	<refentrytitle>pam.d</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
       <citerefentry>
 	<refentrytitle>pam</refentrytitle><manvolnum>8</manvolnum>
--- Linux-PAM-1.0/modules/pam_debug/pam_debug.8.xml	2006-06-17 19:20:40.000000000 +0200
+++ Linux-PAM/modules/pam_debug/pam_debug.8.xml	2008-08-20 20:56:25.000000000 +0200
@@ -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>
 
@@ -213,7 +213,7 @@
 	<refentrytitle>pam.conf</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
       <citerefentry>
-	<refentrytitle>pam.d</refentrytitle><manvolnum>8</manvolnum>
+	<refentrytitle>pam.d</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
       <citerefentry>
 	<refentrytitle>pam</refentrytitle><manvolnum>8</manvolnum>
--- Linux-PAM-1.0/modules/pam_deny/pam_deny.8.xml	2007-11-06 15:58:54.000000000 +0100
+++ Linux-PAM/modules/pam_deny/pam_deny.8.xml	2008-08-20 20:56:25.000000000 +0200
@@ -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>
 
@@ -117,7 +117,7 @@
 	<refentrytitle>pam.conf</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
       <citerefentry>
-	<refentrytitle>pam.d</refentrytitle><manvolnum>8</manvolnum>
+	<refentrytitle>pam.d</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
       <citerefentry>
 	<refentrytitle>pam</refentrytitle><manvolnum>8</manvolnum>
--- Linux-PAM-1.0/modules/pam_echo/pam_echo.8.xml	2006-06-22 21:44:30.000000000 +0200
+++ Linux-PAM/modules/pam_echo/pam_echo.8.xml	2008-08-20 20:56:25.000000000 +0200
@@ -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>
 
@@ -154,7 +156,7 @@
       <refentrytitle>pam.conf</refentrytitle><manvolnum>8</manvolnum>
     </citerefentry>,
     <citerefentry>
-      <refentrytitle>pam.d</refentrytitle><manvolnum>8</manvolnum>
+      <refentrytitle>pam.d</refentrytitle><manvolnum>5</manvolnum>
     </citerefentry>,
     <citerefentry>
       <refentrytitle>pam</refentrytitle><manvolnum>8</manvolnum>
--- Linux-PAM-1.0/modules/pam_env/environment	2006-09-01 13:37:13.000000000 +0200
+++ Linux-PAM/modules/pam_env/environment	2008-08-01 14:10:43.000000000 +0200
@@ -1,5 +1,5 @@
 #
 # This file is parsed by pam_env module
 #
-# Syntax: simple "KEY=VAL" pairs on seperate lines
+# Syntax: simple "KEY=VAL" pairs on separate lines
 #
--- Linux-PAM-1.0/modules/pam_env/pam_env.8.xml	2006-06-22 21:44:30.000000000 +0200
+++ Linux-PAM/modules/pam_env/pam_env.8.xml	2008-08-20 20:56:25.000000000 +0200
@@ -53,7 +53,7 @@
     </para>
     <para>
       This module can also parse a file with simple
-      <emphasis>KEY=VAL</emphasis> pairs on seperate lines
+      <emphasis>KEY=VAL</emphasis> pairs on separate lines
       (<filename>/etc/environment</filename> by default). You can
       change the default file to parse, with the <emphasis>envfile</emphasis>
       flag and turn it on or off by setting the <emphasis>readenv</emphasis>
@@ -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>
 
@@ -189,7 +189,7 @@
         <refentrytitle>pam_env.conf</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
       <citerefentry>
-        <refentrytitle>pam.d</refentrytitle><manvolnum>8</manvolnum>
+        <refentrytitle>pam.d</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
       <citerefentry>
         <refentrytitle>pam</refentrytitle><manvolnum>8</manvolnum>
--- Linux-PAM-1.0/modules/pam_exec/pam_exec.8.xml	2008-02-04 16:27:31.000000000 +0100
+++ Linux-PAM/modules/pam_exec/pam_exec.8.xml	2008-08-20 20:56:25.000000000 +0200
@@ -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>
 
@@ -199,7 +199,7 @@
 	<refentrytitle>pam.conf</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
       <citerefentry>
-	<refentrytitle>pam.d</refentrytitle><manvolnum>8</manvolnum>
+	<refentrytitle>pam.d</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
       <citerefentry>
 	<refentrytitle>pam</refentrytitle><manvolnum>8</manvolnum>
--- Linux-PAM-1.0/modules/pam_faildelay/pam_faildelay.8.xml	2006-12-07 13:34:00.000000000 +0100
+++ Linux-PAM/modules/pam_faildelay/pam_faildelay.8.xml	2008-08-20 20:56:25.000000000 +0200
@@ -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>
 
@@ -118,7 +118,7 @@
 	<refentrytitle>pam.conf</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
       <citerefentry>
-	<refentrytitle>pam.d</refentrytitle><manvolnum>8</manvolnum>
+	<refentrytitle>pam.d</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
       <citerefentry>
 	<refentrytitle>pam</refentrytitle><manvolnum>8</manvolnum>
--- Linux-PAM-1.0/modules/pam_filter/pam_filter.8.xml	2006-06-09 18:44:06.000000000 +0200
+++ Linux-PAM/modules/pam_filter/pam_filter.8.xml	2008-08-20 20:56:26.000000000 +0200
@@ -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>
 
@@ -243,7 +243,7 @@
 	<refentrytitle>pam.conf</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
       <citerefentry>
-	<refentrytitle>pam.d</refentrytitle><manvolnum>8</manvolnum>
+	<refentrytitle>pam.d</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
       <citerefentry>
 	<refentrytitle>pam</refentrytitle><manvolnum>8</manvolnum>
--- Linux-PAM-1.0/modules/pam_ftp/pam_ftp.8.xml	2006-06-09 18:44:06.000000000 +0200
+++ Linux-PAM/modules/pam_ftp/pam_ftp.8.xml	2008-08-20 20:56:26.000000000 +0200
@@ -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>
 
@@ -165,7 +165,7 @@
 	<refentrytitle>pam.conf</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
       <citerefentry>
-	<refentrytitle>pam.d</refentrytitle><manvolnum>8</manvolnum>
+	<refentrytitle>pam.d</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
       <citerefentry>
 	<refentrytitle>pam</refentrytitle><manvolnum>8</manvolnum>
--- Linux-PAM-1.0/modules/pam_group/pam_group.8.xml	2007-11-06 15:58:54.000000000 +0100
+++ Linux-PAM/modules/pam_group/pam_group.8.xml	2008-08-20 20:56:26.000000000 +0200
@@ -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>
 
@@ -145,7 +145,7 @@
         <refentrytitle>group.conf</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
       <citerefentry>
-        <refentrytitle>pam.d</refentrytitle><manvolnum>8</manvolnum>
+        <refentrytitle>pam.d</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
       <citerefentry>
         <refentrytitle>pam</refentrytitle><manvolnum>8</manvolnum>
--- Linux-PAM-1.0/modules/pam_issue/pam_issue.8.xml	2006-06-21 08:35:25.000000000 +0200
+++ Linux-PAM/modules/pam_issue/pam_issue.8.xml	2008-08-20 20:56:26.000000000 +0200
@@ -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>
 
@@ -216,7 +216,7 @@
 	<refentrytitle>pam.conf</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
       <citerefentry>
-	<refentrytitle>pam.d</refentrytitle><manvolnum>8</manvolnum>
+	<refentrytitle>pam.d</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
       <citerefentry>
 	<refentrytitle>pam</refentrytitle><manvolnum>8</manvolnum>
--- Linux-PAM-1.0/modules/pam_keyinit/pam_keyinit.8.xml	2006-06-27 14:34:07.000000000 +0200
+++ Linux-PAM/modules/pam_keyinit/pam_keyinit.8.xml	2008-08-20 20:56:26.000000000 +0200
@@ -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>
 
@@ -220,7 +220,7 @@
 	<refentrytitle>pam.conf</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
       <citerefentry>
-	<refentrytitle>pam.d</refentrytitle><manvolnum>8</manvolnum>
+	<refentrytitle>pam.d</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
       <citerefentry>
 	<refentrytitle>pam</refentrytitle><manvolnum>8</manvolnum>
--- Linux-PAM-1.0/modules/pam_limits/pam_limits.8.xml	2007-12-07 16:40:02.000000000 +0100
+++ Linux-PAM/modules/pam_limits/pam_limits.8.xml	2008-08-20 20:56:26.000000000 +0200
@@ -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>
 
@@ -239,7 +239,7 @@
         <refentrytitle>limits.conf</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
       <citerefentry>
-        <refentrytitle>pam.d</refentrytitle><manvolnum>8</manvolnum>
+        <refentrytitle>pam.d</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
       <citerefentry>
         <refentrytitle>pam</refentrytitle><manvolnum>8</manvolnum>
--- Linux-PAM-1.0/modules/pam_listfile/pam_listfile.8.xml	2007-11-06 15:58:54.000000000 +0100
+++ Linux-PAM/modules/pam_listfile/pam_listfile.8.xml	2008-08-20 20:56:27.000000000 +0200
@@ -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>
 
@@ -278,7 +278,7 @@
 	<refentrytitle>pam.conf</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
       <citerefentry>
-	<refentrytitle>pam.d</refentrytitle><manvolnum>8</manvolnum>
+	<refentrytitle>pam.d</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
       <citerefentry>
 	<refentrytitle>pam</refentrytitle><manvolnum>8</manvolnum>
--- Linux-PAM-1.0/modules/pam_localuser/pam_localuser.8.xml	2006-12-13 11:35:49.000000000 +0100
+++ Linux-PAM/modules/pam_localuser/pam_localuser.8.xml	2008-08-20 20:56:27.000000000 +0200
@@ -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>
 
@@ -155,7 +155,7 @@
 	<refentrytitle>pam.conf</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
       <citerefentry>
-	<refentrytitle>pam.d</refentrytitle><manvolnum>8</manvolnum>
+	<refentrytitle>pam.d</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
       <citerefentry>
 	<refentrytitle>pam</refentrytitle><manvolnum>8</manvolnum>
--- Linux-PAM-1.0/modules/pam_loginuid/pam_loginuid.8.xml	2006-09-01 15:17:47.000000000 +0200
+++ Linux-PAM/modules/pam_loginuid/pam_loginuid.8.xml	2008-08-20 20:56:27.000000000 +0200
@@ -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>
 
@@ -101,7 +101,7 @@
 	<refentrytitle>pam.conf</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
       <citerefentry>
-	<refentrytitle>pam.d</refentrytitle><manvolnum>8</manvolnum>
+	<refentrytitle>pam.d</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
       <citerefentry>
 	<refentrytitle>pam</refentrytitle><manvolnum>8</manvolnum>
--- Linux-PAM-1.0/modules/pam_mail/pam_mail.8.xml	2006-06-09 18:44:07.000000000 +0200
+++ Linux-PAM/modules/pam_mail/pam_mail.8.xml	2008-08-20 20:56:27.000000000 +0200
@@ -193,11 +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'>auth</emphasis> and
-      <emphasis remap='B'>account</emphasis> services are supported.
+      The <option>session</option> and
+      <option>auth</option> (on establishment and
+      deletion of credentials) module types are provided.
     </para>
   </refsect1>
 
@@ -261,7 +262,7 @@
 	<refentrytitle>pam.conf</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
       <citerefentry>
-	<refentrytitle>pam.d</refentrytitle><manvolnum>8</manvolnum>
+	<refentrytitle>pam.d</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
       <citerefentry>
 	<refentrytitle>pam</refentrytitle><manvolnum>8</manvolnum>
--- Linux-PAM-1.0/modules/pam_mkhomedir/pam_mkhomedir.8.xml	2006-05-30 15:03:09.000000000 +0200
+++ Linux-PAM/modules/pam_mkhomedir/pam_mkhomedir.8.xml	2008-08-20 20:56:27.000000000 +0200
@@ -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>
 
@@ -186,7 +186,7 @@
     <title>SEE ALSO</title>
     <para>
       <citerefentry>
-        <refentrytitle>pam.d</refentrytitle><manvolnum>8</manvolnum>
+        <refentrytitle>pam.d</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
       <citerefentry>
         <refentrytitle>pam</refentrytitle><manvolnum>8</manvolnum>
--- Linux-PAM-1.0/modules/pam_motd/pam_motd.8.xml	2006-10-26 15:51:51.000000000 +0200
+++ Linux-PAM/modules/pam_motd/pam_motd.8.xml	2008-08-20 20:56:27.000000000 +0200
@@ -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>
 
@@ -96,7 +96,7 @@
 	<refentrytitle>pam.conf</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
       <citerefentry>
-	<refentrytitle>pam.d</refentrytitle><manvolnum>8</manvolnum>
+	<refentrytitle>pam.d</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
       <citerefentry>
 	<refentrytitle>pam</refentrytitle><manvolnum>8</manvolnum>
--- Linux-PAM-1.0/modules/pam_namespace/pam_namespace.8.xml	2008-02-13 13:49:44.000000000 +0100
+++ Linux-PAM/modules/pam_namespace/pam_namespace.8.xml	2008-08-20 20:56:27.000000000 +0200
@@ -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>
 
@@ -365,7 +365,7 @@
         <refentrytitle>namespace.conf</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
       <citerefentry>
-        <refentrytitle>pam.d</refentrytitle><manvolnum>8</manvolnum>
+        <refentrytitle>pam.d</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
       <citerefentry>
         <refentrytitle>mount</refentrytitle><manvolnum>8</manvolnum>
--- Linux-PAM-1.0/modules/pam_nologin/pam_nologin.8.xml	2006-06-04 03:48:34.000000000 +0200
+++ Linux-PAM/modules/pam_nologin/pam_nologin.8.xml	2008-08-20 20:56:27.000000000 +0200
@@ -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>
 
@@ -156,7 +156,7 @@
 	<refentrytitle>pam.conf</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
       <citerefentry>
-	<refentrytitle>pam.d</refentrytitle><manvolnum>8</manvolnum>
+	<refentrytitle>pam.d</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
       <citerefentry>
 	<refentrytitle>pam</refentrytitle><manvolnum>8</manvolnum>
--- Linux-PAM-1.0/modules/pam_permit/pam_permit.8.xml	2007-11-06 15:58:54.000000000 +0100
+++ Linux-PAM/modules/pam_permit/pam_permit.8.xml	2008-08-20 20:56:27.000000000 +0200
@@ -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>
 
@@ -87,7 +88,7 @@
 	<refentrytitle>pam.conf</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
       <citerefentry>
-	<refentrytitle>pam.d</refentrytitle><manvolnum>8</manvolnum>
+	<refentrytitle>pam.d</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
       <citerefentry>
 	<refentrytitle>pam</refentrytitle><manvolnum>8</manvolnum>
--- Linux-PAM-1.0/modules/pam_rhosts/pam_rhosts.8.xml	2006-06-28 09:22:43.000000000 +0200
+++ Linux-PAM/modules/pam_rhosts/pam_rhosts.8.xml	2008-08-20 20:56:28.000000000 +0200
@@ -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>
 
@@ -153,7 +153,7 @@
 	<refentrytitle>pam.conf</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
       <citerefentry>
-	<refentrytitle>pam.d</refentrytitle><manvolnum>8</manvolnum>
+	<refentrytitle>pam.d</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
       <citerefentry>
 	<refentrytitle>pam</refentrytitle><manvolnum>8</manvolnum>
--- Linux-PAM-1.0/modules/pam_rootok/pam_rootok.8.xml	2006-06-04 14:11:16.000000000 +0200
+++ Linux-PAM/modules/pam_rootok/pam_rootok.8.xml	2008-08-20 20:56:28.000000000 +0200
@@ -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>
 
@@ -112,7 +112,7 @@
 	<refentrytitle>pam.conf</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
       <citerefentry>
-	<refentrytitle>pam.d</refentrytitle><manvolnum>8</manvolnum>
+	<refentrytitle>pam.d</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
       <citerefentry>
 	<refentrytitle>pam</refentrytitle><manvolnum>8</manvolnum>
--- Linux-PAM-1.0/modules/pam_securetty/pam_securetty.8.xml	2006-06-04 17:29:23.000000000 +0200
+++ Linux-PAM/modules/pam_securetty/pam_securetty.8.xml	2008-08-20 20:56:28.000000000 +0200
@@ -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>
 
@@ -116,7 +116,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>PAM_IGNORE</term>
+        <term>PAM_USER_UNKNOWN</term>
         <listitem>
           <para>
             The module could not find the user name in the
@@ -149,7 +149,7 @@
 	<refentrytitle>pam.conf</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
       <citerefentry>
-	<refentrytitle>pam.d</refentrytitle><manvolnum>8</manvolnum>
+	<refentrytitle>pam.d</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
       <citerefentry>
 	<refentrytitle>pam</refentrytitle><manvolnum>8</manvolnum>
--- Linux-PAM-1.0/modules/pam_sepermit/pam_sepermit.8.xml	2008-01-29 16:38:35.000000000 +0100
+++ Linux-PAM/modules/pam_sepermit/pam_sepermit.8.xml	2008-08-20 20:56:28.000000000 +0200
@@ -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>
 
--- Linux-PAM-1.0/modules/pam_shells/pam_shells.8.xml	2007-11-06 15:58:54.000000000 +0100
+++ Linux-PAM/modules/pam_shells/pam_shells.8.xml	2008-08-20 20:56:28.000000000 +0200
@@ -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>
 
@@ -99,7 +99,7 @@
 	<refentrytitle>pam.conf</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
       <citerefentry>
-	<refentrytitle>pam.d</refentrytitle><manvolnum>8</manvolnum>
+	<refentrytitle>pam.d</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
       <citerefentry>
 	<refentrytitle>pam</refentrytitle><manvolnum>8</manvolnum>
--- Linux-PAM-1.0/modules/pam_succeed_if/pam_succeed_if.8.xml	2008-01-07 15:54:50.000000000 +0100
+++ Linux-PAM/modules/pam_succeed_if/pam_succeed_if.8.xml	2008-08-20 20:56:28.000000000 +0200
@@ -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>
 
@@ -249,7 +250,7 @@
           <listitem>
             <para>
               A service error occured or the arguments can't be
-              parsed as numbers.
+              parsed correctly.
             </para>
           </listitem>
         </varlistentry>
--- Linux-PAM-1.0/modules/pam_tally/pam_tally.8.xml	2007-10-10 16:10:07.000000000 +0200
+++ Linux-PAM/modules/pam_tally/pam_tally.8.xml	2008-08-20 20:56:28.000000000 +0200
@@ -113,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>
@@ -322,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>
 
@@ -409,7 +435,7 @@
 	<refentrytitle>pam.conf</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
       <citerefentry>
-	<refentrytitle>pam.d</refentrytitle><manvolnum>8</manvolnum>
+	<refentrytitle>pam.d</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
       <citerefentry>
 	<refentrytitle>pam</refentrytitle><manvolnum>8</manvolnum>
--- Linux-PAM-1.0/modules/pam_time/pam_time.8.xml	2007-12-07 16:40:02.000000000 +0100
+++ Linux-PAM/modules/pam_time/pam_time.8.xml	2008-08-20 20:56:28.000000000 +0200
@@ -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>
 
@@ -166,7 +166,7 @@
         <refentrytitle>time.conf</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
       <citerefentry>
-        <refentrytitle>pam.d</refentrytitle><manvolnum>8</manvolnum>
+        <refentrytitle>pam.d</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
       <citerefentry>
         <refentrytitle>pam</refentrytitle><manvolnum>8</manvolnum>
--- Linux-PAM-1.0/modules/pam_tty_audit/pam_tty_audit.8.xml	2008-01-29 16:09:29.000000000 +0100
+++ Linux-PAM/modules/pam_tty_audit/pam_tty_audit.8.xml	2008-08-20 20:56:29.000000000 +0200
@@ -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>
 
--- Linux-PAM-1.0/modules/pam_umask/pam_umask.8.xml	2006-08-06 13:38:43.000000000 +0200
+++ Linux-PAM/modules/pam_umask/pam_umask.8.xml	2008-08-20 20:56:29.000000000 +0200
@@ -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>
 
@@ -202,7 +202,7 @@
 	<refentrytitle>pam.conf</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
       <citerefentry>
-	<refentrytitle>pam.d</refentrytitle><manvolnum>8</manvolnum>
+	<refentrytitle>pam.d</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
       <citerefentry>
 	<refentrytitle>pam</refentrytitle><manvolnum>8</manvolnum>
--- Linux-PAM-1.0/modules/pam_unix/pam_unix.8.xml	2008-01-23 16:35:12.000000000 +0100
+++ Linux-PAM/modules/pam_unix/pam_unix.8.xml	2008-08-20 20:56:29.000000000 +0200
@@ -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>
 
@@ -361,7 +362,7 @@
 	<refentrytitle>pam.conf</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
       <citerefentry>
-	<refentrytitle>pam.d</refentrytitle><manvolnum>8</manvolnum>
+	<refentrytitle>pam.d</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
       <citerefentry>
 	<refentrytitle>pam</refentrytitle><manvolnum>8</manvolnum>
--- Linux-PAM-1.0/modules/pam_userdb/pam_userdb.8.xml	2006-06-09 18:44:07.000000000 +0200
+++ Linux-PAM/modules/pam_userdb/pam_userdb.8.xml	2008-08-20 20:56:29.000000000 +0200
@@ -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>
 
@@ -274,7 +274,7 @@
 	<refentrytitle>pam.conf</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
       <citerefentry>
-	<refentrytitle>pam.d</refentrytitle><manvolnum>8</manvolnum>
+	<refentrytitle>pam.d</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
       <citerefentry>
 	<refentrytitle>pam</refentrytitle><manvolnum>8</manvolnum>
--- Linux-PAM-1.0/modules/pam_warn/pam_warn.8.xml	2007-11-06 15:58:54.000000000 +0100
+++ Linux-PAM/modules/pam_warn/pam_warn.8.xml	2008-08-20 20:56:29.000000000 +0200
@@ -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>
 
@@ -86,7 +87,7 @@
 	<refentrytitle>pam.conf</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
       <citerefentry>
-	<refentrytitle>pam.d</refentrytitle><manvolnum>8</manvolnum>
+	<refentrytitle>pam.d</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
       <citerefentry>
 	<refentrytitle>pam</refentrytitle><manvolnum>8</manvolnum>
--- Linux-PAM-1.0/modules/pam_wheel/pam_wheel.8.xml	2006-09-10 01:11:34.000000000 +0200
+++ Linux-PAM/modules/pam_wheel/pam_wheel.8.xml	2008-08-20 20:56:29.000000000 +0200
@@ -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>
 
@@ -224,7 +224,7 @@
 	<refentrytitle>pam.conf</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
       <citerefentry>
-	<refentrytitle>pam.d</refentrytitle><manvolnum>8</manvolnum>
+	<refentrytitle>pam.d</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
       <citerefentry>
 	<refentrytitle>pam</refentrytitle><manvolnum>8</manvolnum>
--- Linux-PAM-1.0/modules/pam_xauth/pam_xauth.8.xml	2007-11-06 15:58:54.000000000 +0100
+++ Linux-PAM/modules/pam_xauth/pam_xauth.8.xml	2008-08-20 20:56:30.000000000 +0200
@@ -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>
 
@@ -273,7 +273,7 @@
 	<refentrytitle>pam.conf</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
       <citerefentry>
-	<refentrytitle>pam.d</refentrytitle><manvolnum>8</manvolnum>
+	<refentrytitle>pam.d</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
       <citerefentry>
 	<refentrytitle>pam</refentrytitle><manvolnum>8</manvolnum>