From owner-cvs-all  Mon Jul 29  5:25:32 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 EB35937B400; Mon, 29 Jul 2002 05:25:26 -0700 (PDT)
Received: from abigail.blackend.org (blackend.org [212.11.50.35])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 31F3D43E4A; Mon, 29 Jul 2002 05:25:18 -0700 (PDT)
	(envelope-from marc@blackend.org)
Received: from abigail.blackend.org (localhost [127.0.0.1])
	by abigail.blackend.org (8.12.3/8.12.3/ - 15/04/02) with ESMTP id g6TCMbfE019892;
	Mon, 29 Jul 2002 14:22:37 +0200 (CEST)
	(envelope-from marc@abigail.blackend.org)
Received: (from marc@localhost)
	by abigail.blackend.org (8.12.3/8.12.3/Submit) id g6TCMbCv019891;
	Mon, 29 Jul 2002 14:22:37 +0200 (CEST)
	(envelope-from marc)
Date: Mon, 29 Jul 2002 14:22:37 +0200
From: Marc Fonvieille <blackend@FreeBSD.org>
To: Chern Lee <chern@FreeBSD.org>
Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: Re: cvs commit: doc/en_US.ISO8859-1/articles/contributing article.sgml
Message-ID: <20020729142237.C18707@abigail.blackend.org>
References: <200207291139.g6TBd5Wp036446@freefall.freebsd.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.2.5.1i
In-Reply-To: <200207291139.g6TBd5Wp036446@freefall.freebsd.org>; from chern@FreeBSD.org on Mon, Jul 29, 2002 at 04:39:05AM -0700
X-Useless-Header: blackend.org
X-Operating-System: FreeBSD 4.6-PRERELEASE
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, Jul 29, 2002 at 04:39:05AM -0700, Chern Lee wrote:
> chern       2002/07/29 04:39:05 PDT
> 
>   Modified files:
>     en_US.ISO8859-1/articles/contributing article.sgml 
>   Log:
>   We prefer unified diffs.
>   
>   Change 'context diff' -> 'unified diff'
>   
>   PR:             docs/38728
>   Submitted by:   Pete Zaitcev <zaitcev@yahoo.com>
>   
>   Revision  Changes    Path
>   1.488     +3 -3      doc/en_US.ISO8859-1/articles/contributing/article.sgml

-	<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.

Marc

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