From owner-cvs-all Mon Jan 6 3:22:39 2003 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 5E7A137B401; Mon, 6 Jan 2003 03:22:38 -0800 (PST) Received: from rhadamanth.submonkey.net (pc1-cdif2-5-cust47.cdif.cable.ntl.com [81.101.150.47]) by mx1.FreeBSD.org (Postfix) with ESMTP id CFC1543EB2; Mon, 6 Jan 2003 03:22:36 -0800 (PST) (envelope-from setantae@submonkey.net) Received: from setantae by rhadamanth.submonkey.net with local (Exim 4.10) id 18VVKx-0000m3-00; Mon, 06 Jan 2003 11:22:31 +0000 Date: Mon, 6 Jan 2003 11:22:31 +0000 From: Ceri Davies To: Giorgos Keramidas Cc: Tom Rhodes , cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/contrib/lukemftpd/src ftpd.conf.5 ftpusers.5 Message-ID: <20030106112231.GA2944@submonkey.net> Mail-Followup-To: Ceri Davies , Giorgos Keramidas , Tom Rhodes , cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org References: <200301060020.h060KQAw059225@repoman.freebsd.org> <20030105192316.678fa230.trhodes@FreeBSD.org> <20030106023929.GA4285@gothmog.gr> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20030106023929.GA4285@gothmog.gr> X-message-flag: All your linuxconf-configured redhat are belong to us. X-message-flag-attribution: suresh, sdm. User-Agent: Mutt/1.5.3i Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Mon, Jan 06, 2003 at 04:39:29AM +0200, Giorgos Keramidas wrote: > On 2003-01-05 19:23, Tom Rhodes wrote: > > On Sun, 5 Jan 2003 16:20:26 -0800 (PST) obrien@FreeBSD.org wrote: > > > Merge our .Nm changes into the nbsd_20030105 import. > > > > > > Revision Changes Path > > > 1.3 +137 -41 src/contrib/lukemftpd/src/ftpd.conf.5 > > > 1.3 +3 -1 src/contrib/lukemftpd/src/ftpusers.5 > > > > Does this close PR: docs/45590? > > No. It only moves the $FreeBSD$ rcs id line to a more appropriate > place, and resolves the conflicts created when I took the files off > the vendor branch. Since these are now taken out of the LUKEM vendor > branch you are free to make changes to the files that will close the > PR after making sure David has no objections. See also bin/44519 which is similar, if not the same as, docs/45590. Ceri -- The wrath of the heroic dwarves is now! To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message