add missing reference to infocmp

8 files changed, 84 insertions, 74 deletions

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.  
diff --git a/usr.bin/vi/build/README b/usr.bin/vi/build/README
index 2d0447faea2..efbce2b9dfb 100644
--- a/usr.bin/vi/build/README
+++ b/usr.bin/vi/build/README
@@ -1,4 +1,4 @@
-#	@(#)README	8.24 (Berkeley) 6/20/96
+#	@(#)README	8.26 (Berkeley) 10/19/96
 
 Nvi uses the GNU autoconf program for configuration and compilation.  You
 should enter:
@@ -271,47 +271,41 @@ INSTALLING NVI
 Nvi installs the following files into the following locations, with
 the following default values:
 
-File(s):		Location
-			Default Location
-----------------------------------------
-vi			$(exec_prefix)/$(bindir)/vi
-			/usr/local/bin/vi
-
-vi.0			$(prefix)/$(mandir)/cat1/vi.0
-			/usr/local/man/cat1/vi.0
-
-Message Catalogs	$(prefix)/$(datadir)/vi/catalog/
-			/usr/local/share/vi/catalog/
-
-Perl5 scripts		$(prefix)/$(datadir)/vi/perl/
-			/usr/local/share/vi/perl/
+Variables:		Default value:
+prefix			/usr/local
+exec_prefix		$(prefix)
+bindir			$(prefix)/bin
+datadir			$(prefix)/share
+mandir			$(prefix)/man
 
-Tcl scripts		$(prefix)/$(datadir)/vi/tcl/
-			/usr/local/share/vi/tcl/
+File(s):		Default location
+----------------------------------------
+vi			$(bindir)/vi
+vi.1			$(mandir)/man1/vi.1
+vi.0			$(mandir)/cat1/vi.0
+Perl scripts		$(datadir)/vi/perl/
+Tcl scripts		$(datadir)/vi/tcl/
+Message Catalogs	$(datadir)/vi/catalog/
 
 Notes:
 	There are two hard links to the vi program, named ex and view.
-	Similarly, there are two hard links to the vi manual page, named
-	ex.0 and view.0.  These links are created when the program and
-	man pages are installed.
+	Similarly, there are two hard links to the unformatted vi manual
+	page, named ex.1 and view.1, and two hard links to the formatted
+	manual page, named ex.0 and view.0.  These links are created when
+	the program and man pages are installed.
 
 	If you want to install vi, ex, view and the man pages as nvi, nex,
 	nview, use the configure option --program-prefix=n.  Other, more
 	complex transformations are possible -- use configure --help to
 	see more options.
 
-	The default value for both "exec_prefix" and "prefix" is the
-	directory /usr/local.  The default values for "bindir", "datadir"
-	and "mandir" are bin, share and man, respectively.
-
 	To move the entire installation tree somewhere besides /usr/local,
 	change the value of both "exec_prefix" and "prefix".  To move the
-	binaries to a different place in the "exec_prefix" directory tree,
-	change the value of "bindir".  Similarly, to put the datafiles
-	(the message catalogs, Perl5 and Tcl scripts) or the man pages in
-	a different place in the "prefix" directory tree, change the value
-	of "datadir" or "mandir".  These values can be changed as part of
-	configuration:
+	binaries to a different place, change the value of "bindir".
+	Similarly, to put the datafiles (the message catalogs, Perl and
+	Tcl scripts) or the man pages in a different place, change the
+	value of "datadir" or "mandir".  These values can be changed as
+	part of configuration:
 
 		configure --exec_prefix=/usr/contrib --prefix=/usr/share
 
@@ -323,9 +317,6 @@ Notes:
 	completely removed and then recreated as part of the installation
 	process.
 
-	The mandir directory must have another directory named "cat1"
-	beneath it for the man pages to successfully install.
-
 =-=-=-=-=-=-=
 NVI AND THE CURSES LIBRARY
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
diff --git a/usr.bin/vi/cl/cl_main.c b/usr.bin/vi/cl/cl_main.c
index 43381d1fb7f..2889f709cbb 100644
--- a/usr.bin/vi/cl/cl_main.c
+++ b/usr.bin/vi/cl/cl_main.c
@@ -17,9 +17,9 @@ static const char sccsid[] = "@(#)cl_main.c	10.36 (Berkeley) 10/14/96";
 #include <sys/queue.h>
 
 #include <bitstring.h>
+#include <curses.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <curses.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/usr.bin/vi/cl/cl_read.c b/usr.bin/vi/cl/cl_read.c
index d71e03f8c5e..8a95a77b243 100644
--- a/usr.bin/vi/cl/cl_read.c
+++ b/usr.bin/vi/cl/cl_read.c
@@ -21,9 +21,9 @@ static const char sccsid[] = "@(#)cl_read.c	10.15 (Berkeley) 9/24/96";
 #include <sys/time.h>
 
 #include <bitstring.h>
+#include <curses.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <curses.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/usr.bin/vi/cl/cl_screen.c b/usr.bin/vi/cl/cl_screen.c
index 9149a2764e1..2049f91c67e 100644
--- a/usr.bin/vi/cl/cl_screen.c
+++ b/usr.bin/vi/cl/cl_screen.c
@@ -17,8 +17,8 @@ static const char sccsid[] = "@(#)cl_screen.c	10.49 (Berkeley) 9/24/96";
 #include <sys/queue.h>
 
 #include <bitstring.h>
-#include <errno.h>
 #include <curses.h>
+#include <errno.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/usr.bin/vi/cl/cl_term.c b/usr.bin/vi/cl/cl_term.c
index 7d7661f870f..6fa2cce613e 100644
--- a/usr.bin/vi/cl/cl_term.c
+++ b/usr.bin/vi/cl/cl_term.c
@@ -19,9 +19,9 @@ static const char sccsid[] = "@(#)cl_term.c	10.22 (Berkeley) 9/15/96";
 #include <sys/stat.h>
 
 #include <bitstring.h>
+#include <curses.h>
 #include <errno.h>
 #include <limits.h>
-#include <curses.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/usr.bin/vi/common/exf.c b/usr.bin/vi/common/exf.c
index 574a16aab3b..86c4c05bcd0 100644
--- a/usr.bin/vi/common/exf.c
+++ b/usr.bin/vi/common/exf.c
@@ -10,7 +10,7 @@
 #include "config.h"
 
 #ifndef lint
-static const char sccsid[] = "@(#)exf.c		10.49 (Berkeley) 10/10/96";
+static const char sccsid[] = "@(#)exf.c	10.49 (Berkeley) 10/10/96";
 #endif /* not lint */
 
 #include <sys/param.h>