summaryrefslogtreecommitdiff
path: root/usr.bin/sdiff
diff options
context:
space:
mode:
authorJason McIntyre <jmc@cvs.openbsd.org>2005-12-29 10:02:18 +0000
committerJason McIntyre <jmc@cvs.openbsd.org>2005-12-29 10:02:18 +0000
commitdd326995ca510b0e04a3dc4712731638aa9472fb (patch)
tree222dd4a7170ded81ac4c39ac72fc6c2e7473c7f6 /usr.bin/sdiff
parent9e791751887729f61ed8c4692a972e31834077ea (diff)
add an ENVIRONMENT section, and document EDITOR and VISUAL;
ok tedu
Diffstat (limited to 'usr.bin/sdiff')
-rw-r--r--usr.bin/sdiff/sdiff.132
1 files changed, 30 insertions, 2 deletions
diff --git a/usr.bin/sdiff/sdiff.1 b/usr.bin/sdiff/sdiff.1
index 85611dd5249..1fd07cc64c5 100644
--- a/usr.bin/sdiff/sdiff.1
+++ b/usr.bin/sdiff/sdiff.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sdiff.1,v 1.5 2005/12/27 12:45:57 jmc Exp $
+.\" $OpenBSD: sdiff.1,v 1.6 2005/12/29 10:02:17 jmc Exp $
.\"
.\" Written by Raymond Lai <ray@cyth.net>.
.\" Public domain.
@@ -32,6 +32,12 @@ and
into
.Ar outfile .
In this mode, the user is prompted for each set of differences.
+See
+.Ev EDITOR
+and
+.Ev VISUAL ,
+below,
+for details of which editor, if any, is invoked.
.Pp
The commands are as follows:
.Bl -tag -width Ds
@@ -94,9 +100,31 @@ Ignore all spaces
flag is passed to
.Xr diff 1 ) .
.El
+.Sh ENVIRONMENT
+.Bl -tag -width Ds
+.It Ev EDITOR , VISUAL
+Specifies an editor to use with the
+.Fl o
+option.
+If both
+.Ev EDITOR
+and
+.Ev VISUAL
+are set,
+.Ev VISUAL
+takes precedence.
+If neither
+.Ev EDITOR
+nor
+.Ev VISUAL
+are set,
+the default is
+.Xr vi 1 .
+.El
.Sh SEE ALSO
.Xr diff 1 ,
-.Xr diff3 1
+.Xr diff3 1 ,
+.Xr vi 1
.Sh AUTHORS
.Nm
was written from scratch for the public domain by