From owner-cvs-doc@FreeBSD.ORG  Tue Oct  4 20:57:03 2005
Return-Path: <owner-cvs-doc@FreeBSD.ORG>
X-Original-To: cvs-doc@FreeBSD.org
Delivered-To: cvs-doc@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id DE38716A420;
	Tue,  4 Oct 2005 20:57:02 +0000 (GMT)
	(envelope-from murray@freebsdmall.com)
Received: from mail.freebsdmall.com (ns1.freebsdmall.com [69.50.233.146])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 73BC043D48;
	Tue,  4 Oct 2005 20:57:02 +0000 (GMT)
	(envelope-from murray@freebsdmall.com)
Received: by mail.freebsdmall.com (Postfix, from userid 2074)
	id 6641A1CC67; Tue,  4 Oct 2005 13:57:02 -0700 (PDT)
Date: Tue, 4 Oct 2005 13:57:02 -0700
From: Murray Stokely <murray@freebsdmall.com>
To: Ceri Davies <ceri@submonkey.net>, "Simon L. Nielsen" <simon@FreeBSD.org>,
	Hiroki Sato <hrs@FreeBSD.org>, Murray Stokely <murray@FreeBSD.org>,
	Marc Fonvieille <blackend@FreeBSD.org>, doc-committers@FreeBSD.org,
	cvs-doc@FreeBSD.org, cvs-all@FreeBSD.org
Message-ID: <20051004205702.GC21735@freebsdmall.com>
References: <200510041839.j94IdTvk041885@repoman.freebsd.org>
	<20051004194958.GA874@zaphod.nitro.dk>
	<20051004200535.GB73874@submonkey.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20051004200535.GB73874@submonkey.net>
User-Agent: Mutt/1.4.2.1i
X-GPG-Key-ID: 1024D/0E451F7D
X-GPG-Key-Fingerprint: E2CA 411D DD44 53FD BB4B  3CB5 B4D7 10A2 0E45 1F7D
Cc: 
Subject: Re: cvs commit: www/en/events events.xsl
X-BeenThere: cvs-doc@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the doc and www trees <cvs-doc.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-doc>,
	<mailto:cvs-doc-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-doc>
List-Post: <mailto:cvs-doc@freebsd.org>
List-Help: <mailto:cvs-doc-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-doc>,
	<mailto:cvs-doc-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 04 Oct 2005 20:57:03 -0000

On Tue, Oct 04, 2005 at 09:05:35PM +0100, Ceri Davies wrote:
> On Tue, Oct 04, 2005 at 09:49:59PM +0200, Simon L. Nielsen wrote:
> > On 2005.10.04 18:39:29 +0000, Hiroki Sato wrote:
> > > hrs         2005-10-04 18:39:29 UTC
> > > 
> > >   FreeBSD doc repository
> > > 
> > >   Modified files:
> > >     en/events            events.xsl 
> > >   Log:
> > >   Merge new www design.
> > 
> > [picking random commit]
> > 
> > So, does anyone have an idea how much is done and what is still
> > missing?
> 
> God knows; it seems like a bit of a free-for-all from over here.
> Are the builds disabled at the moment?/

It all builds in P4, so just do a diff to see how much remains.  There
are complications because there are newline issues with her design,
and she seems to have messed up a p4 integrate/resolve so you have to
make sure not to overwrite any changes that have been made in the past
few weeks in CVS before merging.  Having people in europe, the U.S.,
and Japan all work on the merge is working well and should allow us to
finish up the merge today for at least a handful of languages.

     - Murray