Date: Mon, 12 Mar 2001 11:28:11 -0800 (PST) From: John Baldwin <jhb@FreeBSD.org> To: Michael Lucas <mwlucas@blackhelicopters.org> Cc: freebsd-doc@FreeBSD.org, gnats-admin@FreeBSD.org Subject: Re: docs/25735: handbook correction Message-ID: <XFMail.010312112811.jhb@FreeBSD.org> In-Reply-To: <20010312093123.A95137@blackhelicopters.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 12-Mar-01 Michael Lucas wrote: > On Mon, Mar 12, 2001 at 06:30:01AM -0800, gnats-admin@FreeBSD.org wrote: >> Thank you very much for your problem report. >> It has the internal identification `docs/25735'. >> The individual assigned to look at your >> report is: freebsd-doc. >> >> You can access the state of your problem report at any time >> via this link: >> >> http://www.freebsd.org/cgi/query-pr.cgi?pr=25735 >> >> >Category: docs >> >Responsible: freebsd-doc >> >Synopsis: error in handbook >> >Arrival-Date: Mon Mar 12 06:30:01 PST 2001 > > DOH! > > Please try the following patch instead. Actually, I prefer the first patch, since in general, we prefer context diffs, which is a superset of -c diffs and -u diffs. (You did read the whole, thread, right?) Unfortunately, the language in the manpage probably makes all of this change necessarily, as 'context' is ambiguously (ab)used. :( Also, your patch is reversed, but that's nothing that patch -R can't fix (and patch will catch it anyways and prompt to DTRT.) > --- chapter.sgml Mon Mar 12 09:24:56 2001 > +++ chapter.sgml-dist Mon Mar 12 09:11:46 2001 > @@ -497,17 +497,17 @@ > <para>Assuming that you can manage to secure fairly up-to-date sources > to base your changes on, the next step is to produce a set of diffs to > send to the FreeBSD maintainers. This is done with the &man.diff.1; > - command, with the <quote>unified diff</quote> form > + command, with the <quote>context diff</quote> form > 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 unified diffs for the given source file > + 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 > details.</para> -- John Baldwin <jhb@FreeBSD.org> -- http://www.FreeBSD.org/~jhb/ PGP Key: http://www.baldwin.cx/~john/pgpkey.asc "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ 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?XFMail.010312112811.jhb>