From owner-cvs-all@FreeBSD.ORG  Thu Sep 28 19:06:20 2006
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 DE6CD16A40F;
	Thu, 28 Sep 2006 19:06:20 +0000 (UTC) (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 97B0043D49;
	Thu, 28 Sep 2006 19:06:20 +0000 (GMT) (envelope-from jhb@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8SJ6K7A036359;
	Thu, 28 Sep 2006 19:06:20 GMT (envelope-from jhb@repoman.freebsd.org)
Received: (from jhb@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8SJ6KJc036358;
	Thu, 28 Sep 2006 19:06:20 GMT (envelope-from jhb)
Message-Id: <200609281906.k8SJ6KJc036358@repoman.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Thu, 28 Sep 2006 19:06:20 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: src/sys/boot/common merge_help.awk
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: Thu, 28 Sep 2006 19:06:21 -0000

jhb         2006-09-28 19:06:20 UTC

  FreeBSD src repository

  Modified files:
    sys/boot/common      merge_help.awk 
  Log:
  Ignore a sub-topic match if it is inside the command description.
  Otherwise, merge-help can get confused by a command description that
  includes a word that starts with a capital S.
  
  MFC after:      1 week
  
  Revision  Changes    Path
  1.6       +3 -0      src/sys/boot/common/merge_help.awk