From owner-p4-projects  Fri Feb 21  8:42:35 2003
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id ACEB037B405; Fri, 21 Feb 2003 08:42:33 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 4057F37B401
	for <perforce@freebsd.org>; Fri, 21 Feb 2003 08:42:33 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id DA40543F75
	for <perforce@freebsd.org>; Fri, 21 Feb 2003 08:42:32 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h1LGgW0U092235
	for <perforce@freebsd.org>; Fri, 21 Feb 2003 08:42:32 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h1LGgWCu092232
	for perforce@freebsd.org; Fri, 21 Feb 2003 08:42:32 -0800 (PST)
Date: Fri, 21 Feb 2003 08:42:32 -0800 (PST)
Message-Id: <200302211642.h1LGgWCu092232@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
Subject: PERFORCE change 25528 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://perforce.freebsd.org/chv.cgi?CH=25528

Change 25528 by rwatson@rwatson_tislabs on 2003/02/21 08:42:26

	Submerge some gratuitous diffs.

Affected files ...

.. //depot/projects/trustedbsd/base/bin/sh/machdep.h#2 edit
.. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam.3#10 edit

Differences ...

==== //depot/projects/trustedbsd/base/bin/sh/machdep.h#2 (text+ko) ====

@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)machdep.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD: src/bin/sh/machdep.h,v 1.6 1999/08/27 23:15:15 peter Exp $
+ * $FreeBSD: src/bin/sh/machdep.h,v 1.10 2003/02/18 02:08:20 tjr Exp $
  */
 
 /*

==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam.3#10 (text+ko) ====

@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $P4: //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam.3#9 $
+.\" $P4: //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam.3#10 $
 .\"
 .Dd January 6, 2003
 .Dt PAM 3
@@ -94,7 +94,7 @@
 .Ft const char *
 .Fn pam_strerror "pam_handle_t *pamh" "int error_number"
 .\"
-.\" $P4: //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam.3#9 $
+.\" $P4: //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam.3#10 $
 .\"
 .Sh DESCRIPTION
 The Pluggable Authentication Modules (PAM) library abstracts a number

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message