From owner-freebsd-doc  Mon Mar 12  6:30: 6 2001
Delivered-To: freebsd-doc@freebsd.org
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id E84FC37B71A
	for <freebsd-doc@freebsd.org>; Mon, 12 Mar 2001 06:30:01 -0800 (PST)
	(envelope-from gnats@FreeBSD.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.11.1/8.11.1) id f2CEU1P34111;
	Mon, 12 Mar 2001 06:30:01 -0800 (PST)
	(envelope-from gnats)
Received: from turtledawn.blackhelicopters.org (mag.gltg.com [198.88.118.10])
	by hub.freebsd.org (Postfix) with ESMTP id 690BA37B718
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 12 Mar 2001 06:23:10 -0800 (PST)
	(envelope-from mwlucas@turtledawn.blackhelicopters.org)
Received: (from mwlucas@localhost)
	by turtledawn.blackhelicopters.org (8.11.3/8.11.2) id f2CENAG00879;
	Mon, 12 Mar 2001 09:23:10 -0500 (EST)
	(envelope-from mwlucas)
Message-Id: <200103121423.f2CENAG00879@turtledawn.blackhelicopters.org>
Date: Mon, 12 Mar 2001 09:23:10 -0500 (EST)
From: mwlucas@blackhelicopters.org
Reply-To: mwlucas@blackhelicopters.org
To: FreeBSD-gnats-submit@freebsd.org
X-Send-Pr-Version: 3.113
Subject: docs/25735: handbook correction
Sender: owner-freebsd-doc@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org


>Number:         25735
>Category:       docs
>Synopsis:       error in handbook
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-doc
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          doc-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Mar 12 06:30:01 PST 2001
>Closed-Date:
>Last-Modified:
>Originator:     Michael Lucas
>Release:        FreeBSD 5.0-CURRENT i386
>Organization:
None
>Environment:
System: FreeBSD turtledawn.blackhelicopters.org 5.0-CURRENT FreeBSD 5.0-CURRENT #3: Fri Mar 9 12:12:04 EST 2001 mwlucas@turtledawn.blackhelicopters.org:/usr/obj/usr/src/sys/TURTLEDAWN i386


>Description:

The handbook says that context diffs are preferred.  Unified diffs are
the consensus on -hackers, i.e.:

Date: Sat, 10 Mar 2001 12:03:18 -0800
From: Jordan Hubbard <jkh@osd.bsdi.com>
Subject: Re: context or unified diffs in PRs?
To: mwlucas@blackhelicopters.org           
Cc: hackers@FreeBSD.ORG                                 
X-Mailer: Mew version 1.94.1 on Emacs 20.7 / Mule 4.0 (HANANOEN)

The handbook is wrong.  Unidiffs are a far more advanced lifeform
than context diffs. :)
     
- Jordan 


>How-To-Repeat:
	
>Fix:


in /usr/doc/en_US.ISO_8859-1/books/handbook/contrib:

--- chapter.sgml	Mon Mar 12 09:12:08 2001
+++ chapter.sgml-dist	Mon Mar 12 09:11:46 2001
@@ -501,11 +501,11 @@
 	being preferred.  For example:</para>
       
       <para>
-	<screen>&prompt.user; <userinput>diff -u oldfile newfile</userinput></screen>
+	<screen>&prompt.user; <userinput>diff -c oldfile newfile</userinput></screen>
 
 	or
 
-	<screen>&prompt.user; <userinput>diff -u -r olddir newdir</userinput></screen>
+	<screen>&prompt.user; <userinput>diff -c -r olddir newdir</userinput></screen>
 	    
 	would generate such a set of context diffs for the given source file
 	or directory hierarchy.  See the man page for &man.diff.1; for more


>Release-Note:
>Audit-Trail:
>Unformatted:

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