From owner-cvs-all  Sun Jan  5 18:39:35 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 4645E37B401; Sun,  5 Jan 2003 18:39:34 -0800 (PST)
Received: from mailsrv.otenet.gr (mailsrv.otenet.gr [195.170.0.5])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 329FE43EB2; Sun,  5 Jan 2003 18:39:33 -0800 (PST)
	(envelope-from keramida@FreeBSD.org)
Received: from gothmog.gr (patr530-a104.otenet.gr [212.205.215.104])
	by mailsrv.otenet.gr (8.12.6/8.12.6) with ESMTP id h062dU4V004015;
	Mon, 6 Jan 2003 04:39:31 +0200 (EET)
Received: from gothmog.gr (gothmog [127.0.0.1])
	by gothmog.gr (8.12.6/8.12.6) with ESMTP id h062dTsX005413;
	Mon, 6 Jan 2003 04:39:29 +0200 (EET)
	(envelope-from keramida@FreeBSD.org)
Received: (from giorgos@localhost)
	by gothmog.gr (8.12.6/8.12.6/Submit) id h062dTtO005412;
	Mon, 6 Jan 2003 04:39:29 +0200 (EET)
	(envelope-from keramida@FreeBSD.org)
Date: Mon, 6 Jan 2003 04:39:29 +0200
From: Giorgos Keramidas <keramida@FreeBSD.org>
To: Tom Rhodes <trhodes@FreeBSD.org>
Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: Re: cvs commit: src/contrib/lukemftpd/src ftpd.conf.5 ftpusers.5
Message-ID: <20030106023929.GA4285@gothmog.gr>
References: <200301060020.h060KQAw059225@repoman.freebsd.org> <20030105192316.678fa230.trhodes@FreeBSD.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20030105192316.678fa230.trhodes@FreeBSD.org>
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

On 2003-01-05 19:23, Tom Rhodes <trhodes@FreeBSD.ORG> 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.

- Giorgos


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