From owner-freebsd-stable  Wed Jul 19 14:44:22 2000
Delivered-To: freebsd-stable@freebsd.org
Received: from scientia.demon.co.uk (scientia.demon.co.uk [212.228.14.13])
	by hub.freebsd.org (Postfix) with ESMTP id 303C637C0BC
	for <stable@freebsd.org>; Wed, 19 Jul 2000 14:44:13 -0700 (PDT)
	(envelope-from ben@scientia.demon.co.uk)
Received: from strontium.scientia.demon.co.uk ([192.168.91.36] ident=exim)
	by scientia.demon.co.uk with esmtp (Exim 3.15 #1)
	id 13F0lq-000GlD-00; Wed, 19 Jul 2000 21:48:46 +0100
Received: (from ben) by strontium.scientia.demon.co.uk (Exim 3.15 #1)
	id 13F0lp-000DTt-00; Wed, 19 Jul 2000 21:48:45 +0100
Date: Wed, 19 Jul 2000 21:48:45 +0100
From: Ben Smithurst <ben@FreeBSD.org>
To: Stephen Montgomery-Smith <stephen@math.missouri.edu>
Cc: stable@FreeBSD.ORG
Subject: Re: Small handbook error
Message-ID: <20000719214845.B75784@strontium.scientia.demon.co.uk>
References: <Pine.BSF.4.21.0007190228330.18954-100000@wysoft.tzo.com> <3975C623.1EFBFAE8@math.missouri.edu>
Mime-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-md5;
	protocol="application/pgp-signature"; boundary="V0207lvV8h4k8FAm"
Content-Disposition: inline
User-Agent: Mutt/1.2i
In-Reply-To: <3975C623.1EFBFAE8@math.missouri.edu>
Sender: owner-freebsd-stable@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG


--V0207lvV8h4k8FAm
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Stephen Montgomery-Smith wrote:

> diff -c new-file old-file
>=20
> or
>=20
> diff -c old-file new-file   ?

SYNOPSIS
       diff [options] from-file to-file

That will create a diff which takes you from "from-file" to "to-file",
so "from-file" is the original, "to-file" is your edited copy.

i.e.

	$ cp foo.c foo.c.orig
	$ vi foo.c
	<hack, hack, hack>
	$ diff -u foo.c.orig foo.c

--=20
Ben Smithurst                 / ben@FreeBSD.org / PGP: 0x99392F7D
FreeBSD Documentation Project /

--V0207lvV8h4k8FAm
Content-Type: application/pgp-signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: PGPfreeware 5.0i for non-commercial use
MessageID: sV15DiPwluW8t7qRD8sT22zHYi+itnP5

iQCVAwUBOXYULCsPVtiZOS99AQHFKgP/RuMuxTVYU37U/pONsmxzcjjxuDczj/BZ
TJYIR0gPCYuP7Y9fikIr4fOx6zdqP2vkcxj9l5ztQzZG628XMvvj08TICALVF7mU
3juhhAnXCZc/xI81Ap9Ou/4VVFxB2j41x+f+etZw/w7P0FAdIVczPvW+zCXJqTt/
/4C0OjRUDZY=
=I9Xq
-----END PGP SIGNATURE-----

--V0207lvV8h4k8FAm--


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-stable" in the body of the message