From owner-svn-src-stable@FreeBSD.ORG  Sat Jun 11 01:21:55 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0D35E106564A;
	Sat, 11 Jun 2011 01:21:55 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id F10898FC12;
	Sat, 11 Jun 2011 01:21:54 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p5B1LsZP051761;
	Sat, 11 Jun 2011 01:21:54 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p5B1LsKf051759;
	Sat, 11 Jun 2011 01:21:54 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201106110121.p5B1LsKf051759@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Sat, 11 Jun 2011 01:21:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r222968 - stable/7/usr.sbin/syslogd
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 11 Jun 2011 01:21:55 -0000

Author: gjb (doc committer)
Date: Sat Jun 11 01:21:54 2011
New Revision: 222968
URL: http://svn.freebsd.org/changeset/base/222968

Log:
  MFC 186440 [1]:
  
  Add "crit" to the list of keywords.
  
  PR:		126934
  Original commit by:	trhodes [1]

Modified:
  stable/7/usr.sbin/syslogd/syslog.conf.5
Directory Properties:
  stable/7/usr.sbin/syslogd/   (props changed)

Modified: stable/7/usr.sbin/syslogd/syslog.conf.5
==============================================================================
--- stable/7/usr.sbin/syslogd/syslog.conf.5	Sat Jun 11 01:19:19 2011	(r222967)
+++ stable/7/usr.sbin/syslogd/syslog.conf.5	Sat Jun 11 01:21:54 2011	(r222968)
@@ -28,7 +28,7 @@
 .\"     @(#)syslog.conf.5	8.1 (Berkeley) 6/9/93
 .\" $FreeBSD$
 .\"
-.Dd June 9, 1993
+.Dd December 23, 2008
 .Dt SYSLOG.CONF 5
 .Os
 .Sh NAME
@@ -137,7 +137,7 @@ The
 .Em level
 describes the severity of the message, and is a keyword from the
 following ordered list (higher to lower):
-.Cm emerg , alert , err , warning , notice , info
+.Cm emerg , crit , alert , err , warning , notice , info
 and
 .Cm debug .
 These keywords correspond to
@@ -446,7 +446,7 @@ A configuration file might appear as fol
 # level notice or higher, and anything of level err or
 # higher to the console.
 # Don't log private authentication messages!
-*.err;kern.*;auth.notice;authpriv.none	/dev/console
+*.err;kern.*;auth.notice;authpriv.none;mail.crit	/dev/console
 
 # Log anything (except mail) of level info or higher.
 # Don't log private authentication messages!