PERFORCE change 144662 for review

[Gabor Kovesdan]

http://perforce.freebsd.org/chv.cgi?CH=144662

Change 144662 by gabor at gabor_server on 2008/07/04 20:29:47

	- Document recently added features
	- Fix typo
	- Add a new section for miscallenous options
	- Bump .Dd

Affected files ...

.. //depot/projects/soc2008/gabor_textproc/diff/diff.1#2 edit

Differences ...

==== //depot/projects/soc2008/gabor_textproc/diff/diff.1#2 (text+ko) ====

@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)diff.1	8.1 (Berkeley) 6/30/93
 .\"
-.Dd Apr 7, 2008
+.Dd Jul 4, 2008
 .Dt DIFF 1
 .Os
 .Sh NAME
@@ -78,6 +78,14 @@
 .Ek
 .Ar dir1 dir2
 .Nm diff
+.Op Fl Fl from-file Ar file1
+.Ar file2
+.Op Ar file3 ...
+.Nm diff
+.Op Fl Fl to-file Ar file1
+.Ar file2
+.Op Ar file3 ...
+.Nm diff
 .Op Fl v
 .Sh DESCRIPTION
 The
@@ -161,6 +169,10 @@
 insert or delete command.
 This is the form used by
 .Xr rcsdiff 1 .
+.It Fl Fl normal
+Produces a normal diff.
+This is the default behaviour and this option is preserved for
+compatibility.
 .It Fl q , Fl Fl brief
 Just print a line when the files differ.
 Does not output a list of changes.
@@ -204,6 +216,14 @@
 Try very hard to produce a diff as small as possible.
 This may consume a lot of processing power and memory when processing
 large files with many changes.
+.It Fl Fl from-file Ns = Ns Ar file
+Takes
+.Ar file
+as a source of comparison and compares each argument to
+.Ar file .
+The
+.Ar file
+argument can be a directory.
 .It Fl I Ar pattern , Fl Fl ignore-matching-lines Ns = Ns Ar pattern
 Ignores changes, insertions, and deletions whose lines match the
 extended regular expression
@@ -253,6 +273,14 @@
 the indentation of the original source lines and make the output listing
 difficult to interpret.
 This option will preserve the original source's indentation.
+.It Fl Fl to-file Ns = Ns file
+Takes
+.Ar file
+as a destination of comparison and compares each argument to
+.Ar file .
+The
+.Ar file
+argument can be a directory.
 .It Fl w , Fl Fl ignore-all-space
 Is similar to
 .Fl b
@@ -265,9 +293,14 @@
 .Pp
 Directory comparison options:
 .Bl -tag -width Ds
+.It Fl Fl ignore-file-name-case
+Ignore the file name cases when comparing directories.
 .It Fl N , Fl Fl new-file
 If a file is found in only one directory, act as if it was found in the
 other directory too but was of zero size.
+.It Fl Fl no-ignore-file-name-case
+Compare directories with case sensitivity.
+This is the default.
 .It Fl P
 If a file is found only in
 .Ar dir2 ,
@@ -302,8 +335,14 @@
 Multiple
 .Fl x
 options may be specified.
+.El
+.Pp
+Miscallenaous options:
+.Bl -tag -width Ds
+.It Fl Fl help
+Prints usage info.
 .It Fl v , Fl Fl version
-Print version ino.
+Prints version info.
 .El
 .Pp
 If both arguments are directories,