summaryrefslogtreecommitdiff
path: root/usr.bin/diff
diff options
context:
space:
mode:
authorJason McIntyre <jmc@cvs.openbsd.org>2005-01-06 00:28:54 +0000
committerJason McIntyre <jmc@cvs.openbsd.org>2005-01-06 00:28:54 +0000
commit8481d1fea65dc03ced81d8c82b53a30175f4b9f2 (patch)
tree7199cd79269950a80382bd5057e022ec7f7f49d5 /usr.bin/diff
parentd08cfb0daf805388e75494a8a07535e574d694bb (diff)
clarify what -a does;
prod and ok deraadt@
Diffstat (limited to 'usr.bin/diff')
-rw-r--r--usr.bin/diff/diff.113
1 files changed, 11 insertions, 2 deletions
diff --git a/usr.bin/diff/diff.1 b/usr.bin/diff/diff.1
index b14ca7d5519..a694f291049 100644
--- a/usr.bin/diff/diff.1
+++ b/usr.bin/diff/diff.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: diff.1,v 1.27 2004/12/09 18:56:10 millert Exp $
+.\" $OpenBSD: diff.1,v 1.28 2005/01/06 00:28:53 jmc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -186,7 +186,16 @@ Comparison options:
.Bl -tag -width Ds
.It Fl a
Treat all files as
-.Tn ASCII .
+.Tn ASCII
+text.
+Normally
+.Nm
+will simply print
+.Dq Binary files ... differ
+if files contain binary characters.
+Use of this option forces
+.Nm
+to produce a diff.
.It Fl b
Causes trailing blanks (spaces and tabs) to be ignored, and other
strings of blanks to compare equal.