From owner-cvs-all  Mon Sep 30  1:46:24 2002
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 2A80F37B401; Mon, 30 Sep 2002 01:46:24 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id D278643E65; Mon, 30 Sep 2002 01:46:23 -0700 (PDT)
	(envelope-from murray@FreeBSD.org)
Received: from freefall.freebsd.org (murray@localhost [127.0.0.1])
	by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8U8kNCo094597;
	Mon, 30 Sep 2002 01:46:23 -0700 (PDT)
	(envelope-from murray@freefall.freebsd.org)
Received: (from murray@localhost)
	by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8U8kNwF094596;
	Mon, 30 Sep 2002 01:46:23 -0700 (PDT)
Message-Id: <200209300846.g8U8kNwF094596@freefall.freebsd.org>
From: Murray Stokely <murray@FreeBSD.org>
Date: Mon, 30 Sep 2002 01:46:23 -0700 (PDT)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/contrib/isc-dhcp/common dhcp-options.5
X-FreeBSD-CVS-Branch: HEAD
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
List-ID: <cvs-all.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%20cvs-all>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20cvs-all>
X-Loop: FreeBSD.ORG

murray      2002/09/30 01:46:23 PDT

  Modified files:
    contrib/isc-dhcp/common dhcp-options.5 
  Log:
  Resolve conflicts (fix spelling errors).
  
  Revision  Changes    Path
  1.4       +27 -5     src/contrib/isc-dhcp/common/dhcp-options.5

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