From owner-svn-src-head@FreeBSD.ORG  Fri Oct  9 09:42:58 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D796E106568D;
	Fri,  9 Oct 2009 09:42:58 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C71DE8FC1E;
	Fri,  9 Oct 2009 09:42:58 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n999gwkK048802;
	Fri, 9 Oct 2009 09:42:58 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n999gwAG048800;
	Fri, 9 Oct 2009 09:42:58 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <200910090942.n999gwAG048800@svn.freebsd.org>
From: Dag-Erling Smorgrav <des@FreeBSD.org>
Date: Fri, 9 Oct 2009 09:42:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r197899 - in head/contrib/openpam: . doc/man
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Oct 2009 09:42:58 -0000

Author: des
Date: Fri Oct  9 09:42:58 2009
New Revision: 197899
URL: http://svn.freebsd.org/changeset/base/197899

Log:
  Merge upstream r421: grammar nit in pam.conf(5).

Modified:
  head/contrib/openpam/   (props changed)
  head/contrib/openpam/doc/man/pam.conf.5

Modified: head/contrib/openpam/doc/man/pam.conf.5
==============================================================================
--- head/contrib/openpam/doc/man/pam.conf.5	Fri Oct  9 09:42:22 2009	(r197898)
+++ head/contrib/openpam/doc/man/pam.conf.5	Fri Oct  9 09:42:58 2009	(r197899)
@@ -109,7 +109,7 @@ will be failure regardless of the succes
 .It Cm requisite
 If this module succeeds, the result of the chain will be success
 unless a later module fails.
-If it module fails, the chain is broken and the result is failure.
+If the module fails, the chain is broken and the result is failure.
 .It Cm sufficient
 If this module succeeds, the chain is broken and the result is
 success.