From owner-freebsd-doc@FreeBSD.ORG  Thu Nov  3 02:40:19 2005
Return-Path: <owner-freebsd-doc@FreeBSD.ORG>
X-Original-To: freebsd-doc@hub.freebsd.org
Delivered-To: freebsd-doc@hub.freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id D646C16A420
	for <freebsd-doc@hub.freebsd.org>; Thu,  3 Nov 2005 02:40:18 +0000 (GMT)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id B74DC43D53
	for <freebsd-doc@hub.freebsd.org>; Thu,  3 Nov 2005 02:40:17 +0000 (GMT)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1])
	by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id jA32eH7S024403
	for <freebsd-doc@freefall.freebsd.org>; Thu, 3 Nov 2005 02:40:17 GMT
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.13.3/8.13.1/Submit) id jA32eHB6024402;
	Thu, 3 Nov 2005 02:40:17 GMT (envelope-from gnats)
Resent-Date: Thu, 3 Nov 2005 02:40:17 GMT
Resent-Message-Id: <200511030240.jA32eHB6024402@freefall.freebsd.org>
Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer)
Resent-To: freebsd-doc@FreeBSD.org
Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org,
	Jimmie James <jimmiejaz@gmail.com>
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
X-Send-Pr-Version: www-2.3
Cc: 
Subject: docs/88427: Diff (1) error.
X-BeenThere: freebsd-doc@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Documentation project <freebsd-doc.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-doc>,
	<mailto:freebsd-doc-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-doc>
List-Post: <mailto:freebsd-doc@freebsd.org>
List-Help: <mailto:freebsd-doc-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-doc>,
	<mailto:freebsd-doc-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 03 Nov 2005 02:40:20 -0000


>Number:         88427
>Category:       docs
>Synopsis:       Diff (1) error.
>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:   Thu Nov 03 02:40:17 GMT 2005
>Closed-Date:
>Last-Modified:
>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:
>Unformatted: