cleanup of 6.2: Options, set, and editor startup files

- remove options we don't support
- correct default values
- nicer formatting of table
- remove reference to edit

1 files changed, 11 insertions, 15 deletions

diff --git a/usr.bin/vi/docs/USD.doc/vitut/vi.in b/usr.bin/vi/docs/USD.doc/vitut/vi.in
index 60eb17136b9..be31bdde964 100644
--- a/usr.bin/vi/docs/USD.doc/vitut/vi.in
+++ b/usr.bin/vi/docs/USD.doc/vitut/vi.in
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: vi.in,v 1.6 2004/01/24 12:29:13 jmc Exp $
+.\"	$OpenBSD: vi.in,v 1.7 2004/02/20 13:15:51 jmc Exp $
 .\"
 .\" Copyright (c) 1980, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -1195,19 +1195,16 @@ l l l a.
 Name	Default	Description
 _
 autoindent	noai	Supply indentation automatically
-autowrite	noaw	Automatic write before \fB:n\fR, \fB:ta\fR, \fB^^\fR, \fB!\fR
+autowrite	noaw	Auto write before \fB:n\fR, \fB:ta\fR, \fB^^\fR, \fB!\fR
 ignorecase	noic	Ignore case in searching
-.\" lisp	nolisp	\fB( { ) }\fR commands deal with S-expressions
-list	nolist	Tabs print as ^I; end of lines marked $
-magic	nomagic	. [ and * are special in scans
+list	nolist	Tabs print as ^I; end of lines $
+magic	magic	. [ and * are special in scans
 number	nonu	Lines prefixed with line numbers
-paragraphs	para=IPLPPPQPbpP LI	Macro names which start paragraphs
-redraw	nore	Simulate a smart terminal on a dumb one
-sections	sect=NHSHH HU	Macro names which start new sections
-shiftwidth	sw=8	Shift distance for <, > and \fB^D\fP and \fB^T\fR
-showmatch	nosm	Show matching \fB(\fP or \fB{\fP as \fB)\fP or \fB}\fR is typed
-.\" slowopen	slow	Postpone display updates during inserts
-term	dumb	The kind of terminal you are using.
+paragraphs	para=IPLPPPQPP LIpplpipbp	Macros which start paragraphs
+sections	sect=NHSHH HUnhsh	Macros which start new sections
+shiftwidth	sw=8	Shift distance for <, >, \fB^D\fP and \fB^T\fR
+showmatch	nosm	Show matching \fB(\fP or \fB{\fP
+term	$TERM	The kind of terminal being used
 .TE
 .KE
 These statements can be placed in your EXINIT in your environment,
@@ -1235,7 +1232,7 @@ All commands which start with
 .B :
 are \fIex\fP commands.
 .FE
-which are to be run every time you start up \fIex\fP, \fIedit\fP,
+which are to be run every time you start up \fIex\fP
 or \fIvi\fP.
 A typical list includes a \fBset\fP command, and possibly a few
 \fBmap\fP commands.
@@ -1268,8 +1265,7 @@ put these lines in the file
 .I .profile
 in your home directory:
 .DS
-EXINIT='set ai aw terse|map @ dd|map # x'
-export EXINIT
+export EXINIT='set ai aw terse|map @ dd|map # x'
 .DE
 Of course, the particulars of the line would depend on which options
 you wanted to set.