Some minor doc updates that should have gotten commited ages ago.

3 files changed, 57 insertions, 38 deletions

diff --git a/usr.bin/vi/FAQ b/usr.bin/vi/FAQ
index 357650a589b..f29fd0d52b1 100644
--- a/usr.bin/vi/FAQ
+++ b/usr.bin/vi/FAQ
@@ -115,8 +115,8 @@ A: The Sun console can't handle the 'al' capability of the termcap
 Q: I don't have a version of ctags (or I have ctags, but it doesn't tag
    nearly enough things)!
 A: There's a version of ctags available on the 4.4BSD-Lite distributions,
-   as well as the FreeBSD, NetBSD, Linux and GNU distributions.  Or, you
-   might want to try Exuberant Ctags:
+   as well as the OpenBSD, FreeBSD, NetBSD, Linux and GNU distributions.
+   Or, you might want to try Exuberant Ctags:
 
 	Title:		Exuberant Ctags
 	Version:	1.3
diff --git a/usr.bin/vi/LICENSE b/usr.bin/vi/LICENSE
index 78e8f4a40e1..5c8042e751d 100644
--- a/usr.bin/vi/LICENSE
+++ b/usr.bin/vi/LICENSE
@@ -1,14 +1,12 @@
-The vi program is freely redistributable.  You are welcome to copy, modify
-and share it with others under the conditions listed in this file.  If any
-company (not any individual!) finds vi sufficiently useful that you would
-have purchased it, or if any company wishes to redistribute it, contributions
-to the authors would be appreciated.
+Copyright (c) 1996, 1997
+	Sleepycat Software.  All rights reserved.
 
-/*-
+Copyright (c) 1991, 1992, 1993, 1994, 1995, 1996
+	Keith Bostic.  All rights reserved.
+
+/*
  * Copyright (c) 1991, 1992, 1993, 1994
  *      The Regents of the University of California.  All rights reserved.
- *  Copyright (c) 1991, 1992, 1993, 1994, 1995, 1996
- *	Keith Bostic.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/usr.bin/vi/README b/usr.bin/vi/README
index 33db36a5c86..48fddc74ccc 100644
--- a/usr.bin/vi/README
+++ b/usr.bin/vi/README
@@ -1,31 +1,52 @@
-#	@(#)README	8.147 (Berkeley) 10/19/96
-
-This is the README for nex/nvi, a freely redistributable implementation
-of the ex/vi text editors originally distributed as part of the Fourth
-Berkeley Software Distribution (4BSD), by the University of California,
-Berkeley.
-
-The source code for nex/nvi can be retrieved by using anonymous ftp to
-ftp.cs.berkeley.edu.  The file ucb/4bsd/nvi.tar.gz is the gzip'd archive,
-of version 1.71 of nex/nvi.  This version is believed to be stable and
-problem free.  The file ucb/4bsd/nvi-###.ALPHA.tar.gz is a gzip'd archive
-of the current alpha-test release of nex/nvi.  This version reflects the
-current development tree, and will be more likely to have problems.
-
-See the file:
-	build/README	for information on building nvi.
-	LAYOUT		for a description of where everything is.
-	LICENSE		for the copyright and redistribution terms.
-
-If you have any questions about nex/nvi, problems with it, or concerns
-about the conditions for redistribution, please contact me:
-
-	Keith Bostic		+1-508-287-4781
-	394 E. Riding Dr.	bostic@bostic.com
-	Carlisle, MA 01741
-	USA
-
-Keith Bostic
+#	@(#)README	8.149 (Berkeley) 7/14/97
+
+This is version 1.79 (7/14/97) of nex/nvi, a reimplementation of the ex/vi
+text editors originally distributed as part of the Fourth Berkeley
+Software Distribution (4BSD), by the University of California, Berkeley.
+
+The directory layout is as follows:
+
+    FAQ ........... Frequently asked questions.
+    LICENSE ....... Copyright, use and redistribution information.
+    README ........ This file.
+    catalog ....... Message catalogs; see catalog/README.
+    changelog ..... Log of changes from version to version.
+    cl ............ Vi interface to the curses(3) library.
+    clib .......... C library replacement source code.
+    common ........ Code shared by ex and vi.
+    curses ........ A stripped-down, replacement curses(3) library.
+    db ............ A stripped-down, replacement db(3) library.
+    dist .......... Various files used to build the vi distribution.
+    docs .......... Ex/vi documentation, both current and historic.
+    docs/README ... Documentation overview.
+    docs/edit ..... Edit: A tutorial.
+    docs/exref .... Ex Reference Manual -- Version 3.7.
+    docs/vi.man ... UNIX manual page for nex/nvi.
+    docs/vi.ref ... Nex/nvi reference manual.
+    docs/vitut .... An Introduction to Display Editing with Vi.
+    ex ............ Ex source code.
+    include ....... Replacement include files.
+    ip ............ Library interface to vi: vi side.
+    ipc ........... Library interface to vi: application side.
+    motif ......... Vi motif application.
+    motif_l ....... Motif library interface to vi.
+    perl_api ...... Perl scripting language support.
+    perl_scripts .. Perl scripts.
+    regex ......... POSIX 1003.2 regular expression library.
+    tcl_api ....... Tcl scripting language support.
+    tcl_scripts ... Tcl scripts.
+    vi ............ Vi source code.
+
+Bug fixes and updated versions of this software will periodically be made
+available.  For more information see:
+
+	http://www.bostic.com/vi
+
+To ask questions about vi, report vi problems, request notification of
+future releases and/or bug fixes, or to contact the authors for any reason,
+please send email to:
+
+	bostic@bostic.com
 
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 o This software is several years old and is the product of many folks' work.