Date: Mon, 12 Mar 2001 09:23:10 -0500 (EST) From: mwlucas@blackhelicopters.org To: FreeBSD-gnats-submit@freebsd.org Subject: docs/25735: handbook correction Message-ID: <200103121423.f2CENAG00879@turtledawn.blackhelicopters.org>
next in thread | raw e-mail | index | archive | help
>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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200103121423.f2CENAG00879>