From nobody@FreeBSD.org  Thu Nov  3 02:32:30 2005
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id E49C716A41F
	for <freebsd-gnats-submit@FreeBSD.org>; Thu,  3 Nov 2005 02:32:30 +0000 (GMT)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [216.136.204.117])
	by mx1.FreeBSD.org (Postfix) with ESMTP id A938443D49
	for <freebsd-gnats-submit@FreeBSD.org>; Thu,  3 Nov 2005 02:32:30 +0000 (GMT)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.13.1/8.13.1) with ESMTP id jA32WUTA055876
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 3 Nov 2005 02:32:30 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.13.1/8.13.1/Submit) id jA32WUxq055875;
	Thu, 3 Nov 2005 02:32:30 GMT
	(envelope-from nobody)
Message-Id: <200511030232.jA32WUxq055875@www.freebsd.org>
Date: Thu, 3 Nov 2005 02:32:30 GMT
From: Jimmie James <jimmiejaz@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: Diff (1) error.
X-Send-Pr-Version: www-2.3

>Number:         88427
>Category:       docs
>Synopsis:       Diff (1) error.
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-doc
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          doc-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Nov 03 02:40:17 GMT 2005
>Closed-Date:    Sun Dec 25 03:17:32 GMT 2005
>Last-Modified:  Sun Dec 25 03:17:32 GMT 2005
>Originator:     Jimmie James
>Release:        FreeBSD 6.0-RC1
>Organization:
Toronto 2600
>Environment:
FreeBSD fortytwo.zapto.org 6.0-RC1 FreeBSD 6.0-RC1 #0: Fri Oct 21 20:25:22 EDT 2005     root@fortytwo.zapto.org:/usr/obj/usr/src/sys/FORTYTWO  i386

>Description:
man (1) diff says to use        diff -crN foo.orig foo >foo.diff  to create a diff patch, where it should be -urN (as told to me by dho on ##freebsd)
>How-To-Repeat:
Read the man (1) diff and on the website http://www.freebsd.org/cgi/man.cgi?query=diff&sektion=1

>Fix:
--- diff.orig   Wed Nov  2 21:31:06 2005
+++ diff.1      Wed Nov  2 21:31:17 2005
@@ -494,7 +494,7 @@
 .B send-pr(1)
 program), you could type
 .sp
-diff -crN foo.orig foo >foo.diff
+diff -urN foo.orig foo >foo.diff
 .sp
 where
 .I foo.orig

>Release-Note:
>Audit-Trail:

From: Giorgos Keramidas <keramida@freebsd.org>
To: Jimmie James <jimmiejaz@gmail.com>
Cc: bug-followup@freebsd.org
Subject: Re: docs/88427: Diff (1) error.
Date: Thu, 3 Nov 2005 18:28:49 +0200

 On 2005-11-03 02:32, Jimmie James <jimmiejaz@gmail.com> wrote:
 > man (1) diff says to use diff -crN foo.orig foo >foo.diff to create
 > a diff patch, where it should be -urN (as told to me by dho on
 > ##freebsd)
 
 Both ways are valid.  This is not a bug in the manpage.
 
 It may be preferrable to use one of the two in some cases, but that's
 definitely not something that we have to document as "The One True
 Way" of generating patches.
 
State-Changed-From-To: open->closed 
State-Changed-By: linimon 
State-Changed-When: Sun Dec 25 03:16:21 UTC 2005 
State-Changed-Why:  
This appears to be one of those matters that is of personal preference. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=88427 
>Unformatted:
