From owner-cvs-all  Mon Jul 29 14:19:54 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 5A1E837B400; Mon, 29 Jul 2002 14:19:51 -0700 (PDT)
Received: from mail.freebsdmall.com (www.freebsdmall.com [66.220.2.194])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 0B72343E31; Mon, 29 Jul 2002 14:19:31 -0700 (PDT)
	(envelope-from chern@FreeBSD.org)
Received: by mail.freebsdmall.com (Postfix, from userid 2135)
	id BF28B2E883; Mon, 29 Jul 2002 14:19:25 -0700 (PDT)
Received: from localhost (localhost [127.0.0.1])
	by mail.freebsdmall.com (Postfix) with ESMTP
	id BBA812AA64; Mon, 29 Jul 2002 14:19:25 -0700 (PDT)
Date: Mon, 29 Jul 2002 14:19:25 -0700 (PDT)
From: Chern Lee <chern@FreeBSD.org>
X-X-Sender:  <chern@www.freebsdmall.com>
To: John Baldwin <jhb@FreeBSD.org>
Cc: Marc Fonvieille <blackend@FreeBSD.org>, <cvs-all@FreeBSD.org>,
	<cvs-committers@FreeBSD.org>
Subject: Re: cvs commit: doc/en_US.ISO8859-1/articles/contributing articl
In-Reply-To: <XFMail.20020729083938.jhb@FreeBSD.org>
Message-ID: <20020729141730.E29717-100000@www.freebsdmall.com>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
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 Mon, 29 Jul 2002, John Baldwin wrote:

>
> On 29-Jul-2002 Marc Fonvieille wrote:
> > -     <screen>&prompt.user; <userinput>diff -c oldfile newfile</userinput></screen>
> > +     <screen>&prompt.user; <userinput>diff -u -c oldfile newfile</userinput></screen>
> >
> >       or
> >
> > -     <screen>&prompt.user; <userinput>diff -c -r olddir newdir</userinput></screen>
> > +     <screen>&prompt.user; <userinput>diff -u -c -r olddir newdir</userinput></screen>
> >
> > -c -u ? It will result in output style conflicts.

Oops, my mistake... subject of late-night PR closing.

>
> Hmm, it should only use one.  Plus, I think that saying one is always
> preferred over another isn't correct.  If you've completely rewritten a
> chunk of code, -c is often easier to read, but if you are changing stuff
> within a few lones, -u is preferred.
>

I don't think I've ever seen a context diff used in the recent doc world,
but since you're a man of the source I'll make this change.

- chern


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