From owner-cvs-all@FreeBSD.ORG  Fri Oct 28 19:04:04 2005
Return-Path: <owner-cvs-all@FreeBSD.ORG>
X-Original-To: cvs-all@FreeBSD.org
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id A4FF316A41F;
	Fri, 28 Oct 2005 19:04:04 +0000 (GMT) (envelope-from jhb@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6B18F43D46;
	Fri, 28 Oct 2005 19:04:04 +0000 (GMT) (envelope-from jhb@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9SJ44h9044929;
	Fri, 28 Oct 2005 19:04:04 GMT (envelope-from jhb@repoman.freebsd.org)
Received: (from jhb@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9SJ44rT044928;
	Fri, 28 Oct 2005 19:04:04 GMT (envelope-from jhb)
Message-Id: <200510281904.j9SJ44rT044928@repoman.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Fri, 28 Oct 2005 19:04:04 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_6
Cc: 
Subject: cvs commit: src/sys/conf Makefile.alpha Makefile.amd64
 Makefile.arm Makefile.i386 Makefile.ia64 Makefile.pc98
 Makefile.powerpc Makefile.sparc64 src/usr.sbin/config config.8
 config.h config.y configvers.h main.c
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Oct 2005 19:04:04 -0000

jhb         2005-10-28 19:04:04 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_6)
    sys/conf             Makefile.alpha Makefile.amd64 
                         Makefile.arm Makefile.i386 Makefile.ia64 
                         Makefile.pc98 Makefile.powerpc 
                         Makefile.sparc64 
    usr.sbin/config      config.8 config.h config.y configvers.h 
                         main.c 
  Log:
  MFC: Sync config(8) with HEAD:
  - Add -V option to dump version.
  - Implicitly include DEFAULTS if it exists in the current directory before
    the specified kernel config.
  
  Approved by:    re (scottl)
  
  Revision   Changes    Path
  1.135.2.1  +1 -1      src/sys/conf/Makefile.alpha
  1.16.2.1   +1 -1      src/sys/conf/Makefile.amd64
  1.10.2.1   +1 -1      src/sys/conf/Makefile.arm
  1.265.2.1  +1 -1      src/sys/conf/Makefile.i386
  1.62.2.1   +1 -1      src/sys/conf/Makefile.ia64
  1.167.2.1  +1 -1      src/sys/conf/Makefile.pc98
  1.277.2.1  +1 -1      src/sys/conf/Makefile.powerpc
  1.33.2.1   +1 -1      src/sys/conf/Makefile.sparc64
  1.43.2.1   +5 -1      src/usr.sbin/config/config.8
  1.56.2.1   +1 -0      src/usr.sbin/config/config.h
  1.66.2.1   +16 -0     src/usr.sbin/config/config.y
  1.35.2.1   +1 -1      src/usr.sbin/config/configvers.h
  1.64.2.1   +16 -5     src/usr.sbin/config/main.c