From owner-cvs-all  Tue Oct 31  6:19:59 2000
Delivered-To: cvs-all@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP
	id 97A9C37B4CF; Tue, 31 Oct 2000 06:19:56 -0800 (PST)
Received: (from asmodai@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id GAA57418;
	Tue, 31 Oct 2000 06:19:56 -0800 (PST)
	(envelope-from asmodai@FreeBSD.org)
Message-Id: <200010311419.GAA57418@freefall.freebsd.org>
From: Jeroen Ruigrok van der Werven <asmodai@FreeBSD.org>
Date: Tue, 31 Oct 2000 06:19:56 -0800 (PST)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/contrib/bind/doc/man host.1 nslookup.8
X-FreeBSD-CVS-Branch: HEAD
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

asmodai     2000/10/31 06:19:56 PST

  Modified files:
    contrib/bind/doc/man host.1 nslookup.8 
  Log:
  Resolve conflicts.
  
  Revision  Changes    Path
  1.4       +35 -20    src/contrib/bind/doc/man/host.1
  1.3       +3 -0      src/contrib/bind/doc/man/nslookup.8



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