8 files changed, 37 insertions, 43 deletions
diff --git a/contrib/libpam/doc/man/pam.8 b/contrib/libpam/doc/man/pam.8
index 7538441..b60be4d 100644
--- a/contrib/libpam/doc/man/pam.8
+++ b/contrib/libpam/doc/man/pam.8
@@ -1,10 +1,10 @@
 .\" Hey Emacs! This file is -*- nroff -*- source.
 .\" $Id: pam.8,v 1.2 1997/02/15 18:37:27 morgan Exp $
 .\" Copyright (c) Andrew G. Morgan 1996-7 <morgan@linux.kernel.org>
-.TH PAM 8 "1997 Feb 9" "Linux-PAM 0.56" "Linux-PAM Manual"
+.TH PAM 8 "1997 Feb 9" "PAM 0.56" "PAM Manual"
 .SH NAME
 
-Linux-PAM \- Pluggable Authentication Modules for Linux
+PAM \- Pluggable Authentication Modules
 
 .SH SYNOPSIS
 .B /etc/pam.conf
@@ -12,12 +12,12 @@ Linux-PAM \- Pluggable Authentication Modules for Linux
 .SH DESCRIPTION
 
 This manual is intended to offer a quick introduction to
-.BR Linux-PAM ". "
+.BR PAM ". "
 For more information the reader is directed to the
 .BR "Linux-PAM system administrators' guide".
 
 .sp
-.BR Linux-PAM
+.BR PAM
 Is a system of libraries that handle the authentication tasks of
 applications (services) on the system.  The library provides a stable
 general interface (Application Programming Interface - API) that
@@ -33,21 +33,21 @@ authentication is dynamically configurable.  In other words, the
 system administrator is free to choose how individual
 service-providing applications will authenticate users. This dynamic
 configuration is set by the contents of the single
-.BR Linux-PAM
+.BR PAM
 configuration file
 .BR /etc/pam.conf "."
 Alternatively, the configuration can be set by individual
 configuration files located in the
 .B /etc/pam.d/
 directory.
-.IB "The presence of this directory will cause " Linux-PAM " to ignore"
+.IB "The presence of this directory will cause " PAM " to ignore"
 .BI /etc/pam.conf "."
 
 .sp
 From the point of view of the system administrator, for whom this
 manual is provided, it is not of primary importance to understand the
 internal behavior of the
-.BR Linux-PAM
+.BR PAM
 library.  The important point to recognize is that the configuration
 file(s)
 .I define
@@ -58,7 +58,7 @@ and the pluggable authentication modules
 that perform the actual authentication tasks.
 
 .sp
-.BR Linux-PAM
+.BR PAM
 separates the tasks of
 .I authentication
 into four independent management groups:
@@ -88,7 +88,7 @@ are of this type, there exist hardware based authentication schemes
 (such as the use of smart-cards and biometric devices), with suitable
 modules, these may be substituted seamlessly for more standard
 approaches to authentication - such is the flexibility of
-.BR Linux-PAM "."
+.BR PAM "."
 
 .br
 .BR password " - "
@@ -113,7 +113,7 @@ closing hook for modules to affect the services available to a user.
 .SH The configuration file(s)
 
 When a
-.BR Linux-PAM
+.BR PAM
 aware privilege granting application is started, it activates its
 attachment to the PAM-API.  This activation performs a number of
 tasks, the most important being the reading of the configuration file(s):
@@ -158,7 +158,7 @@ directory. This filename must be in lower case.
 
 .sp
 An important feature of
-.BR Linux-PAM ", "
+.BR PAM ", "
 is that a number of rules may be
 .I stacked
 to combine the services of a number of PAMs for a given authentication
@@ -237,24 +237,18 @@ documented for each individual module.
 .BR /etc/pam.conf " - the configuration file"
 .br
 .BR /etc/pam.d/ " - the"
-.BR Linux-PAM
+.BR PAM
 configuration directory. If this directory is present, the
 .B /etc/pam.conf
 file is ignored.
 .br
 .BR /usr/lib/libpam.so.X " - the dynamic library"
 .br
-.BR /usr/lib/security/*.so " - the PAMs
-
-.sp
-Note, to conform to the Linux File-system standard, the libraries and
-modules in your system may be located in
-.BR /lib " and " /lib/security 
-respectively.
+.BR /usr/lib/pam_*.so " - the PAMs
 
 .SH ERRORS
 Typically errors generated by the
-.BR Linux-PAM
+.BR PAM
 system of libraries, will be written to
 .BR syslog "(3)."
 
diff --git a/contrib/libpam/doc/man/pam_authenticate.3 b/contrib/libpam/doc/man/pam_authenticate.3
index f631c47..1baffc9 100644
--- a/contrib/libpam/doc/man/pam_authenticate.3
+++ b/contrib/libpam/doc/man/pam_authenticate.3
@@ -1,7 +1,7 @@
 .\" Hey Emacs! This file is -*- nroff -*- source.
 .\" $Id: pam_authenticate.3,v 1.2 1997/02/15 18:39:59 morgan Exp $
 .\" Copyright (c) Andrew G. Morgan 1996-7 <morgan@parc.power.net>
-.TH PAM_AUTHENTICATE 3 "1996 Dec 9" "Linux-PAM 0.55" "App. Programmers' Manual"
+.TH PAM_AUTHENTICATE 3 "1996 Dec 9" "PAM 0.55" "App. Programmers' Manual"
 .SH NAME
 
 pam_authenticate \- authenticate a user
@@ -18,7 +18,7 @@ pam_authenticate \- authenticate a user
 Use this function to authenticate an applicant user.  It is linked
 .I dynamically
 to the authentication modules by
-.BR Linux-PAM ". "
+.BR PAM ". "
 It is the task of these module to perform such an authentication.  The
 specific nature of the authentication is not the concern of the
 application.
@@ -27,7 +27,7 @@ application.
 Following successful completion, the
 .BR name
 of the authenticated user will be present in the
-.BR Linux-PAM
+.BR PAM
 item
 .BR PAM_USER ". "
 This item may be recovered with a call to
@@ -83,7 +83,7 @@ and
 .BR pam_strerror "(3). "
 
 Also, see the three
-.BR Linux-PAM
+.BR PAM
 Guides, for
 .BR "System administrators" ", "
 .BR "module developers" ", "
diff --git a/contrib/libpam/doc/man/pam_chauthtok.3 b/contrib/libpam/doc/man/pam_chauthtok.3
index b0997d5..8ccf55d 100644
--- a/contrib/libpam/doc/man/pam_chauthtok.3
+++ b/contrib/libpam/doc/man/pam_chauthtok.3
@@ -1,7 +1,7 @@
 .\" Hey Emacs! This file is -*- nroff -*- source.
 .\" $Id: pam_chauthtok.3,v 1.2 1997/02/15 18:42:23 morgan Exp $
 .\" Copyright (c) Andrew G. Morgan 1997 <morgan@parc.power.net>
-.TH PAM_CHAUTHTOK 3 "1997 Jan 4" "Linux-PAM 0.55" "App. Programmers' Manual"
+.TH PAM_CHAUTHTOK 3 "1997 Jan 4" "PAM 0.55" "App. Programmers' Manual"
 .SH NAME
 
 pam_chauthtok \- updating authentication tokens
@@ -21,7 +21,7 @@ etc.) of an applicant user.
 .br
 Note, the application should not pre-authenticate the user, as this is
 performed (if required) by the
-.BR Linux-PAM
+.BR PAM
 framework.
 
 .br
@@ -93,7 +93,7 @@ and
 
 .br
 Also, see the three
-.BR Linux-PAM
+.BR PAM
 Guides, for
 .BR "System administrators" ", "
 .BR "module developers" ", "
diff --git a/contrib/libpam/doc/man/pam_fail_delay.3 b/contrib/libpam/doc/man/pam_fail_delay.3
index 42bccd6..b2b57ac 100644
--- a/contrib/libpam/doc/man/pam_fail_delay.3
+++ b/contrib/libpam/doc/man/pam_fail_delay.3
@@ -1,7 +1,7 @@
 .\" Hey Emacs! This file is -*- nroff -*- source.
 .\" $Id: pam_fail_delay.3,v 1.2 1997/02/15 18:47:46 morgan Exp morgan $
 .\" Copyright (c) Andrew G. Morgan 1997 <morgan@parc.power.net>
-.TH PAM_FAIL_DELAY 3 "1997 Jan 12" "Linux-PAM 0.56" "Programmers' Manual"
+.TH PAM_FAIL_DELAY 3 "1997 Jan 12" "PAM 0.56" "Programmers' Manual"
 .SH NAME
 
 pam_fail_delay \- request a delay on failure
@@ -35,7 +35,7 @@ of useful information.
 .br
 To minimize the effectiveness of such attacks, it is desirable to
 introduce a random delay in a failed authentication process.
-.B Linux-PAM
+.B PAM
 provides such a facility.  The delay occurs upon failure of the
 .BR pam_authenticate "(3) "
 and
diff --git a/contrib/libpam/doc/man/pam_open_session.3 b/contrib/libpam/doc/man/pam_open_session.3
index 1b2dcf9..79a2190 100644
--- a/contrib/libpam/doc/man/pam_open_session.3
+++ b/contrib/libpam/doc/man/pam_open_session.3
@@ -1,7 +1,7 @@
 .\" Hey Emacs! This file is -*- nroff -*- source.
 .\" $Id: pam_open_session.3,v 1.2 1997/02/15 18:49:02 morgan Exp $
 .\" Copyright (c) Andrew G. Morgan 1997 <morgan@parc.power.net>
-.TH PAM_OPEN_SESSION 3 "1997 Jan 4" "Linux-PAM 0.55" "App. Programmers' Manual"
+.TH PAM_OPEN_SESSION 3 "1997 Jan 4" "PAM 0.55" "App. Programmers' Manual"
 .SH NAME
 
 pam_open/close_session \- PAM session management
diff --git a/contrib/libpam/doc/man/pam_setcred.3 b/contrib/libpam/doc/man/pam_setcred.3
index 388a5d7..317b0eb 100644
--- a/contrib/libpam/doc/man/pam_setcred.3
+++ b/contrib/libpam/doc/man/pam_setcred.3
@@ -1,7 +1,7 @@
 .\" Hey Emacs! This file is -*- nroff -*- source.
-.\" $Id: pam_setcred.3,v 1.2 1997/02/15 18:50:49 morgan Exp morgan $
+.\" $Id: pam_setcred.3,v 1.1.1.1 1998/07/09 22:10:18 jdp Exp $
 .\" Copyright (c) Andrew G. Morgan 1996,1997 <morgan@parc.power.net>
-.TH PAM_SETCRED 3 "1997 July 6" "Linux-PAM 0.58" "App. Programmers' Manual"
+.TH PAM_SETCRED 3 "1997 July 6" "PAM 0.58" "App. Programmers' Manual"
 .SH NAME
 
 pam_setcred \- set the credentials for the user
@@ -20,11 +20,11 @@ authenticated and before a session is opened for the user (with
 .BR pam_open_session "(3))."
 
 It should be noted that credentials come in many forms. Examples
-include: group memberships; ticket-files; and Linux-PAM environment
+include: group memberships; ticket-files; and PAM environment
 variables.  For this reason, it is important that the basic identity
 of the user is established, by the application, prior to a call to
 this function.  For example, the default
-.BR Linux-PAM
+.BR PAM
 environment variables should be set and also
 .BR initgroups "(2) "
 (or equivalent) should have been performed.
diff --git a/contrib/libpam/doc/man/pam_start.3 b/contrib/libpam/doc/man/pam_start.3
index 0299533..f2e166f 100644
--- a/contrib/libpam/doc/man/pam_start.3
+++ b/contrib/libpam/doc/man/pam_start.3
@@ -1,10 +1,10 @@
 .\" Hey Emacs! This file is -*- nroff -*- source.
 .\" $Id: pam_start.3,v 1.2 1997/02/15 18:51:54 morgan Exp $
 .\" Copyright (c) Andrew G. Morgan 1996-7 <morgan@parc.power.net>
-.TH PAM_START 3 "1997 Feb 15" "Linux-PAM 0.56" "Application Programmers' Manual"
+.TH PAM_START 3 "1997 Feb 15" "PAM 0.56" "Application Programmers' Manual"
 .SH NAME
 
-pam_start, pam_end \- activating Linux-PAM
+pam_start, pam_end \- activating PAM
 
 .SH SYNOPSIS
 .B #include <security/pam_appl.h>
@@ -17,7 +17,7 @@ pam_start, pam_end \- activating Linux-PAM
 .TP
 .B pam_start
 Initialize the
-.I Linux-PAM
+.I PAM
 library.  Identifying the application with a particular
 .IR service
 name.  The
@@ -29,7 +29,7 @@ conversation structure is passed to the library via the
 .IR conv
 argument.  (For a complete description of this and other structures
 the reader is directed to the more verbose
-.IR Linux-PAM
+.IR PAM
 application developers' guide).  Upon successful initialization, an
 opaque pointer-handle for future access to the library is returned
 through the contents of the
@@ -39,7 +39,7 @@ pointer.
 .TP
 .B pam_end
 Terminate the
-.B Linux-PAM
+.B PAM
 library.  The service application associated with the
 .IR pamh
 handle, is terminated.  The argument,
diff --git a/contrib/libpam/doc/man/pam_strerror.3 b/contrib/libpam/doc/man/pam_strerror.3
index 33b4fda..28d5f34 100644
--- a/contrib/libpam/doc/man/pam_strerror.3
+++ b/contrib/libpam/doc/man/pam_strerror.3
@@ -2,10 +2,10 @@
 .\" ripped off from Rick Faith's getgroups man page
 .\" $Id: pam_strerror.3,v 1.2 1997/02/15 18:53:04 morgan Exp $
 .\" Copyright (c) Andrew G. Morgan 1996-7 <morgan@parc.power.net>
-.TH PAM_STRERROR 3 "1997 Feb 15" "Linux-PAM 0.56" "Programmers' Manual"
+.TH PAM_STRERROR 3 "1997 Feb 15" "PAM 0.56" "Programmers' Manual"
 .SH NAME
 
-pam_strerror \- return a textual description of a Linux-PAM error
+pam_strerror \- return a textual description of a PAM error
 
 .SH SYNOPSIS
 .B #include <security/pam_appl.h>
@@ -20,14 +20,14 @@ or,
 .B pam_strerror
 
 This function returns a pointer to a line of text describing the
-.BR Linux-PAM
+.BR PAM
 error passed as its sole argument.
 
 .SH "RETURN VALUE"
 
 On success this function returns a description of the indicated
 error.  Should the function not recognize the error, ``Unknown
-Linux-PAM error'' is returned.
+PAM error'' is returned.
 
 .SH "CONFORMING TO"
 DCE-RFC 86.0, October 1995.