From owner-freebsd-doc Tue Jun 29 8:50:14 1999 Delivered-To: freebsd-doc@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id 33CBE1508E for ; Tue, 29 Jun 1999 08:50:07 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id IAA00473; Tue, 29 Jun 1999 08:50:06 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Date: Tue, 29 Jun 1999 08:50:06 -0700 (PDT) Message-Id: <199906291550.IAA00473@freefall.freebsd.org> To: freebsd-doc@freebsd.org Cc: From: Sheldon Hearn Subject: Re: docs/12440: added an example to diff(1) man page Reply-To: Sheldon Hearn Sender: owner-freebsd-doc@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org The following reply was made to PR docs/12440; it has been noted by GNATS. From: Sheldon Hearn To: freebsd-gnats-submit@freebsd.org Cc: mpp@freebsd.org Subject: Re: docs/12440: added an example to diff(1) man page Date: Tue, 29 Jun 1999 15:13:08 +0200 The handbook says that the context diff is preferred, but your example uses the unified diff. Funnily enough, though, I note that both you and I obviously prefer unified diffs. :-) You should call the section "EXAMPLES" instead of "EXAMPLE" to keep the manpage consistent with other manpages and with the guidelines in the mdoc.samples(7) manpage. Also, you really are putting your information in the wrong place. You might be able to get away with that by changing the wording. Are you happy with the diff below? Ciao, Sheldon. Index: diff.1 =================================================================== RCS file: /home/ncvs/src/gnu/usr.bin/diff/diff.1,v retrieving revision 1.3 diff -u -d -r1.3 diff.1 --- diff.1 1996/05/26 22:27:52 1.3 +++ diff.1 1999/06/29 13:09:26 @@ -463,6 +463,20 @@ .TP .B \-y Use the side by side output format. +.SH EXAMPLES +To save to a file some changes that you have made to your local source +tree (possibly including new files), which you would like to show to others +(perhaps using the +.B send-pr(1) +program), you could type +.sp +diff -crN foo.orig foo >foo.diff +.sp +where +.I foo.orig +and +.I foo +might be directory hierarchies or single files. .SH SEE ALSO cmp(1), comm(1), diff3(1), ed(1), patch(1), pr(1), sdiff(1). .SH DIAGNOSTICS To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-doc" in the body of the message