*BSD News Article 82555


Return to BSD News archive

Newsgroups: comp.bugs.2bsd
Path: euryale.cc.adfa.oz.au!newshost.carno.net.au!harbinger.cc.monash.edu.au!munnari.OZ.AU!spool.mu.edu!news.sgi.com!news.sprintlink.net!news-peer.sprintlink.net!howland.erols.net!nntp.primenet.com!usenet.eel.ufl.edu!news.mathworks.com!uunet!in2.uu.net!news.new-york.net!wlbr!moe.2bsd.com!sms
From: sms@moe.2bsd.com (Steven M. Schultz)
Subject: The Grand Reorganization Begins (#339 - 5 of 8)
Organization: 2BSD, Simi Valley CA USA
Message-ID: <E0LGIE.LzC@moe.2bsd.com>
Date: Sat, 9 Nov 1996 08:20:38 GMT
Lines: 2375

Subject: The Grand Reorganization Begins (#339 - 5 of 8)
Index:	MANY/<MANY> 2.11BSD

Description:
	The directory organization has never been brought up to date.

	UNIX systems for some time now have ceased using /usr/lib and
	/etc as dumping grounds for everything from fonts to print spoolers.

	For some time systems have used /sbin, /usr/sbin, /usr/libexec, 
	/usr/share, and so on rather than dumping everything into /usr/lib 
	or /etc.

Repeat-By:
	By observation and/or having to admin a mixture of 2.11BSD systems
	and systems which use the post 1989/90 directory hierarchy.

	Alternatively you may have, over the years, been one of the folks
	who has asked me "when is the directory layout going to be updated to
	reflect current 'standards'?"

Fix:
	This is #339 (part 5 of 8).  Please see #335 (part 1) for the
	installation instructions.

	Updates #335 thru #342 comprise the 8 part kit which moves everything
	that is not a library out of /usr/lib.  The relocation of misplaced
	items in /etc is not, with one exception, done at this time but will
	be forthcoming soon.

	The good news is that the update can be done "in place" - it will not
	be necessary to dump and reload the system.  The "bad news" is that
	a "make world" (recompile of the system from sources) is necessary.

	The manifest is as follows:

	Part    Patch#	Contents
	----	-----	--------
	1	335	Manifest of files.  Introduction/tour.  Instructions. 
			Shell scripts to perform pre- and post- processing of
			the system.  Suggested changes to configuration files
			in /etc.  A 'shar' file containing new files to be
			added to the system (Makefiles mostly).

	2-8	336-342	Patch files.  Broken into ~64kb pieces.

--------------------------cut here, save as /usr/tmp/339--------------------
*** /usr/src/man/man8/sendmail.8.old	Sun Dec 14 15:08:41 1986
--- /usr/src/man/man8/sendmail.8	Wed Oct 23 13:33:01 1996
***************
*** 2,16 ****
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)sendmail.8	6.2 (Berkeley) 5/22/86
  .\"
! .\"	@(#)sendmail.8	4.2		7/28/83
! .TH SENDMAIL 8 "May 22, 1986"
  .UC 4
  .SH NAME
  sendmail \- send mail over the internet
  .SH SYNOPSIS
! .B /usr/lib/sendmail
  [
  flags
  ] [
--- 2,15 ----
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)sendmail.8	6.2.1 (2.11BSD) 1996/10/23
  .\"
! .TH SENDMAIL 8 "October 23, 1996"
  .UC 4
  .SH NAME
  sendmail \- send mail over the internet
  .SH SYNOPSIS
! .B /usr/sbin/sendmail
  [
  flags
  ] [
***************
*** 385,415 ****
  will print the contents of the mail queue.
  .SH FILES
  Except for
! /usr/lib/sendmail.cf,
  these pathnames are all specified in
! /usr/lib/sendmail.cf.
  Thus,
  these values are only approximations.
  .PP
  .if t .ta 2i
  .if n .ta 3i
! /usr/lib/aliases	raw data for alias names
  .br
! /usr/lib/aliases.pag
  .br
! /usr/lib/aliases.dir	data base of alias names
  .br
! /usr/lib/sendmail.cf	configuration file
  .br
! /usr/lib/sendmail.fc	frozen configuration
  .br
! /usr/lib/sendmail.hf	help file
  .br
! /usr/lib/sendmail.st	collected statistics
  .br
  /usr/spool/mqueue/*	temp files
  .SH SEE\ ALSO
! binmail(1), mail(1), rmail(1),
  syslog(3),
  aliases(5), sendmail.cf(5),
  mailaddr(7),
--- 384,414 ----
  will print the contents of the mail queue.
  .SH FILES
  Except for
! /etc/sendmail.cf,
  these pathnames are all specified in
! /etc/sendmail.cf.
  Thus,
  these values are only approximations.
  .PP
  .if t .ta 2i
  .if n .ta 3i
! /etc/aliases	raw data for alias names
  .br
! /etc/aliases.pag
  .br
! /etc/aliases.dir	data base of alias names
  .br
! /etc/sendmail.cf	configuration file
  .br
! /etc/sendmail.fc	frozen configuration
  .br
! /usr/share/misc/sendmail.hf	help file
  .br
! /var/log/sendmail.st	collected statistics
  .br
  /usr/spool/mqueue/*	temp files
  .SH SEE\ ALSO
! mail(1), rmail(1),
  syslog(3),
  aliases(5), sendmail.cf(5),
  mailaddr(7),
*** /usr/src/man/man8/uucico.8.old	Sun Dec 14 15:08:50 1986
--- /usr/src/man/man8/uucico.8	Fri Nov  1 19:25:50 1996
***************
*** 1,11 ****
! .\"	@(#)uucico.8c	6.3 (Berkeley) 5/15/86
  .\"
! .TH UUCICO 8C "May 15, 1986"
  .UC 6
  .SH NAME
  uucico, uucpd \- transfer files queued by uucp or uux
  .SH SYNOPSIS
! .B /usr/lib/uucp/uucico
  [
  .BI \-d spooldir
  ] [
--- 1,11 ----
! .\"	@(#)uucico.8	6.3.1 (2.11BSD) 1996/10/23
  .\"
! .TH UUCICO 8 "October 23, 1996"
  .UC 6
  .SH NAME
  uucico, uucpd \- transfer files queued by uucp or uux
  .SH SYNOPSIS
! .B /usr/sbin/uucico
  [
  .BI \-d spooldir
  ] [
***************
*** 24,37 ****
  .BI \-t turnaround
  ]
  .PP
! .B /etc/uucpd
  .SH DESCRIPTION
  .I Uucico
  performs the actual work involved in transferring files between
  systems. 
! .IR Uucp (1C)
  and
! .IR uux (1C)
  merely queue requests for data transfer which
  .I uucico
  processes.
--- 24,37 ----
  .BI \-t turnaround
  ]
  .PP
! .B /usr/libexec/uucpd
  .SH DESCRIPTION
  .I Uucico
  performs the actual work involved in transferring files between
  systems. 
! .IR Uucp (1)
  and
! .IR uux (1)
  merely queue requests for data transfer which
  .I uucico
  processes.
***************
*** 157,163 ****
  would be:
  .PP
  .nf
! 	0	*	*	*	*	/usr/lib/uucp/uucico -r1
  .fi
  .PP
  This will run
--- 157,163 ----
  would be:
  .PP
  .nf
! 	0	*	*	*	*	/usr/sbin/uucico -r1
  .fi
  .PP
  This will run
***************
*** 178,184 ****
  For example:
  .PP
  .nf
! 	nuucp:Password:6:1::/usr/spool/uucppublic:/usr/lib/uucp/uucico
  .fi
  .PP
  The UID for UUCP remote logins is not critical, so long as it differs from
--- 178,184 ----
  For example:
  .PP
  .nf
! 	nuucp:Password:6:1::/usr/spool/uucppublic:/usr/sbin/uucico
  .fi
  .PP
  The UID for UUCP remote logins is not critical, so long as it differs from
***************
*** 188,200 ****
  .SH FILES
  .ta \w'/usr/spool/uucp/D.hostnameX/  'u
  .nf
! /usr/lib/uucp/	UUCP internal files/utilities
! /usr/lib/uucp/L-devices	Local device descriptions
! /usr/lib/uucp/L-dialcodes	Phone numbers and prefixes
! /usr/lib/uucp/L.aliases	Hostname aliases
! /usr/lib/uucp/L.cmds	Remote command permissions list
! /usr/lib/uucp/L.sys	Host connection specifications
! /usr/lib/uucp/USERFILE	Remote directory tree permissions list
  .PP
  /usr/spool/uucp/	Spool directory
  /usr/spool/uucp/AUDIT/*	Debugging audit trails
--- 188,200 ----
  .SH FILES
  .ta \w'/usr/spool/uucp/D.hostnameX/  'u
  .nf
! /etc/uucp/	UUCP internal files
! /etc/uucp/L-devices	Local device descriptions
! /etc/uucp/L-dialcodes	Phone numbers and prefixes
! /etc/uucp/L.aliases	Hostname aliases
! /etc/uucp/L.cmds	Remote command permissions list
! /etc/uucp/L.sys	Host connection specifications
! /etc/uucp/USERFILE	Remote directory tree permissions list
  .PP
  /usr/spool/uucp/	Spool directory
  /usr/spool/uucp/AUDIT/*	Debugging audit trails
***************
*** 214,221 ****
  /usr/spool/uucppublic	Public access directory
  .fi
  .SH SEE ALSO
! uucp(1C), uuq(1C), uux(1C), L-devices(5), L-dialcodes(5), L.aliases(5),
! L.cmds(5), L.sys(5), uuclean(8C), uupoll(8C), uusnap(8C), uuxqt(8C)
  .PP
  D. A. Nowitz and M. E. Lesk,
  .IR "A Dial-Up Network of UNIX Systems" .
--- 214,221 ----
  /usr/spool/uucppublic	Public access directory
  .fi
  .SH SEE ALSO
! uucp(1), uuq(1), uux(1), L-devices(5), L-dialcodes(5), L.aliases(5),
! L.cmds(5), L.sys(5), uuclean(8), uupoll(8), uusnap(8), uuxqt(8)
  .PP
  D. A. Nowitz and M. E. Lesk,
  .IR "A Dial-Up Network of UNIX Systems" .
*** /usr/src/man/man8/uuclean.8.old	Sun Dec 14 15:08:49 1986
--- /usr/src/man/man8/uuclean.8	Wed Oct 23 13:39:08 1996
***************
*** 2,15 ****
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)uuclean.8c	6.3 (Berkeley) 4/24/86
  .\"
! .TH UUCLEAN 8C "April 24, 1986"
  .UC 5
  .SH NAME
  uuclean \- uucp spool directory clean-up
  .SH SYNOPSIS
! .B /usr/lib/uucp/uuclean
  [
  .B -m
  ] [
--- 2,15 ----
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)uuclean.8	6.3.1 (2.11BSD) 1996/10/23
  .\"
! .TH UUCLEAN 8 "October 23, 1996"
  .UC 5
  .SH NAME
  uuclean \- uucp spool directory clean-up
  .SH SYNOPSIS
! .B /etc/uucp/uuclean
  [
  .B -m
  ] [
***************
*** 54,57 ****
  /usr/spool/uucp
  Spool directory
  .SH SEE ALSO
! uucp(1C), uux(1C), uucico(8C)
--- 54,57 ----
  /usr/spool/uucp
  Spool directory
  .SH SEE ALSO
! uucp(1), uux(1), uucico(8)
*** /usr/src/man/man8/uupoll.8.old	Sun Dec 14 15:08:50 1986
--- /usr/src/man/man8/uupoll.8	Wed Oct 23 13:40:19 1996
***************
*** 2,10 ****
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)uupoll.8c	6.1 (Berkeley) 4/24/86
  .\"
! .TH UUPOLL 8C "April 24, 1986"
  .UC 6
  .SH NAME
  uupoll \- poll a remote \s-1UUCP\s+1 site
--- 2,10 ----
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)uupoll.8	6.1.1 (2.11BSD) 1996/10/23
  .\"
! .TH UUPOLL 8 "October 23, 1996"
  .UC 6
  .SH NAME
  uupoll \- poll a remote \s-1UUCP\s+1 site
***************
*** 20,26 ****
  .I Uupoll
  is used to force a poll of a remote system. It queues a null job for the
  remote system and then invokes
! .IR uucico (8C).
  .PP
  The following options are available:
  .TP 8
--- 20,26 ----
  .I Uupoll
  is used to force a poll of a remote system. It queues a null job for the
  remote system and then invokes
! .IR uucico (8).
  .PP
  The following options are available:
  .TP 8
***************
*** 59,65 ****
  .nf
  	0	0,8,16	*	*	*	/usr/bin/uupoll -n ihnp4
  	0	4,12,20	*	*	*	/usr/bin/uupoll -n ucbvax
! 	5	*		*	*	*	/usr/lib/uucp/uucico -r1
  .fi
  This will queue null jobs for the remote sites at the top of hour; they
  will be processed by
--- 59,65 ----
  .nf
  	0	0,8,16	*	*	*	/usr/bin/uupoll -n ihnp4
  	0	4,12,20	*	*	*	/usr/bin/uupoll -n ucbvax
! 	5	*		*	*	*	/usr/sbin/uucico -r1
  .fi
  This will queue null jobs for the remote sites at the top of hour; they
  will be processed by
***************
*** 68,75 ****
  .SH FILES
  .ta \w'/usr/spool/uucp/   'u
  .nf
! /usr/lib/uucp/	UUCP internal files/utilities
  /usr/spool/uucp/	Spool directory
  .fi
  .SH SEE ALSO
! uucp(1C), uux(1C), uucico(8C)
--- 68,75 ----
  .SH FILES
  .ta \w'/usr/spool/uucp/   'u
  .nf
! /etc/uucp/	UUCP internal files
  /usr/spool/uucp/	Spool directory
  .fi
  .SH SEE ALSO
! uucp(1), uux(1), uucico(8)
*** /usr/src/man/man8/uuxqt.8.old	Sun Dec 14 15:08:50 1986
--- /usr/src/man/man8/uuxqt.8	Wed Oct 23 13:41:57 1996
***************
*** 2,15 ****
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)uuxqt.8c	6.1 (Berkeley) 4/24/86
  .\"
! .TH UUXQT 8C "April 24, 1986"
  .UC 6
  .SH NAME
  uuxqt \- \s-1UUCP\s+1 execution file interpreter
  .SH SYNOPSIS
! .B /usr/lib/uucp/uuxqt
  [
  .BI \-x debug
  ]
--- 2,15 ----
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)uuxqt.8	6.1.1 (2.11BSD) 1996/10/23
  .\"
! .TH UUXQT 8 "October 23, 1996"
  .UC 6
  .SH NAME
  uuxqt \- \s-1UUCP\s+1 execution file interpreter
  .SH SYNOPSIS
! .B /usr/libexec/uuxqt
  [
  .BI \-x debug
  ]
***************
*** 18,26 ****
  interprets
  .I "execution files"
  created on a remote system via
! .IR uux (1C)
  and transferred to the local system via
! .IR uucico (8C).
  When a user uses
  .I uux
  to request remote command execution, it is
--- 18,26 ----
  interprets
  .I "execution files"
  created on a remote system via
! .IR uux (1)
  and transferred to the local system via
! .IR uucico (8).
  When a user uses
  .I uux
  to request remote command execution, it is
***************
*** 40,47 ****
  .SH FILES
  .ta \w'/usr/spool/uucp/LCK/LCK.XQT   'u
  .nf
! /usr/lib/uucp/L.cmds	Remote command permissions list
! /usr/lib/uucp/USERFILE	Remote directory tree permissions list
  /usr/spool/uucp/LOGFILE	UUCP system activity log
  /usr/spool/uucp/LCK/LCK.XQT	\fIUuxqt\fP lock file
  /usr/spool/uucp/X./	Incoming execution file directory
--- 40,47 ----
  .SH FILES
  .ta \w'/usr/spool/uucp/LCK/LCK.XQT   'u
  .nf
! /etc/uucp/L.cmds	Remote command permissions list
! /etc/uucp/USERFILE	Remote directory tree permissions list
  /usr/spool/uucp/LOGFILE	UUCP system activity log
  /usr/spool/uucp/LCK/LCK.XQT	\fIUuxqt\fP lock file
  /usr/spool/uucp/X./	Incoming execution file directory
***************
*** 48,51 ****
  /usr/spool/uucp/XTMP	\fIUuxqt\fP running directory
  .fi
  .SH SEE ALSO
! uucp(1C), uux(1C), L.cmds(5), USERFILE(5), uucico(8C)
--- 48,51 ----
  /usr/spool/uucp/XTMP	\fIUuxqt\fP running directory
  .fi
  .SH SEE ALSO
! uucp(1), uux(1), L.cmds(5), USERFILE(5), uucico(8)
*** /usr/src/new/Makefile.old	Thu Mar 21 21:20:55 1996
--- /usr/src/new/Makefile	Sun Oct 27 20:02:04 1996
***************
*** 36,42 ****
  		(mkdir ${MANDIR}/cat$$i; chmod a+r ${MANDIR}/cat$$i); done
  	-for i in ${STDINST}; do \
  		(cd $$i; make ${MFLAGS} DESTDIR=${DESTDIR} install); done
! 	-sh /usr/src/usr.lib/makewhatis.sh ${MANDIR}
  
  clean:
  	for i in ${SUBDIR}; do (cd $$i; make -k ${MFLAGS} clean); done
--- 36,42 ----
  		(mkdir ${MANDIR}/cat$$i; chmod a+r ${MANDIR}/cat$$i); done
  	-for i in ${STDINST}; do \
  		(cd $$i; make ${MFLAGS} DESTDIR=${DESTDIR} install); done
! 	-/usr/sbin/makewhatis ${MANDIR}
  
  clean:
  	for i in ${SUBDIR}; do (cd $$i; make -k ${MFLAGS} clean); done
*** /usr/src/new/jove/Ovmakefile.old	Mon Mar 14 16:37:30 1988
--- /usr/src/new/jove/Ovmakefile	Wed Oct 23 15:07:09 1996
***************
*** 19,25 ****
  
  DESTDIR =
  TMPDIR = /tmp
! LIBDIR = /usr/lib/jove
  BINDIR = /bin
  MANDIR = /usr/man/man1
  MANEXT = 1
--- 19,25 ----
  
  DESTDIR =
  TMPDIR = /tmp
! LIBDIR = /usr/new/lib/jove
  BINDIR = /bin
  MANDIR = /usr/man/man1
  MANEXT = 1
*** /usr/src/new/jove/doc/jove.3.old	Sun Mar  6 12:55:42 1988
--- /usr/src/new/jove/doc/jove.3	Wed Oct 23 15:07:55 1996
***************
*** 390,396 ****
  These commands are read as
  if they were typed to the command handler (ESC X) during an edit.
  There can be only one command per line in the startup file.
! If there is a file \fI/usr/lib/jove/joverc\fP,
  then this file will be read before the user's
  .I .\|joverc
  file.
--- 390,396 ----
  These commands are read as
  if they were typed to the command handler (ESC X) during an edit.
  There can be only one command per line in the startup file.
! If there is a file \fI/usr/new/lib/jove/joverc\fP,
  then this file will be read before the user's
  .I .\|joverc
  file.
*** /usr/src/new/jove/teachjove.c.old	Mon Mar 14 16:38:10 1988
--- /usr/src/new/jove/teachjove.c	Wed Oct 23 15:07:27 1996
***************
*** 9,15 ****
  #include <sys/file.h>
  
  #ifndef TEACHJOVE
! #    define TEACHJOVE	"/usr/lib/jove/teach-jove"
  #endif
  
  #ifndef W_OK
--- 9,15 ----
  #include <sys/file.h>
  
  #ifndef TEACHJOVE
! #    define TEACHJOVE	"/usr/new/lib/jove/teach-jove"
  #endif
  
  #ifndef W_OK
*** /usr/src/new/l11/link.c.old	Thu Mar  5 21:19:25 1987
--- /usr/src/new/l11/link.c	Wed Oct 23 15:09:11 1996
***************
*** 154,160 ****
  	if (Do_odt)
  	{
  		end->nextfile = newfile();
! 		end->nextfile->fname = "/usr/lib/odt.obj";
  	}
  
  	if (Scanerr)
--- 154,160 ----
  	if (Do_odt)
  	{
  		end->nextfile = newfile();
! 		end->nextfile->fname = "/usr/libdata/odt.obj";
  	}
  
  	if (Scanerr)
*** /usr/src/new/m11/m11.1.old	Wed Aug  3 04:14:43 1983
--- /usr/src/new/m11/m11.1	Wed Oct 23 15:10:48 1996
***************
*** 276,282 ****
  undefined symbols are taken as undefined global externals.
  .SH FILES
  .ta 2i
! /usr/lib/sysmac.sml	system macro library (for .mcall directive)
  .br
  filen.xrf	intermediate cross-reference temporary file
  .br
--- 276,282 ----
  undefined symbols are taken as undefined global externals.
  .SH FILES
  .ta 2i
! /usr/share/misc/sysmac.sml	system macro library (for .mcall directive)
  .br
  filen.xrf	intermediate cross-reference temporary file
  .br
*** /usr/src/new/m11/mac.m11.old	Fri Dec 10 20:13:36 1982
--- /usr/src/new/m11/mac.m11	Wed Oct 23 15:11:22 1996
***************
*** 839,845 ****
  	entsec	dpure
  sysmac:			;kludged to lower-case
  	.enabl lc
! 	.asciz	+/usr/lib/sysmac+
  
  	xitsec
  smltst:				;test mcall arguments
--- 839,845 ----
  	entsec	dpure
  sysmac:			;kludged to lower-case
  	.enabl lc
! 	.asciz	+/usr/share/misc/sysmac+
  
  	xitsec
  smltst:				;test mcall arguments
*** /usr/src/new/notes/Samples/Read_me.old	Wed May  7 08:56:10 1986
--- /usr/src/new/notes/Samples/Read_me	Wed Oct 23 15:12:34 1996
***************
*** 36,42 ****
  		all of our hosts -- we just make sure that the list
  		of notes to send to "yourself" is empty.
  
! crontab		A copy of the added lines in /usr/lib/crontab
  		that we use for notes management.
  
  net.how		/usr/spool/notes/.utilities/net.how  - The file
--- 36,42 ----
  		all of our hosts -- we just make sure that the list
  		of notes to send to "yourself" is empty.
  
! crontab		A copy of the added lines in /etc/crontab
  		that we use for notes management.
  
  net.how		/usr/spool/notes/.utilities/net.how  - The file
*** /usr/src/new/notes/doc/4.6.old	Sun Oct 20 09:35:48 1985
--- /usr/src/new/notes/doc/4.6	Wed Oct 23 15:13:31 1996
***************
*** 13,20 ****
  
  	To send mail addressed to ``somenotes'' 
  to the notesfile ``somenotes'' with the 4.1 Bsd /etc/delivermail
! add the following line to the file /usr/lib/aliases.
! The second line shows the general format for /usr/lib/aliases entries
  which feed a notesfile.
  If the Notesfile utilities are stored in a different directory, the
  path name should be changed appropriately.
--- 13,20 ----
  
  	To send mail addressed to ``somenotes'' 
  to the notesfile ``somenotes'' with the 4.1 Bsd /etc/delivermail
! add the following line to the file /etc/aliases.
! The second line shows the general format for /etc/aliases entries
  which feed a notesfile.
  If the Notesfile utilities are stored in a different directory, the
  path name should be changed appropriately.
*** /usr/src/new/notes/doc/a.checklist.old	Tue Aug  5 14:02:50 1986
--- /usr/src/new/notes/doc/a.checklist	Wed Oct 23 15:14:33 1996
***************
*** 312,318 ****
  Modify UUCP's ``uuxqt.c'' to allow remote execution of ``nfrcv''.
  This is unnecessary if no notesfile networking will be done
  or if another remote execution mechanism will be used.
! Some versions of UUCP have a file ``/usr/lib/uucp/L.cmds''
  which contains names of permitted commands.
  .iz
  Modify /etc/rc to remove notesfile locks at boot time.
--- 312,318 ----
  Modify UUCP's ``uuxqt.c'' to allow remote execution of ``nfrcv''.
  This is unnecessary if no notesfile networking will be done
  or if another remote execution mechanism will be used.
! Some versions of UUCP have a file ``/etc/uucp/L.cmds''
  which contains names of permitted commands.
  .iz
  Modify /etc/rc to remove notesfile locks at boot time.
***************
*** 451,458 ****
  .a1 "Mail to Notesfiles"
  
  	To use the nfmail program with the 4.1 BSD /etc/delivermail
! or the 4.2 BSD /usr/lib/sendmail
! insert lines of the following form in the file /usr/lib/aliases.
  
  .in +1i
  .nf
--- 451,458 ----
  .a1 "Mail to Notesfiles"
  
  	To use the nfmail program with the 4.1 BSD /etc/delivermail
! or the 4.2 BSD /usr/sbin/sendmail
! insert lines of the following form in the file /etc/aliases.
  
  .in +1i
  .nf
*** /usr/src/new/notes/doc/b.interface.old	Sun Oct 20 09:35:52 1985
--- /usr/src/new/notes/doc/b.interface	Wed Oct 23 15:15:44 1996
***************
*** 405,411 ****
  Check /usr/lib/news/sys
  to see that news will be forwarded to the notesfile system.
  .iz
! Make entries in /usr/lib/crontab to
  invoke newsoutput occcasionally.
  We use every 6 hours.
  .iz
--- 405,411 ----
  Check /usr/lib/news/sys
  to see that news will be forwarded to the notesfile system.
  .iz
! Make entries in /etc/crontab to
  invoke newsoutput occcasionally.
  We use every 6 hours.
  .iz
*** /usr/src/new/notes/man/nfmail.8.old	Sun Oct 20 09:17:52 1985
--- /usr/src/new/notes/man/nfmail.8	Wed Oct 23 15:18:11 1996
***************
*** 43,49 ****
  The ``Subject'', and ``From'' header lines are never removed from
  the letter.
  The file
! .I "/usr/lib/Mail.rc"
  defines default mail reading characteristics on many BSD systems.
  This file can contain lists of header lines to be ignored when
  presenting messages to users.
--- 43,49 ----
  The ``Subject'', and ``From'' header lines are never removed from
  the letter.
  The file
! .I "/etc/Mail.rc"
  defines default mail reading characteristics on many BSD systems.
  This file can contain lists of header lines to be ignored when
  presenting messages to users.
***************
*** 67,79 ****
  a director message.
  .PP
  .I Nfmail
! usually appears as a mail alias in the file ``/usr/lib/aliases''
  in lines such as:
  
  problems:	"|/usr/spool/notes/.utilities/nfmail -s problems"
  .SH BUGS
  .PP
! The dependence on ``/usr/lib/Mail.rc'' for lists of headers to be ignored
  should be cleaned up.
  Perhaps something where absence of the file
  means to strip all headers except the Subject and From lines.
--- 67,79 ----
  a director message.
  .PP
  .I Nfmail
! usually appears as a mail alias in the file ``/etc/aliases''
  in lines such as:
  
  problems:	"|/usr/spool/notes/.utilities/nfmail -s problems"
  .SH BUGS
  .PP
! The dependence on ``/etc/Mail.rc'' for lists of headers to be ignored
  should be cleaned up.
  Perhaps something where absence of the file
  means to strip all headers except the Subject and From lines.
***************
*** 83,92 ****
  /usr/spool/notes/.utilities/nfmail
  where this program lives.
  .TP 40
! /usr/lib/aliases
  Mail aliases (BSD UNIX)
  .TP 40
! /usr/lib/Mail.rc
  Mail configuration templates
  .PD
  .SH SEE ALSO
--- 83,92 ----
  /usr/spool/notes/.utilities/nfmail
  where this program lives.
  .TP 40
! /etc/aliases
  Mail aliases (BSD UNIX)
  .TP 40
! /etc/Mail.rc
  Mail configuration templates
  .PD
  .SH SEE ALSO
*** /usr/src/new/notes/src/nfmail.c.old	Fri Apr  4 10:50:49 1986
--- /usr/src/new/notes/src/nfmail.c	Wed Oct 23 15:20:13 1996
***************
*** 49,55 ****
  char    Nfpipe[BUFSIZ];					/* nfpipe pathname */
  char    tmpname[BUFSIZ];				/* scratch file */
  
! char    system_rc[] = "/usr/lib/Mail.rc";
  
  #define	MAX_IGNORE	32
  char    ignore[MAX_IGNORE][IGNORESIZE];
--- 49,55 ----
  char    Nfpipe[BUFSIZ];					/* nfpipe pathname */
  char    tmpname[BUFSIZ];				/* scratch file */
  
! char    system_rc[] = "/etc/Mail.rc";
  
  #define	MAX_IGNORE	32
  char    ignore[MAX_IGNORE][IGNORESIZE];
*** /usr/src/new/rcs/src/Makefile.old	Sat Aug 13 14:49:54 1988
--- /usr/src/new/rcs/src/Makefile	Wed Oct 23 15:22:33 1996
***************
*** 22,30 ****
  #    Newer versions of diff, support them and diff is no longer distributed with
  #    RCS. The following definitions apply only if you have both old versions
  #    and new versions of diff, and you want RCS to use the new versions.
- #    The default should be :
- #DIFF      = /bin/diff
- #DIFF3     = /usr/lib/diff3
  
  #    Figure out where to put the modified diff and diff3 commands, and
  #     install them. (Read the instructions in the Make-files).
--- 22,27 ----
***************
*** 31,37 ****
  #     Define the macros DIFF and DIFF3 accordingly (below).
  DESTDIR   =
  DIFF      = /bin/diff
! DIFF3     = /usr/lib/diff3
  
  # 2.  Figure out where to put the RCS commands; define RCSDIR accordingly.
  RCSDIR    = /usr/new
--- 28,34 ----
  #     Define the macros DIFF and DIFF3 accordingly (below).
  DESTDIR   =
  DIFF      = /bin/diff
! DIFF3     = /usr/libexec/diff3
  
  # 2.  Figure out where to put the RCS commands; define RCSDIR accordingly.
  RCSDIR    = /usr/new
*** /usr/src/new/rcs/src/merge.sh.old	Thu Feb 18 11:53:01 1988
--- /usr/src/new/rcs/src/merge.sh	Mon Oct 21 20:37:49 1996
***************
*** 1,5 ****
  PATH=/bin:/usr/bin:.
! DIFF3=/usr/local/lib/rdiff3
  p=0
  case $1 in
  -p)
--- 1,5 ----
  PATH=/bin:/usr/bin:.
! DIFF3=/usr/libexec/diff3
  p=0
  case $1 in
  -p)
*** /usr/src/new/tcsh/tcsh.man.old	Fri Jul  5 12:26:39 1991
--- /usr/src/new/tcsh/tcsh.man	Wed Oct 23 15:25:08 1996
***************
*** 1,5 ****
  .\" $Id: tcsh.man,v 3.0 1991/07/04 21:54:11 christos Exp $
! .TH TCSH 1 "4 July 1991" "Cornell"
  .SH NAME
  tcsh \- C shell with file name completion and command line editing
  .SH SYNOPSIS
--- 1,5 ----
  .\" $Id: tcsh.man,v 3.0 1991/07/04 21:54:11 christos Exp $
! .TH TCSH 1 "23 October 1996"
  .SH NAME
  tcsh \- C shell with file name completion and command line editing
  .SH SYNOPSIS
***************
*** 1473,1479 ****
  .nf
  .sp
  .RS +.6i
! > sched +2:15 /usr/lib/uucp/uucico -r1 -sother
  > sched 5pm set prompt='[%h] It\\'s after 5; go home: >'
  > sched +3am echo This syntax doesn\\'t work.
  Relative time inconsistent with am/pm.
--- 1473,1479 ----
  .nf
  .sp
  .RS +.6i
! > sched +2:15 /usr/sbin/uucico -r1 -sother
  > sched 5pm set prompt='[%h] It\\'s after 5; go home: >'
  > sched +3am echo This syntax doesn\\'t work.
  Relative time inconsistent with am/pm.
***************
*** 1493,1499 ****
  .sp
  .RS +.6i
  > sched
!      1  Wed Apr  4 15:42  /usr/lib/uucp/uucico -r1 -sother
       2  Wed Apr  4 17:00  set prompt=[%h] It's after 5; go home: >
  >
  .RE
--- 1493,1499 ----
  .sp
  .RS +.6i
  > sched
!      1  Wed Apr  4 15:42  /usr/sbin/uucico -r1 -sother
       2  Wed Apr  4 17:00  set prompt=[%h] It's after 5; go home: >
  >
  .RE
***************
*** 1510,1516 ****
  Not that many scheduled events.
  > sched -2
  > sched
!      1  Wed Apr  4 15:42  /usr/lib/uucp/uucico -r1 -sother
  >
  .RE
  .sp
--- 1510,1516 ----
  Not that many scheduled events.
  > sched -2
  > sched
!      1  Wed Apr  4 15:42  /usr/sbin/uucico -r1 -sother
  >
  .RE
  .sp
*** /usr/src/old/Makefile.old	Mon Nov 26 07:21:27 1990
--- /usr/src/old/Makefile	Fri Oct 25 20:29:13 1996
***************
*** 5,11 ****
  
  # Programs that live in subdirectories, and have makefiles of their own.
  #
! SUBDIR=	astags compact dump prep uudiff v6 vpr arcv
  
  # C programs that live in the current directory and do not need
  # explicit make lines.
--- 5,11 ----
  
  # Programs that live in subdirectories, and have makefiles of their own.
  #
! SUBDIR=	astags compact dump prep uudiff v6 arcv
  
  # C programs that live in the current directory and do not need
  # explicit make lines.
*** /usr/src/old/prep/prep0.c.old	Fri Jul 10 14:36:23 1981
--- /usr/src/old/prep/prep0.c	Wed Oct 23 15:26:13 1996
***************
*** 13,19 ****
  			};
  
  
! char	*ignonl = "/usr/lib/eign";
  
  char tab[NUMS][NUMC] = {
  
--- 13,19 ----
  			};
  
  
! char	*ignonl = "/usr/share/misc/eign";
  
  char tab[NUMS][NUMC] = {
  
*** /usr/src/sbin/XNSrouted/Makefile.old	Mon Feb 23 19:58:54 1987
--- /usr/src/sbin/XNSrouted/Makefile	Sat Oct 26 23:05:43 1996
***************
*** 3,12 ****
  # All rights reserved.  The Berkeley software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)Makefile	5.5 (Berkeley) 9/17/85";
  #
! #	Makefile for Xerox Routing Information Protocol
! #	Daemon
  #
  ALL=	XNSrouted
  OBJS=	XNSrouted.o
--- 3,11 ----
  # All rights reserved.  The Berkeley software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)Makefile	5.5.1 (2.11BSD) 1996/10/26";
  #
! #	Makefile for Xerox Routing Information Protocol Daemon
  #
  ALL=	XNSrouted
  OBJS=	XNSrouted.o
***************
*** 19,25 ****
  	${CC} ${SEPFLAG} -o XNSrouted ${OBJS}
  
  install: XNSrouted
! 	install -s XNSrouted ${DESTDIR}/etc
  
  clean:
! 	rm -f XNSrouted *.o core a.out t.c linterrs typescript errs
--- 18,24 ----
  	${CC} ${SEPFLAG} -o XNSrouted ${OBJS}
  
  install: XNSrouted
! 	install -s XNSrouted ${DESTDIR}/sbin
  
  clean:
! 	rm -f XNSrouted *.o core
*** /usr/src/share/learn/Makefile.old	Sun Dec 25 22:56:29 1988
--- /usr/src/share/learn/Makefile	Mon Oct 28 22:14:58 1996
***************
*** 2,8 ****
  # All rights reserved.  The Berkeley software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)Makefile	4.3	(Berkeley)	7/24/87
  #
  LESSONS=C editor eqn files macros morefiles vi
  FILES=	Linfo Xinfo
--- 2,8 ----
  # All rights reserved.  The Berkeley software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)Makefile	4.3.1	(2.11BSD)	1996/10/24
  #
  LESSONS=C editor eqn files macros morefiles vi
  FILES=	Linfo Xinfo
***************
*** 11,37 ****
  all:
  
  install: ${LESSONS} ${FILES}
! 	-mkdir ${DESTDIR}/usr/lib/learn \
! 		${DESTDIR}/usr/lib/learn/log \
! 		${DESTDIR}/usr/lib/learn/bin
! 	chown root.staff ${DESTDIR}/usr/lib/learn \
! 		${DESTDIR}/usr/lib/learn/log \
! 		${DESTDIR}/usr/lib/learn/bin
! 	chmod 755 ${DESTDIR}/usr/lib/learn \
! 		${DESTDIR}/usr/lib/learn/log \
! 		${DESTDIR}/usr/lib/learn/bin
  	@for i in ${LESSONS}; do \
! 		touch ${DESTDIR}/usr/lib/learn/log/$$i; \
! 		chmod 666 ${DESTDIR}/usr/lib/learn/log/$$i; \
  	done
  	@for i in ${FILES}; do \
  		echo copy $$i; \
! 		install -c -m 644 $$i ${DESTDIR}/usr/lib/learn/$$i; \
  	done
  # For some unknown reason the following line sometimes fails with an
  # exit -115 ...
! 	-tar cf - ${LESSONS} | (cd ${DESTDIR}/usr/lib/learn; tar xpf -)
! 	-chmod 555 ${DESTDIR}/usr/lib/learn/*/Init
! 	cd ${DESTDIR}/usr/lib/learn/C; cc -O -c getline.c getnum.c
  
  clean:
--- 11,36 ----
  all:
  
  install: ${LESSONS} ${FILES}
! 	-mkdir -p ${DESTDIR}/usr/share/learn \
! 		${DESTDIR}/var/log/learn \
! 		${DESTDIR}/usr/share/learn/bin
! 	chown root.staff ${DESTDIR}/usr/share/learn \
! 		${DESTDIR}/usr/share/learn/bin
! 	chmod 755 ${DESTDIR}/usr/share/learn \
! 		${DESTDIR}/var/log/learn \
! 		${DESTDIR}/usr/share/learn/bin
  	@for i in ${LESSONS}; do \
! 		touch ${DESTDIR}/var/log/learn/$$i; \
! 		chmod 666 ${DESTDIR}/var/log/learn/$$i; \
  	done
  	@for i in ${FILES}; do \
  		echo copy $$i; \
! 		install -c -m 644 $$i ${DESTDIR}/usr/share/learn/$$i; \
  	done
  # For some unknown reason the following line sometimes fails with an
  # exit -115 ...
! 	-tar cf - ${LESSONS} | (cd ${DESTDIR}/usr/share/learn; tar xpf -)
! 	-chmod 555 ${DESTDIR}/usr/share/learn/*/Init
! 	cd ${DESTDIR}/usr/share/learn/C; cc -O -c getline.c getnum.c
  
  clean:
*** /usr/src/share/learn/vi/L2.3.old	Tue May 17 21:42:27 1983
--- /usr/src/share/learn/vi/L2.3	Thu Oct 24 14:16:36 1996
***************
*** 37,43 ****
  accidentally messing it up.
  -----------------------------
  #
! cat /usr/lib/learn/vi/longtext >> Movement3
  vi Movement3
  #next
  2.4 10
--- 37,43 ----
  accidentally messing it up.
  -----------------------------
  #
! cat /usr/share/learn/vi/longtext >> Movement3
  vi Movement3
  #next
  2.4 10
*** /usr/src/share/learn/vi/L2.4.old	Tue May 17 21:42:29 1983
--- /usr/src/share/learn/vi/L2.4	Thu Oct 24 14:16:52 1996
***************
*** 36,42 ****
  
  ---------------------------------------
  #
! cat /usr/lib/learn/vi/longtext >> Review1
  vi Review1
  #next
  3.1 10
--- 36,42 ----
  
  ---------------------------------------
  #
! cat /usr/share/learn/vi/longtext >> Review1
  vi Review1
  #next
  3.1 10
*** /usr/src/share/learn/vi/L3.2.old	Tue May 17 21:42:30 1983
--- /usr/src/share/learn/vi/L3.2	Thu Oct 24 14:17:06 1996
***************
*** 57,63 ****
  you'll end up using most frequently.
  ---------------------------------------------------------------
  #
! cat /usr/lib/learn/vi/longtext >> Insert2
  vi Insert2
  #next
  3.3 10
--- 57,63 ----
  you'll end up using most frequently.
  ---------------------------------------------------------------
  #
! cat /usr/share/learn/vi/longtext >> Insert2
  vi Insert2
  #next
  3.3 10
*** /usr/src/share/learn/vi/L3.3.old	Tue May 17 21:42:30 1983
--- /usr/src/share/learn/vi/L3.3	Thu Oct 24 14:17:19 1996
***************
*** 32,38 ****
  can do and what their limits are.
  --------------------------------------------------------
  #
! cat /usr/lib/learn/vi/longtext >> UndoRedo
  vi UndoRedo
  #next
  3.4 10
--- 32,38 ----
  can do and what their limits are.
  --------------------------------------------------------
  #
! cat /usr/share/learn/vi/longtext >> UndoRedo
  vi UndoRedo
  #next
  3.4 10
*** /usr/src/share/learn/vi/L4.1.old	Tue May 17 21:42:33 1983
--- /usr/src/share/learn/vi/L4.1	Thu Oct 24 14:17:30 1996
***************
*** 38,44 ****
  backward one sentence.
  ----------------------------------------------------------------------------
  #
! cat /usr/lib/learn/vi/longtext >> Words
  vi Words
  #next
  4.2  10
--- 38,44 ----
  backward one sentence.
  ----------------------------------------------------------------------------
  #
! cat /usr/share/learn/vi/longtext >> Words
  vi Words
  #next
  4.2  10
*** /usr/src/share/learn/vi/L4.3.old	Tue May 17 21:42:37 1983
--- /usr/src/share/learn/vi/L4.3	Thu Oct 24 14:17:41 1996
***************
*** 36,42 ****
  look at in more detail later, in the section on marking.
  --------------------------------------------------------------------------
  #
! cat /usr/lib/learn/vi/longtext >> Search
  vi Search
  #next
  5.1  10
--- 36,42 ----
  look at in more detail later, in the section on marking.
  --------------------------------------------------------------------------
  #
! cat /usr/share/learn/vi/longtext >> Search
  vi Search
  #next
  5.1  10
*** /usr/src/share/learn/vi/L5.1.old	Tue May 17 21:42:39 1983
--- /usr/src/share/learn/vi/L5.1	Thu Oct 24 14:17:54 1996
***************
*** 52,58 ****
  can use targets.
  -------------------------------------------------------------------------------
  #
! cat /usr/lib/learn/vi/longtext >> Targets
  vi Targets
  #next
  5.2  10
--- 52,58 ----
  can use targets.
  -------------------------------------------------------------------------------
  #
! cat /usr/share/learn/vi/longtext >> Targets
  vi Targets
  #next
  5.2  10
*** /usr/src/share/learn/vi/L5.2.old	Tue May 17 21:42:40 1983
--- /usr/src/share/learn/vi/L5.2	Thu Oct 24 14:18:05 1996
***************
*** 29,35 ****
  several copies of it.
  ---------------------------------------------------------------------------
  #
! cat /usr/lib/learn/vi/longtext >> YankPut
  vi YankPut
  #next
  5.3  10
--- 29,35 ----
  several copies of it.
  ---------------------------------------------------------------------------
  #
! cat /usr/share/learn/vi/longtext >> YankPut
  vi YankPut
  #next
  5.3  10
*** /usr/src/share/learn/vi/L6.1.old	Thu May 19 14:41:11 1983
--- /usr/src/share/learn/vi/L6.1	Thu Oct 24 14:18:16 1996
***************
*** 40,46 ****
  autoindenting turned on.
  --------------------------------------------------------------------------
  #
! cat /usr/lib/learn/vi/longtext >> AdvInsert
  vi AdvInsert
  #next
  6.2  10
--- 40,46 ----
  autoindenting turned on.
  --------------------------------------------------------------------------
  #
! cat /usr/share/learn/vi/longtext >> AdvInsert
  vi AdvInsert
  #next
  6.2  10
*** /usr/src/share/learn/vi/L6.2.old	Tue May 17 21:42:41 1983
--- /usr/src/share/learn/vi/L6.2	Thu Oct 24 14:18:31 1996
***************
*** 87,93 ****
  -----------------------------------------------------------------------------
  #create Empty
  #
! cat /usr/lib/learn/vi/longtext >> Substitute
  vi Substitute
  grep rogue Substitute > Answer
  #cmp Answer Empty
--- 87,93 ----
  -----------------------------------------------------------------------------
  #create Empty
  #
! cat /usr/share/learn/vi/longtext >> Substitute
  vi Substitute
  grep rogue Substitute > Answer
  #cmp Answer Empty
*** /usr/src/share/me/Makefile.old	Wed Feb 18 01:10:52 1987
--- /usr/src/share/me/Makefile	Mon Oct 21 20:49:17 1996
***************
*** 3,9 ****
  # All rights reserved.  The Berkeley software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)Makefile	6.1 (Berkeley) 5/21/86
  #
  #  Makefile for -me macros
  #
--- 3,9 ----
  # All rights reserved.  The Berkeley software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)Makefile	6.1.1 (2.11BSD) 1996/10/21
  #
  #  Makefile for -me macros
  #
***************
*** 11,23 ****
  #	installs them in the expected directories.
  #
  DESTDIR=
! LIB =	/usr/lib/me
  
  SRCS =	tmac.e acm.me chars.me deltext.me eqn.me \
  	float.me footnote.me index.me local.me null.me \
  	refer.me sh.me tbl.me thesis.me
- GET =	sccs get
  
  all: revisions $(SRCS)
  
  install: revisions $(SRCS)
--- 11,24 ----
  #	installs them in the expected directories.
  #
  DESTDIR=
! LIB =	/usr/share/me
  
  SRCS =	tmac.e acm.me chars.me deltext.me eqn.me \
  	float.me footnote.me index.me local.me null.me \
  	refer.me sh.me tbl.me thesis.me
  
+ MISC = 	summary.extern test.accent test.umlaut
+ 
  all: revisions $(SRCS)
  
  install: revisions $(SRCS)
***************
*** 36,45 ****
  		    -e '/\\n@/d' $$i > _mac_tmp_; \
  		install -m 0444 _mac_tmp_ ${DESTDIR}${LIB}/$$i; \
  	done
! 	mv ${DESTDIR}${LIB}/tmac.e ${DESTDIR}/usr/lib/tmac/tmac.e
  	install -c -m 0444 revisions ${DESTDIR}${LIB}/revisions
  
  clean:
- 
- revisions $(SRCS):
- 	$(GET) SCCS/s.$@
--- 37,45 ----
  		    -e '/\\n@/d' $$i > _mac_tmp_; \
  		install -m 0444 _mac_tmp_ ${DESTDIR}${LIB}/$$i; \
  	done
! 	-mkdir -p ${DESTDIR}/usr/share/tmac
! 	mv ${DESTDIR}${LIB}/tmac.e ${DESTDIR}/usr/share/tmac/tmac.e
  	install -c -m 0444 revisions ${DESTDIR}${LIB}/revisions
+ 	install -c -m 444 ${MISC} ${DESTDIR}${LIB}
  
  clean:
*** /usr/src/share/me/tmac.e.old	Wed Feb 18 01:10:49 1987
--- /usr/src/share/me/tmac.e	Mon Oct 21 20:50:21 1996
***************
*** 12,18 ****
  .\"*		1919 Addison Street Suite 105				*
  .\"*		Berkeley, California  94704				*
  .\"*									*
! .\"*	VERSION 2.28	First Release: 11 Sept 1978			*
  .\"*	See file \*(||/revisions for revision history			*
  .\"*									*
  .\"*	Documentation is available.					*
--- 12,18 ----
  .\"*		1919 Addison Street Suite 105				*
  .\"*		Berkeley, California  94704				*
  .\"*									*
! .\"*	VERSION 2.29	First Release: 11 Sept 1978			*
  .\"*	See file \*(||/revisions for revision history			*
  .\"*									*
  .\"*	Documentation is available.					*
***************
*** 19,25 ****
  .\"*									*
  .\"**********************************************************************
  .\"
! .\"	@(#)tmac.e	2.28	5/12/86
  .\"	%beginstrip%
  .\"
  .\"	Code on .de commands:
--- 19,25 ----
  .\"*									*
  .\"**********************************************************************
  .\"
! .\"	@(#)tmac.e	2.29	1996/10/21
  .\"	%beginstrip%
  .\"
  .\"	Code on .de commands:
***************
*** 1068,1074 ****
  .nr ii 5n			\" indent for .ip's and .np's
  .nr $m 1			\" max number of columns
  .nr $s 4n			\" column separation
! .ds || /usr/lib/me
  .if \n@>0 .ds || .
  .bd S B 3
  .\"		*** OTHER INITIALIZATION ***
--- 1068,1074 ----
  .nr ii 5n			\" indent for .ip's and .np's
  .nr $m 1			\" max number of columns
  .nr $s 4n			\" column separation
! .ds || /usr/share/me
  .if \n@>0 .ds || .
  .bd S B 3
  .\"		*** OTHER INITIALIZATION ***
*** /usr/src/share/ms/README.old	Thu Jun 23 09:55:46 1983
--- /usr/src/share/ms/README	Fri Oct 25 21:33:13 1996
***************
*** 1,4 ****
! This directory, /usr/lib/ms, contains various macro files used
  by the -ms package, along with various scripts that are useful
  for text formatting.  These scripts are not supported commands--
  they are examples that may assist you with document preparation.
--- 1,4 ----
! The directory /usr/share/ms contains various macro files used
  by the -ms package, along with various scripts that are useful
  for text formatting.  These scripts are not supported commands--
  they are examples that may assist you with document preparation.
***************
*** 19,38 ****
  When you want to produce numbered endnotes instead of footnotes,
  you can run the program as follows:
  
! 	% /usr/lib/ms/endnote filename(s) | nroff -ms
  
  Other nroff options, such as -T to specify terminal type, may
  also be given.  If you're using refer, tbl, or eqn, they should
! follow /usr/lib/ms/endnote, in the proper order.  The endnote
  program creates the file "endnotes" in the working directory;
  the file is removed afterward endnote finishes.  If this file
  already exists, the program exits with an error message.
  
  After a while you may find it more convenient to copy this script
! to your own directory, rather than saying /usr/lib/ms/endnote
  every time you want to run it.  To do this, type:
  
! 	% cp /usr/lib/ms/endnote endnote
  	% chmod +x endnote
  
  The first command will copy it into your working directory, and
--- 19,38 ----
  When you want to produce numbered endnotes instead of footnotes,
  you can run the program as follows:
  
! 	% /usr/share/ms/endnote filename(s) | nroff -ms
  
  Other nroff options, such as -T to specify terminal type, may
  also be given.  If you're using refer, tbl, or eqn, they should
! follow /usr/share/ms/endnote, in the proper order.  The endnote
  program creates the file "endnotes" in the working directory;
  the file is removed afterward endnote finishes.  If this file
  already exists, the program exits with an error message.
  
  After a while you may find it more convenient to copy this script
! to your own directory, rather than saying /usr/share/ms/endnote
  every time you want to run it.  To do this, type:
  
! 	% cp /usr/share/ms/endnote endnote
  	% chmod +x endnote
  
  The first command will copy it into your working directory, and
***************
*** 49,57 ****
  
  The swapacc program is best run from inside the editor:
  
! 	:1,$ ! /usr/lib/ms/swapacc
  
  The first to the last lines of the editor buffer will be sent to
! the shell, which will run /usr/lib/ms/swapacc, and then return
  all lines to where they were before.
- 
--- 49,56 ----
  
  The swapacc program is best run from inside the editor:
  
! 	:1,$ ! /usr/share/ms/swapacc
  
  The first to the last lines of the editor buffer will be sent to
! the shell, which will run /usr/share/ms/swapacc, and then return
  all lines to where they were before.
*** /usr/src/share/ms/endnote.old	Thu Jun 23 09:55:46 1983
--- /usr/src/share/ms/endnote	Mon Oct 21 20:08:12 1996
***************
*** 13,18 ****
  	exit
  fi
  
! awk -f /usr/lib/ms/end.awk $*
  cat endnotes
  rm -f endnotes
--- 13,18 ----
  	exit
  fi
  
! awk -f /usr/share/ms/end.awk $*
  cat endnotes
  rm -f endnotes
*** /usr/src/share/termcap/Makefile.old	Sun Jan 23 01:27:27 1994
--- /usr/src/share/termcap/Makefile	Mon Oct 21 21:19:57 1996
***************
*** 3,9 ****
  # All rights reserved.  The Berkeley software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)Makefile	5.2.1 (2.11BSD GTE) 1/23/94
  #
  # reorder gives an editor command for most common terminals
  # (in reverse order from n'th to 1'st most commonly used)
--- 3,9 ----
  # All rights reserved.  The Berkeley software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)Makefile	5.2.2 (2.11BSD GTE) 1996/10/21
  #
  # reorder gives an editor command for most common terminals
  # (in reverse order from n'th to 1'st most commonly used)
***************
*** 15,27 ****
  	ex - termcap.src < reorder
  
  install: termcap tabset
! 	install -m 444 termcap ${DESTDIR}/etc/termcap
  
  tabset: FRC
! 	rm -fr ${DESTDIR}/usr/lib/tabset
! 	mkdir ${DESTDIR}/usr/lib/tabset
! 	chmod 755 ${DESTDIR}/usr/lib/tabset
! 	install -c -m 444 tabset/* ${DESTDIR}/usr/lib/tabset
  
  clean:
  	rm -f termcap
--- 15,29 ----
  	ex - termcap.src < reorder
  
  install: termcap tabset
! 	install -m 444 termcap ${DESTDIR}/usr/share/misc/termcap
! 	rm -f ${DESTDIR}/etc/termcap
! 	ln -s /usr/share/misc/termcap ${DESTDIR}/etc/termcap
  
  tabset: FRC
! 	rm -fr ${DESTDIR}/usr/share/tabset
! 	mkdir ${DESTDIR}/usr/share/tabset
! 	chmod 755 ${DESTDIR}/usr/share/tabset
! 	install -c -m 444 tabset/* ${DESTDIR}/usr/share/tabset
  
  clean:
  	rm -f termcap
*** /usr/src/share/termcap/README.old	Sun Feb 15 20:50:36 1987
--- /usr/src/share/termcap/README	Mon Oct 21 21:20:41 1996
***************
*** 14,21 ****
  probably quite common and really should go near the front.
  
  Third, if you are not a super user and cannot create the directory
! /usr/lib/tabset, make a corresponding directory somewhere you can and
! add a line to reorder to globally change all /usr/lib/tabset's to your
  own path name.  This change is better than just changing the termcap.src
  file because it makes it easier to diff it from newer distributed versions.
  Try to keep the source as is whenever possible, and put mungings into reorder.
--- 14,21 ----
  probably quite common and really should go near the front.
  
  Third, if you are not a super user and cannot create the directory
! /usr/share/tabset, make a corresponding directory somewhere you can and
! add a line to reorder to globally change all /usr/share/tabset's to your
  own path name.  This change is better than just changing the termcap.src
  file because it makes it easier to diff it from newer distributed versions.
  Try to keep the source as is whenever possible, and put mungings into reorder.
*** /usr/src/share/termcap/termcap.src.old	Sat Feb 27 23:50:03 1993
--- /usr/src/share/termcap/termcap.src	Mon Oct 21 21:22:25 1996
***************
*** 1,6 ****
  # ------------------------
  #
! #	Termcap source file	@(#)termcap.src	5.40 (Berkeley) 8/22/88
  #	John Kunze, Berkeley
  #	Craig Leres, Berkeley
  #
--- 1,6 ----
  # ------------------------
  #
! #	Termcap source file	@(#)termcap.src	5.40.1 (2.11BSD) 1996/10/21
  #	John Kunze, Berkeley
  #	Craig Leres, Berkeley
  #
***************
*** 93,111 ****
  #	EK352; SRI International; 333 Ravenswood Avenue; Menlo Park, CA 94025
  Aa|agile|agiles|sri agiles:\
  	:bs:hc:os:pl:co#132:do=^J:kb=^H:up=\E\n:\
! 	:hu=\E0:hd=\E9:if=/usr/lib/tabset/std:is=\EE\EF\EJ:
  A6|1620|1720|450|ipsi|diablo 1620:\
  	:do=^J:ct=\E2:st=\E1:ch=\E\t%i%.:\
! 	:if=/usr/lib/tabset/xerox1720:\
  	:kb=^H:le=^H:bs:co#132:hc:hu=\EU:hd=\ED:os:pt:up=\E\n:
  A7|1620-m8|1640-m8|diablo 1620 w/8 column left margin:\
  	:do=^J:co#124:is=\r        \E9:tc=1620:
  A8|1640|1740|630|1730|x1700|diablo|xerox|diablo 1640:\
! 	:if=/usr/lib/tabset/xerox1730:\
  	:us=\EE:ue=\ER:so=\EW:se=\E&:tc=1620:
  Am|1640-lm|1740-lm|630-lm|1730-lm|x1700-lm|diablo-lm|xerox-lm|\
  	diablo 1640 with idented left margin:\
! 	:if=/usr/lib/tabset/xerox1730-lm:\
  	:co#124:us=\EE:ue=\ER:so=\EW:se=\E&:tc=1620:
  # DTC 382 with VDU.  Has no cd so we fake it with ce.  Standout works but
  # won't go away without dynamite.  The terminal has tabs, but I'm getting
--- 93,111 ----
  #	EK352; SRI International; 333 Ravenswood Avenue; Menlo Park, CA 94025
  Aa|agile|agiles|sri agiles:\
  	:bs:hc:os:pl:co#132:do=^J:kb=^H:up=\E\n:\
! 	:hu=\E0:hd=\E9:if=/usr/share/tabset/std:is=\EE\EF\EJ:
  A6|1620|1720|450|ipsi|diablo 1620:\
  	:do=^J:ct=\E2:st=\E1:ch=\E\t%i%.:\
! 	:if=/usr/share/tabset/xerox1720:\
  	:kb=^H:le=^H:bs:co#132:hc:hu=\EU:hd=\ED:os:pt:up=\E\n:
  A7|1620-m8|1640-m8|diablo 1620 w/8 column left margin:\
  	:do=^J:co#124:is=\r        \E9:tc=1620:
  A8|1640|1740|630|1730|x1700|diablo|xerox|diablo 1640:\
! 	:if=/usr/share/tabset/xerox1730:\
  	:us=\EE:ue=\ER:so=\EW:se=\E&:tc=1620:
  Am|1640-lm|1740-lm|630-lm|1730-lm|x1700-lm|diablo-lm|xerox-lm|\
  	diablo 1640 with idented left margin:\
! 	:if=/usr/share/tabset/xerox1730-lm:\
  	:co#124:us=\EE:ue=\ER:so=\EW:se=\E&:tc=1620:
  # DTC 382 with VDU.  Has no cd so we fake it with ce.  Standout works but
  # won't go away without dynamite.  The terminal has tabs, but I'm getting
***************
*** 125,131 ****
  	:dl=^P^S:ei=^Pi:ho=^P^R:im=^PI:ve=^Pb:vs=^PB:pc=\177:te=20^P^]:\
  	:li#24:nd=^PR:.se=^P \200:.so=^P \002^PF:us=^P \020:ue=^P \200:\
  	:up=^P^L:nc:xr:xs:da:db:.pt:cr=^P^M:cd=^P^U^P^S^P^S:\
! 	:if=/usr/lib/tabset/dtc382:
  Ad|dtc300s|300|300s|dtc 300s:\
  	:ct=\E3:st=\E1:do=^J:\
  	:kb=^h:le=^H:bs:co#132:hc:hu=\EH:hd=\Eh:os:pt:up=^Z:
--- 125,131 ----
  	:dl=^P^S:ei=^Pi:ho=^P^R:im=^PI:ve=^Pb:vs=^PB:pc=\177:te=20^P^]:\
  	:li#24:nd=^PR:.se=^P \200:.so=^P \002^PF:us=^P \020:ue=^P \200:\
  	:up=^P^L:nc:xr:xs:da:db:.pt:cr=^P^M:cd=^P^U^P^S^P^S:\
! 	:if=/usr/share/tabset/dtc382:
  Ad|dtc300s|300|300s|dtc 300s:\
  	:ct=\E3:st=\E1:do=^J:\
  	:kb=^h:le=^H:bs:co#132:hc:hu=\EH:hd=\Eh:os:pt:up=^Z:
***************
*** 190,196 ****
  	:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:\
  	:li#24:nd=\E[C:se=\E[m:so=\E[2;7m:sr=\EM:\
  	:ue=\E[m:up=\E[A:us=\E[4m:EE=\E[m:BO=\E[0;7m:DS=\E[2m:\
! 	:KM=/usr/lib/ua/kmap.5410:is=\E[0m^O\E[?6l:kn#8:\
  	:k1=\EOc:k2=\EOd:k3=\EOe:k4=\EOf:k4=\EOg:k6=\EOh:\
  	:k7=\EOi:k8=\EOj:ko=nd,up,ho:
  # AT&T Teletype 5420 Terminal (a.k.a. 4415) June 5, 1985
--- 190,196 ----
  	:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:\
  	:li#24:nd=\E[C:se=\E[m:so=\E[2;7m:sr=\EM:\
  	:ue=\E[m:up=\E[A:us=\E[4m:EE=\E[m:BO=\E[0;7m:DS=\E[2m:\
! 	:KM=/usr/share/ua/kmap.5410:is=\E[0m^O\E[?6l:kn#8:\
  	:k1=\EOc:k2=\EOd:k3=\EOe:k4=\EOf:k4=\EOg:k6=\EOh:\
  	:k7=\EOi:k8=\EOj:ko=nd,up,ho:
  # AT&T Teletype 5420 Terminal (a.k.a. 4415) June 5, 1985
***************
*** 200,206 ****
  	:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:\
  	:li#24:nd=\E[C:se=\E[m:so=\E[2;7m:sr=\EM:\
  	:ue=\E[m:up=\E[A:us=\E[4m:EE=\E[m:BO=\E[0;7m:DS=\E[2m:\
! 	:KM=/usr/lib/ua/kmap.5420:\
  	:is=\E[0m^O\E[1;2;3;4;6l\E[12;13;14;20l\E[?6;97;99l\E[?7h\E[4i\Ex\E[25;1j\212\E[8;0j\E[9;0j\E[10;0j\E[19;1j:\
  	:db:mi:pt:kn#8:k1=\EOc:k2=\EOd:k3=\EOe:k4=\EOf:k5=\EOg:k6=\EOh:\
  	:k7=\EOi:k8=\EOj:ve=\E[11;0j:\
--- 200,206 ----
  	:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:\
  	:li#24:nd=\E[C:se=\E[m:so=\E[2;7m:sr=\EM:\
  	:ue=\E[m:up=\E[A:us=\E[4m:EE=\E[m:BO=\E[0;7m:DS=\E[2m:\
! 	:KM=/usr/share/ua/kmap.5420:\
  	:is=\E[0m^O\E[1;2;3;4;6l\E[12;13;14;20l\E[?6;97;99l\E[?7h\E[4i\Ex\E[25;1j\212\E[8;0j\E[9;0j\E[10;0j\E[19;1j:\
  	:db:mi:pt:kn#8:k1=\EOc:k2=\EOd:k3=\EOe:k4=\EOf:k5=\EOg:k6=\EOh:\
  	:k7=\EOi:k8=\EOj:ve=\E[11;0j:\
***************
*** 207,213 ****
  	:vs=\E[11;1j:ko=bt,nd,up,dc,dl,ho,im,al:
  # AT&T Teletype 5425 Terminal (a.k.a 4425) June 5, 1985
  Bc|5425|4425|tty5425|att4425|AT&T Teletype 5425:\
! 	:FL=\E[%d;00q%-16s\E~:FE=\E|:KM=/usr/lib/ua/kmap.5425:\
  	:is=\E[0m^O\E[1;2;3;4;6l\E[12;13;14;20l\E[?6l\E[?7h\E[4i\E[9;0j\E[10;0j\E[11;0j\E[21;1j\E[25;1j\212:\
  	:ve=\E[12;0j:vs=\E[12;1j:tc=5420:
  Bd|t4|4420|tty4420|Teletype 4420:\
--- 207,213 ----
  	:vs=\E[11;1j:ko=bt,nd,up,dc,dl,ho,im,al:
  # AT&T Teletype 5425 Terminal (a.k.a 4425) June 5, 1985
  Bc|5425|4425|tty5425|att4425|AT&T Teletype 5425:\
! 	:FL=\E[%d;00q%-16s\E~:FE=\E|:KM=/usr/share/ua/kmap.5425:\
  	:is=\E[0m^O\E[1;2;3;4;6l\E[12;13;14;20l\E[?6l\E[?7h\E[4i\E[9;0j\E[10;0j\E[11;0j\E[21;1j\E[25;1j\212:\
  	:ve=\E[12;0j:vs=\E[12;1j:tc=5420:
  Bd|t4|4420|tty4420|Teletype 4420:\
***************
*** 222,233 ****
  	:ic=\E[1@:im=:kb=\10:kd=\E[B:kl=\E[D:kr=\E[C:ku=\E[A:li#24:\
  	:k1=\EOc:k2=\EOd:k3=\EOe:k4=\EOf:k5=\EOg:k6=\EOh:k7=\EOi:k8=\EOj:\
  	:k9=\EOk:k10=\EOu:nd=\E[C:se=\E[m:so=\E[7m:ue=\E[m:up=\E[A:us=\E[4m:\
! 	:EE=\E[m:BO=\E[0;7m:CV=\E[=C:CI=\E[=1C:KM=/usr/lib/ua/kmap.s5:
  Bf|s4|PC7300|unixpc|pc7300|7300|3b1|Safari 4:\
! 	:so=\E[2;7m:DS=\E[2m:XS=\E[9m:KM=/usr/lib/ua/kmap.s4:tc=pc6300plus:
  # AT&T Teletype 610 Terminal
  Bg|b610|610|610bct|tty610:\
! 	:CV=\E[25h:CI=\E[25l:KM=/usr/lib/ua/kmap.s4:\
  	:FL=\E[%d;00q%-16s\E[0p:FE=\E[2p:cl=\E[1;1H\E[J:\
  	:is=\E[0m^O\E[25;1|^J\E[8;0|\E[4;13;20l\E[?5l\E[12h\E[?7h\E[?4i:\
  	:ve=\E[?12l:vs=\E[?12h:tc=5420:
--- 222,233 ----
  	:ic=\E[1@:im=:kb=\10:kd=\E[B:kl=\E[D:kr=\E[C:ku=\E[A:li#24:\
  	:k1=\EOc:k2=\EOd:k3=\EOe:k4=\EOf:k5=\EOg:k6=\EOh:k7=\EOi:k8=\EOj:\
  	:k9=\EOk:k10=\EOu:nd=\E[C:se=\E[m:so=\E[7m:ue=\E[m:up=\E[A:us=\E[4m:\
! 	:EE=\E[m:BO=\E[0;7m:CV=\E[=C:CI=\E[=1C:KM=/usr/share/ua/kmap.s5:
  Bf|s4|PC7300|unixpc|pc7300|7300|3b1|Safari 4:\
! 	:so=\E[2;7m:DS=\E[2m:XS=\E[9m:KM=/usr/share/ua/kmap.s4:tc=pc6300plus:
  # AT&T Teletype 610 Terminal
  Bg|b610|610|610bct|tty610:\
! 	:CV=\E[25h:CI=\E[25l:KM=/usr/share/ua/kmap.s4:\
  	:FL=\E[%d;00q%-16s\E[0p:FE=\E[2p:cl=\E[1;1H\E[J:\
  	:is=\E[0m^O\E[25;1|^J\E[8;0|\E[4;13;20l\E[?5l\E[12h\E[?7h\E[?4i:\
  	:ve=\E[?12l:vs=\E[?12h:tc=5420:
***************
*** 340,346 ****
  	:tc=ibm61:
  I4|ibm|ibm3101|3101|i3101|IBM 3101-10:\
  	:do=^J:ct=\EH:st=\E0:\
! 	:if=/usr/lib/tabset/ibm3101:\
  	:am:le=^H:bs:cl=\EK:li#24:co#80:nd=\EC:up=\EA:cd=\EJ:ce=\EI:\
  	:kd=\EB:kl=\ED:kr=\EC:ku=\EA:ho=\EH:cm=\EY%+\40%+\40:pt:
  Ia|ibm-apl|apl|IBM apl terminal simulator:\
--- 340,346 ----
  	:tc=ibm61:
  I4|ibm|ibm3101|3101|i3101|IBM 3101-10:\
  	:do=^J:ct=\EH:st=\E0:\
! 	:if=/usr/share/tabset/ibm3101:\
  	:am:le=^H:bs:cl=\EK:li#24:co#80:nd=\EC:up=\EA:cd=\EJ:ce=\EI:\
  	:kd=\EB:kl=\ED:kr=\EC:ku=\EA:ho=\EH:cm=\EY%+\40%+\40:pt:
  Ia|ibm-apl|apl|IBM apl terminal simulator:\
***************
*** 478,484 ****
  A2|a210|210|ampex210|ampex a210:\
  	:am:bs:cl=\E*:cm=\E=%+ %+ :al=\EE:bt=\EI:ic=\EQ:im=:ei=:\
  	:dl=\ER:dc=\EW:ho=^^:xn:ce=\Et:cd=\Ey:li#24:co#80:nd=^L:up=^K:\
! 	:pt:if=/usr/lib/tabset/std:is=\EC\Eu\E'\E(\El\EA\E%\E{\E.2\EG0\Ed\En:\
  	:kl=^H:kr=^L:kd=^V:ku=^K:kh=^^:hs:ts=\E.0\Eg\E}\Ef:fs=\E.2:\
  	:kn#10:k0=^A0^M:k1=^A1^M:k2=^A2^M:k3=^A3^M:k4=^A4^M:k5=^A5^M:\
  	:vb=\EU\EX\EU\EX\EU\EX\EU\EX:k6=^A6^M:k7=^A7^M:k8=^A8^M:k9=^A9^M:\
--- 478,484 ----
  A2|a210|210|ampex210|ampex a210:\
  	:am:bs:cl=\E*:cm=\E=%+ %+ :al=\EE:bt=\EI:ic=\EQ:im=:ei=:\
  	:dl=\ER:dc=\EW:ho=^^:xn:ce=\Et:cd=\Ey:li#24:co#80:nd=^L:up=^K:\
! 	:pt:if=/usr/share/tabset/std:is=\EC\Eu\E'\E(\El\EA\E%\E{\E.2\EG0\Ed\En:\
  	:kl=^H:kr=^L:kd=^V:ku=^K:kh=^^:hs:ts=\E.0\Eg\E}\Ef:fs=\E.2:\
  	:kn#10:k0=^A0^M:k1=^A1^M:k2=^A2^M:k3=^A3^M:k4=^A4^M:k5=^A5^M:\
  	:vb=\EU\EX\EU\EX\EU\EX\EU\EX:k6=^A6^M:k7=^A7^M:k8=^A8^M:k9=^A9^M:\
***************
*** 520,526 ****
  	:ti=\E\07200>8000140{<04<0??00001010L<0\072004=0002??00\001:\
  	:te=\E\07200>8000100{804<0??00001000L80\072004=000200??\001:\
  	:so=\E\07200>8000140[80C00\001:se=\E[00C80\001:\
! 	:if=/usr/lib/tabset/aed512:
  # CIT 80  - vt 100 emulator, the termcap has been modified to remove
  #           the delay times and do an auto tab set rather than the indirect
  #           file used in vt100.
--- 520,526 ----
  	:ti=\E\07200>8000140{<04<0??00001010L<0\072004=0002??00\001:\
  	:te=\E\07200>8000100{804<0??00001000L80\072004=000200??\001:\
  	:so=\E\07200>8000140[80C00\001:se=\E[00C80\001:\
! 	:if=/usr/share/tabset/aed512:
  # CIT 80  - vt 100 emulator, the termcap has been modified to remove
  #           the delay times and do an auto tab set rather than the indirect
  #           file used in vt100.
***************
*** 554,560 ****
  	:co#80:li#40:cl=50\E[;H\E[2J:bs:am:cm=5\E[%i%2;%2H:nd=2\E[C:up=2\E[A:\
  	:ce=3\E[K:cd=50\E[J:so=2\E[7m:se=2\E[m:us=2\E[4m:ue=2\E[m:\
  	:is=\E(B\E)0\E>\E[?3l\E[?7h\E[?8h:ks=\E[?1h\E=:ke=\E[?1l\E>:\
! 	:if=/usr/lib/tabset/vt100:ku=\EOA:kd=\EOB:kr=\EOC:kl=\EOD:\
  	:kh=\E[H:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:pt:sr=5\EM:xn:\
  	:do=\ED:al=\E[L:dc=\E[P:dl=\E[M:
  # Note several versions of blit.  I don't know exactly what is what
--- 554,560 ----
  	:co#80:li#40:cl=50\E[;H\E[2J:bs:am:cm=5\E[%i%2;%2H:nd=2\E[C:up=2\E[A:\
  	:ce=3\E[K:cd=50\E[J:so=2\E[7m:se=2\E[m:us=2\E[4m:ue=2\E[m:\
  	:is=\E(B\E)0\E>\E[?3l\E[?7h\E[?8h:ks=\E[?1h\E=:ke=\E[?1l\E>:\
! 	:if=/usr/share/tabset/vt100:ku=\EOA:kd=\EOB:kr=\EOC:kl=\EOD:\
  	:kh=\E[H:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:pt:sr=5\EM:xn:\
  	:do=\ED:al=\E[L:dc=\E[P:dl=\E[M:
  # Note several versions of blit.  I don't know exactly what is what
***************
*** 635,641 ****
  	:tc=freedom100:
  # (from kerch@lll-crg)
  Q1|f200|freedom200| Freedom 200 VDT by Liberty Electronics :\
! 	:if=/usr/lib/tabset/stdcrt:al=\EE:am:bs:bt=\EI:cd=\EY:\
  	:ce=\ET:cl=^Z:cm=\E=%+ %+ :co#80:dc=\EW:dl=\ER:do=^V:\
  	:ds=\Eh:ei=\Er:im=\Eq:is=\Eg\El\E\041\062:\
  	:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:\
--- 635,641 ----
  	:tc=freedom100:
  # (from kerch@lll-crg)
  Q1|f200|freedom200| Freedom 200 VDT by Liberty Electronics :\
! 	:if=/usr/share/tabset/stdcrt:al=\EE:am:bs:bt=\EI:cd=\EY:\
  	:ce=\ET:cl=^Z:cm=\E=%+ %+ :co#80:dc=\EW:dl=\ER:do=^V:\
  	:ds=\Eh:ei=\Er:im=\Eq:is=\Eg\El\E\041\062:\
  	:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:\
***************
*** 1416,1422 ****
  	:co#80:li#34:\
  	:al=\E[L:am:bc=\E[D:bs:bt=\E[Z:cd=\E[J:ce=\E[K:\
  	:cl=\E[;H\E[2J:cm=\E[%i%d;%dH:da:db:dc=\E[P:dl=\E[M:do=\E[B:\
! 	:ei=\E[4l:eo:ho=\E[;H:im=\E[4h:if=/usr/lib/tabset/vt100:\
  	:is=\E%\0410\E%\014\ELV0\EKA1\ELBB2\ENU@\075\ELLB2\ELM0\ELV1\EKYA?\E%\0411\E[<1l\E[?7h\E[?8h\E[34;1H\E[34B\E[0m:\
  	:kb=^H:ke=\E>:ks=\E=:nd=\E[C:pt:se=\E[m:so=\E[7m:sr=\EM:\
  	:te=\E%\0410\ELBG8\E%\0411\E[34;1H\E[J:
--- 1416,1422 ----
  	:co#80:li#34:\
  	:al=\E[L:am:bc=\E[D:bs:bt=\E[Z:cd=\E[J:ce=\E[K:\
  	:cl=\E[;H\E[2J:cm=\E[%i%d;%dH:da:db:dc=\E[P:dl=\E[M:do=\E[B:\
! 	:ei=\E[4l:eo:ho=\E[;H:im=\E[4h:if=/usr/share/tabset/vt100:\
  	:is=\E%\0410\E%\014\ELV0\EKA1\ELBB2\ENU@\075\ELLB2\ELM0\ELV1\EKYA?\E%\0411\E[<1l\E[?7h\E[?8h\E[34;1H\E[34B\E[0m:\
  	:kb=^H:ke=\E>:ks=\E=:nd=\E[C:pt:se=\E[m:so=\E[7m:sr=\EM:\
  	:te=\E%\0410\ELBG8\E%\0411\E[34;1H\E[J:
***************
*** 1533,1539 ****
  # good grief - does this entry make sg/ug when it doesn't have to?
  # look at those spaces in se/so.  Seems strange to me...
  bh|bh3m|beehiveIIIm:\
! 	:if=/usr/lib/tabset/beehive:do=^J:\
  	:al=160^S:am:le=^H:bs:cd=^R:ce=^P:cl=^E^R:\
  	:co#80:dl=350^Q:ho=^E:li#20:ll=^E^K:\
  	:nd=^L:pt:se= ^_:so=^] :up=^K:
--- 1533,1539 ----
  # good grief - does this entry make sg/ug when it doesn't have to?
  # look at those spaces in se/so.  Seems strange to me...
  bh|bh3m|beehiveIIIm:\
! 	:if=/usr/share/tabset/beehive:do=^J:\
  	:al=160^S:am:le=^H:bs:cd=^R:ce=^P:cl=^E^R:\
  	:co#80:dl=350^Q:ho=^E:li#20:ll=^E^K:\
  	:nd=^L:pt:se= ^_:so=^] :up=^K:
***************
*** 1755,1761 ****
  	:le=^H:bs:am:cm=5\E[%i%d;%dH:nd=2\E[C:up=2\E[A:\
  	:ce=3\E[K:cd=50\E[J:so=2\E[7m:se=2\E[m:us=2\E[4m:ue=2\E[m:\
  	:md=2\E[1m:mr=2\E[7m:mb=2\E[5m:me=2\E[m:is=\E[1;24r\E[24;1H:\
! 	:rf=/usr/lib/tabset/vt100:\
  	:rs=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:ks=\E[?1h\E=:ke=\E[?1l\E>:\
  	:ku=\EOA:kd=\EOB:kr=\EOC:kl=\EOD:kb=^H:\
  	:ho=\E[H:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:pt:sr=2*\EM:vt#3:xn:\
--- 1755,1761 ----
  	:le=^H:bs:am:cm=5\E[%i%d;%dH:nd=2\E[C:up=2\E[A:\
  	:ce=3\E[K:cd=50\E[J:so=2\E[7m:se=2\E[m:us=2\E[4m:ue=2\E[m:\
  	:md=2\E[1m:mr=2\E[7m:mb=2\E[5m:me=2\E[m:is=\E[1;24r\E[24;1H:\
! 	:rf=/usr/share/tabset/vt100:\
  	:rs=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:ks=\E[?1h\E=:ke=\E[?1l\E>:\
  	:ku=\EOA:kd=\EOB:kr=\EOC:kl=\EOD:kb=^H:\
  	:ho=\E[H:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:pt:sr=2*\EM:vt#3:xn:\
***************
*** 1777,1783 ****
  	:le=^H:am:bs:cm=5\E[%i%d;%dH:nd=2\E[C:up=2\E[A:ce=3\E[K:cd=50\E[J:\
  	:so=2\E[7m:se=2\E[m:us=2\E[4m:ue=2\E[m:md=2\E[1m:mr=2\E[7m:mb=2\E[5m:\
  	:me=2\E[m:is=\E[1;24r\E[24;1H\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:\
! 	:ks=\E[?1h\E=:ke=\E[?1l\E>:if=/usr/lib/tabset/vt100:ku=\EOA:kd=\EOB:\
  	:kr=\EOC:kl=\EOD:kb=^H:ho=\E[H:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:\
  	:pt:sr=5\EM:vt#3:sc=\E7:rc=\E8:cs=\E[%i%d;%dr:
  d9|vt125-nam|DEC vt125 no automatic margin:\
--- 1777,1783 ----
  	:le=^H:am:bs:cm=5\E[%i%d;%dH:nd=2\E[C:up=2\E[A:ce=3\E[K:cd=50\E[J:\
  	:so=2\E[7m:se=2\E[m:us=2\E[4m:ue=2\E[m:md=2\E[1m:mr=2\E[7m:mb=2\E[5m:\
  	:me=2\E[m:is=\E[1;24r\E[24;1H\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:\
! 	:ks=\E[?1h\E=:ke=\E[?1l\E>:if=/usr/share/tabset/vt100:ku=\EOA:kd=\EOB:\
  	:kr=\EOC:kl=\EOD:kb=^H:ho=\E[H:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:\
  	:pt:sr=5\EM:vt#3:sc=\E7:rc=\E8:cs=\E[%i%d;%dr:
  d9|vt125-nam|DEC vt125 no automatic margin:\
***************
*** 1981,1987 ****
  	:is=\E&jA\r:ke=\E&jA:tc=hp2621-fl:
  # 2392 (from haddix@arpa?)
  hz|2392|hp2392|hp2392a:\
! 	:bt=\Ei:ip=2:is=\E&j@\E3\r:if=/usr/lib/tabset/stdcrt:\
  	:ml=\El:MT:mu=\Em:km:\
  	:mh=\E&dH:mr=\E&dB:us=\E&dD:mb=\E&dA:me=\E&d@:\
  	:ku=\EA:kd=\EB:kl=\ED:kr=\EC:kh=\Eh:ks=\E&s1A:ke=\E&s0A:tc=hp:
--- 1981,1987 ----
  	:is=\E&jA\r:ke=\E&jA:tc=hp2621-fl:
  # 2392 (from haddix@arpa?)
  hz|2392|hp2392|hp2392a:\
! 	:bt=\Ei:ip=2:is=\E&j@\E3\r:if=/usr/share/tabset/stdcrt:\
  	:ml=\El:MT:mu=\Em:km:\
  	:mh=\E&dH:mr=\E&dB:us=\E&dD:mb=\E&dA:me=\E&d@:\
  	:ku=\EA:kd=\EB:kl=\ED:kr=\EC:kh=\Eh:ks=\E&s1A:ke=\E&s0A:tc=hp:
***************
*** 2067,2073 ****
  	:rs=\E<\E[1;24r\E[24;1H\E[?7h\E[>4h\E[>1;2;3;5;6;7;8;9l\E[m\E[11m:\
  	:ku=\EOA:kd=\EOB:kr=\EOC:kl=\EOD:kb=^H:\
  	:k1=\EOS:k2=\EOT:k3=\EOU:k4=\EOV:k5=\EOW:k6=\EOP:k7=\EOQ:k8=\EOR:\
! 	:k9=\EOX:k0=\E[~:l0=help:kn#2:ko=ho,cd:if=/usr/lib/tabset/zenith29:\
  	:es:hs:ts=\E[s\E[>5;1h\E[25;%i%dH\E[1K:fs=\E[u\E[>5l:ds=\E[>1l:\
  	:cs=\E[%i%d;%dr:sr=\EM:sf=\ED:DO=\E[%dB:UP=\E[%dA:LE=\E[%dD:\
  	:RI=\E[%dC:AL=\E[%dL:DL=\E[%dM:sc=\E[s:rc=\E[r:dc=\E[1P:DC=\E[%dP:\
--- 2067,2073 ----
  	:rs=\E<\E[1;24r\E[24;1H\E[?7h\E[>4h\E[>1;2;3;5;6;7;8;9l\E[m\E[11m:\
  	:ku=\EOA:kd=\EOB:kr=\EOC:kl=\EOD:kb=^H:\
  	:k1=\EOS:k2=\EOT:k3=\EOU:k4=\EOV:k5=\EOW:k6=\EOP:k7=\EOQ:k8=\EOR:\
! 	:k9=\EOX:k0=\E[~:l0=help:kn#2:ko=ho,cd:if=/usr/share/tabset/zenith29:\
  	:es:hs:ts=\E[s\E[>5;1h\E[25;%i%dH\E[1K:fs=\E[u\E[>5l:ds=\E[>1l:\
  	:cs=\E[%i%d;%dr:sr=\EM:sf=\ED:DO=\E[%dB:UP=\E[%dA:LE=\E[%dD:\
  	:RI=\E[%dC:AL=\E[%dL:DL=\E[%dM:sc=\E[s:rc=\E[r:dc=\E[1P:DC=\E[%dP:\
***************
*** 2270,2276 ****
  	:do=^J:li#24:co#64:cl=^l:ho=^q:nd=^s:\
  	:up=^w:le=^H:bs:le=^a:bc=^a:ma=^x^J:kd=^S:
  qu|ubell|ubellchar:\
! 	:if=/usr/lib/tabset/ubell:do=^J:am:le=^H:bs:pt:ce=\Ed:cl=^Z:\
  	:cm=\E=%+ %+ :co#80:li#24:nd=^L:up=^K:ma=j^Jk^P^K^Pl :ho=^^:
  qw|ttyWilliams:\
  	:do=^J:co#80:li#12:le=^Y:bc=^Y:do=^K:up=^Z:cl=^^:ce=^_:am:ho=^]:nd=^X:
--- 2270,2276 ----
  	:do=^J:li#24:co#64:cl=^l:ho=^q:nd=^s:\
  	:up=^w:le=^H:bs:le=^a:bc=^a:ma=^x^J:kd=^S:
  qu|ubell|ubellchar:\
! 	:if=/usr/share/tabset/ubell:do=^J:am:le=^H:bs:pt:ce=\Ed:cl=^Z:\
  	:cm=\E=%+ %+ :co#80:li#24:nd=^L:up=^K:ma=j^Jk^P^K^Pl :ho=^^:
  qw|ttyWilliams:\
  	:do=^J:co#80:li#12:le=^Y:bc=^Y:do=^K:up=^Z:cl=^^:ce=^_:am:ho=^]:nd=^X:
***************
*** 2332,2338 ****
  	:kb=^H:ku=^K:kd=^J:kl=^H:kr=^L:k0=^AI\r:k1=^A@\r:k2=^AA\r:k3=^AB\r:\
  	:bs:am:k4=^AC\r:k5=^AD\r:k6=^AE\r:k7=^AF\r:k8=^AG\r:k9=^AH\r:\
  	:ho=^^:im=:ic=\EQ:li#24:nd=^L:pt:se=\Ek:so=\Ej:up=^K:us=\El:ue=\Em:\
! 	:ma=^K^P^L :sg#1:ug#1:if=/usr/lib/tabset/stdcrt
  # the 912 has a <funct> key that's like shift: <funct>8 xmits "^A8\r".
  # The 920 has this plus real function keys that xmit different things.
  # Termcap makes you use the funct key on the 912 but the real keys on the 920.
--- 2332,2338 ----
  	:kb=^H:ku=^K:kd=^J:kl=^H:kr=^L:k0=^AI\r:k1=^A@\r:k2=^AA\r:k3=^AB\r:\
  	:bs:am:k4=^AC\r:k5=^AD\r:k6=^AE\r:k7=^AF\r:k8=^AG\r:k9=^AH\r:\
  	:ho=^^:im=:ic=\EQ:li#24:nd=^L:pt:se=\Ek:so=\Ej:up=^K:us=\El:ue=\Em:\
! 	:ma=^K^P^L :sg#1:ug#1:if=/usr/share/tabset/stdcrt
  # the 912 has a <funct> key that's like shift: <funct>8 xmits "^A8\r".
  # The 920 has this plus real function keys that xmit different things.
  # Termcap makes you use the funct key on the 912 but the real keys on the 920.
***************
*** 2353,2359 ****
  	:so@:se@:us@:ue@:tc=tvi950:
  vi|tvi925|925|televideo model 925:\
  	:hs:xn:am:bs:co#80:li#24:cm=\E=%+ %+ :cl=\E*:cd=\Ey:ce=\Et:is=\El\E":\
! 	:al=\EE:dl=\ER:im=:ei=:ic=\EQ:dc=\EW:if=/usr/lib/tabset/stdcrt:\
  	:ho=^^:nd=^L:bt=\EI:pt:so=\EG4:se=\EG0:sg#1:us=\EG8:ue=\EG0:ug#1:\
  	:up=^K:do=^V:kb=^H:ku=^K:kd=^V:kl=^H:kr=^L:kh=^^:ma=^V^J^L :\
  	:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:k6=^AE\r:k7=^AF\r:\
--- 2353,2359 ----
  	:so@:se@:us@:ue@:tc=tvi950:
  vi|tvi925|925|televideo model 925:\
  	:hs:xn:am:bs:co#80:li#24:cm=\E=%+ %+ :cl=\E*:cd=\Ey:ce=\Et:is=\El\E":\
! 	:al=\EE:dl=\ER:im=:ei=:ic=\EQ:dc=\EW:if=/usr/share/tabset/stdcrt:\
  	:ho=^^:nd=^L:bt=\EI:pt:so=\EG4:se=\EG0:sg#1:us=\EG8:ue=\EG0:ug#1:\
  	:up=^K:do=^V:kb=^H:ku=^K:kd=^V:kl=^H:kr=^L:kh=^^:ma=^V^J^L :\
  	:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:k6=^AE\r:k7=^AF\r:\
***************
*** 2373,2379 ****
  # entry by Tim Curry 5/21/82 Univ. of Central Fla. duke!ucf-cs!tim
  v9|925a|tvi925a|TeleVideo Model 925:\
  	:al=\EE:am:bs:bt=\EI:bw:cd=\EY:ce=\ET:cl=^Z:cm=\E=%+ %+ :co#80:dc=\EW:\
! 	:dl=\ER:do=^V:ei=:ic=\EQ:if=/usr/lib/tabset/std:im=:kb=^H:kd=^V:\
  	:kh=^^:kl=^H:kn#12:kr=^L:ku=^K:li#24:nd=^L:pt:se=\EG0:sg=#1:so=\EG4:\
  	:ue=\EG0:ug#1:up=^K:us=\EG8:is=\El\
  	:vb=\Eb\200\200\200\200\200\200\200\200\200\200\200\200\200\200\Ed:\
--- 2373,2379 ----
  # entry by Tim Curry 5/21/82 Univ. of Central Fla. duke!ucf-cs!tim
  v9|925a|tvi925a|TeleVideo Model 925:\
  	:al=\EE:am:bs:bt=\EI:bw:cd=\EY:ce=\ET:cl=^Z:cm=\E=%+ %+ :co#80:dc=\EW:\
! 	:dl=\ER:do=^V:ei=:ic=\EQ:if=/usr/share/tabset/std:im=:kb=^H:kd=^V:\
  	:kh=^^:kl=^H:kn#12:kr=^L:ku=^K:li#24:nd=^L:pt:se=\EG0:sg=#1:so=\EG4:\
  	:ue=\EG0:ug#1:up=^K:us=\EG8:is=\El\
  	:vb=\Eb\200\200\200\200\200\200\200\200\200\200\200\200\200\200\Ed:\
***************
*** 2401,2407 ****
  	:ct=\E3:st=\E1:do=^J:\
  	:is=\EDF\EC\Ed\EG0\Er\EO\E\047\E(\E%\Ew\EX\Ee ^O\
  	\El\E016\E004\Ex0\200\200\Ex1\200\200\Ex2\200\200\
! 	\Ex3\200\200\Ex4\r\200\Ef\r:if=/usr/lib/tabset/stdcrt:\
  	:al=\EE:am:le=^H:bs:bt=\EI:cd=\Ey:ce=\Et:cl=\E*:cm=\E=%+ %+ :\
  	:co#80:dc=\EW:dl=\ER:do=^V:ei=\Er:ho=^^:im=\Eq:k0=^A0\r:\
  	:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:k6=^AE\r:\
--- 2401,2407 ----
  	:ct=\E3:st=\E1:do=^J:\
  	:is=\EDF\EC\Ed\EG0\Er\EO\E\047\E(\E%\Ew\EX\Ee ^O\
  	\El\E016\E004\Ex0\200\200\Ex1\200\200\Ex2\200\200\
! 	\Ex3\200\200\Ex4\r\200\Ef\r:if=/usr/share/tabset/stdcrt:\
  	:al=\EE:am:le=^H:bs:bt=\EI:cd=\Ey:ce=\Et:cl=\E*:cm=\E=%+ %+ :\
  	:co#80:dc=\EW:dl=\ER:do=^V:ei=\Er:ho=^^:im=\Eq:k0=^A0\r:\
  	:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:k6=^AE\r:\
***************
*** 2476,2482 ****
  	:te=\E\\3\E-07 :ti=\E\\1\E-07 :ks=\El:ke=\Ek:tc=tvi950:
  vg|tvi924|924|televideo model 924:\
  	:am:bs:xn:co#80:li#24:cm=\E=%+ %+ :cl=\E*0:cd=\Ey:ce=\Et:is=\Ek0\E"^O:\
! 	:al=\EE:dl=\ER:im=:ei=:ic=\EQ:dc=\EW:if=/usr/lib/tabset/stdcrt:ho=^^:\
  	:nd=^L:bt=\EI:pt:so=\EG4:se=\EG0:us=\EG8:ue=\EG0:up=^K:do=^V:kb=^H:\
  	:ku=^K:kd=^V:kl=^H:kr=^L:kh=^^:ma=^Vj^Kk^Ll^^H^R^L:k1=^A@\r:k2=^AA\r:\
  	:k3=^AB\r:k4=^AC\r:k5=^AD\r:k6=^AE\r:k7=^AF\r:k8=^AG\r:k9=^AH\r:\
--- 2476,2482 ----
  	:te=\E\\3\E-07 :ti=\E\\1\E-07 :ks=\El:ke=\Ek:tc=tvi950:
  vg|tvi924|924|televideo model 924:\
  	:am:bs:xn:co#80:li#24:cm=\E=%+ %+ :cl=\E*0:cd=\Ey:ce=\Et:is=\Ek0\E"^O:\
! 	:al=\EE:dl=\ER:im=:ei=:ic=\EQ:dc=\EW:if=/usr/share/tabset/stdcrt:ho=^^:\
  	:nd=^L:bt=\EI:pt:so=\EG4:se=\EG0:us=\EG8:ue=\EG0:up=^K:do=^V:kb=^H:\
  	:ku=^K:kd=^V:kl=^H:kr=^L:kh=^^:ma=^Vj^Kk^Ll^^H^R^L:k1=^A@\r:k2=^AA\r:\
  	:k3=^AB\r:k4=^AC\r:k5=^AD\r:k6=^AE\r:k7=^AF\r:k8=^AG\r:k9=^AH\r:\
***************
*** 2490,2501 ****
  # 40), Esc K chooses the normal character set.  Not sure padding is needed, but
  # adapted from the tvi920c termcap.  so and us are klutzy, but at least use no
  # screen space.
! vp|tvipt|televideopt:if=/usr/lib/tabset/stdcrt:\
  	:is=\Ev\Eu\EK:al=5*\EE:am:bs:bt=\EI:ce=\ET:cm=\E=%+ %+ :cl=^Z:co#80:\
  	:dl=5*\ER:kb=^H:ku=^K:kd=^J:kl=^H:kr=^L:ho=^^:li#24:nd=^L:se=\EF:\
  	:so=\EG1@A\EH:ue=\EF:us=\EG1B@\EH:up=^K:ma=^Kk^Ll^R^L:
  # Vanilla tvi910 -- W. Gish (cswarren@violet) 10/29/86
! vm|tvi910|910|televideo model 910:if=/usr/lib/tabset/stdcrt:\
  	:bs:bt=\EI:cd=\EY:ce=\ET:cm=\E=%+ %+ :cl=^Z:co#80:\
  	:kb=^H:ku=^K:kd=^J:kl=^H:kr=^L:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:\
  	:k5=^AD\r:k6=^AE\r:k7=^AF\r:k8=^AG\r:k9=^AH\r:k0=^AI\r:\
--- 2490,2501 ----
  # 40), Esc K chooses the normal character set.  Not sure padding is needed, but
  # adapted from the tvi920c termcap.  so and us are klutzy, but at least use no
  # screen space.
! vp|tvipt|televideopt:if=/usr/share/tabset/stdcrt:\
  	:is=\Ev\Eu\EK:al=5*\EE:am:bs:bt=\EI:ce=\ET:cm=\E=%+ %+ :cl=^Z:co#80:\
  	:dl=5*\ER:kb=^H:ku=^K:kd=^J:kl=^H:kr=^L:ho=^^:li#24:nd=^L:se=\EF:\
  	:so=\EG1@A\EH:ue=\EF:us=\EG1B@\EH:up=^K:ma=^Kk^Ll^R^L:
  # Vanilla tvi910 -- W. Gish (cswarren@violet) 10/29/86
! vm|tvi910|910|televideo model 910:if=/usr/share/tabset/stdcrt:\
  	:bs:bt=\EI:cd=\EY:ce=\ET:cm=\E=%+ %+ :cl=^Z:co#80:\
  	:kb=^H:ku=^K:kd=^J:kl=^H:kr=^L:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:\
  	:k5=^AD\r:k6=^AE\r:k7=^AF\r:k8=^AG\r:k9=^AH\r:k0=^AI\r:\
***************
*** 2505,2511 ****
  vh|tvi910+|910+|televideo 910+:\
  	:al=5*\EE:am:bs:bt=\EI:cd=\EY:ce=\ET:cl=^Z:cm=\E=%+\040%+\040:\
  	:co#80:dc=\EW:dl=\ER:do=^J:ei=:ho=^^:ic=\EQ:\
! 	:if=/usr/lib/tabset/stdcrt:im=:k0=^A@\r:k1=^AA\r:k2=^AB\r:k3=^AC\r:\
  	:k4=^AD\r:k5=^AE\r:k6=^AF\r:k7=^AG\r:k8=^AH\r:k9=^AI\r:kb=^H:\
  	:kd=^J:kh=^^:kl=^H:kr=^L:ku=^K:li#24:ll=\E=7\040:ma=^K^P^L\040:\
  	:nd=^L:pt:se=\EG0:sg#1:so=\EG4:ue=\EG0:up=^K:us=\EG8:xn:
--- 2505,2511 ----
  vh|tvi910+|910+|televideo 910+:\
  	:al=5*\EE:am:bs:bt=\EI:cd=\EY:ce=\ET:cl=^Z:cm=\E=%+\040%+\040:\
  	:co#80:dc=\EW:dl=\ER:do=^J:ei=:ho=^^:ic=\EQ:\
! 	:if=/usr/share/tabset/stdcrt:im=:k0=^A@\r:k1=^AA\r:k2=^AB\r:k3=^AC\r:\
  	:k4=^AD\r:k5=^AE\r:k6=^AF\r:k7=^AG\r:k8=^AH\r:k9=^AI\r:kb=^H:\
  	:kd=^J:kh=^^:kl=^H:kr=^L:ku=^K:li#24:ll=\E=7\040:ma=^K^P^L\040:\
  	:nd=^L:pt:se=\EG0:sg#1:so=\EG4:ue=\EG0:up=^K:us=\EG8:xn:
***************
*** 2522,2528 ****
  	:vb@:xn@:tc=tvi950-rv:
  vx|ims-ansi|ultima2|ultimaII|IMS Ultima II:\
  	:pt:am:bs:co#80:li#24:\
! 	:is=\E[0m\E[>14l\E[?1;?5;20l\E>\E[1m^M:if=/usr/lib/tabset/vt100:\
  	:cl=\E[;H\E[2J:cd=\E[0J:ce=\E[0K:cm=\E[%i%2;%2H:up=\EM:do=\ED:\
  	:ku=\E[A:kd=\E[B:kr=\E[C:kl=\E[D:kh=\E[H:\
  	:so=\E[7m:se=\E[0m\E[1m:us=\E[4m:ue=\E[0m\E[1m:sr=\EM:
--- 2522,2528 ----
  	:vb@:xn@:tc=tvi950-rv:
  vx|ims-ansi|ultima2|ultimaII|IMS Ultima II:\
  	:pt:am:bs:co#80:li#24:\
! 	:is=\E[0m\E[>14l\E[?1;?5;20l\E>\E[1m^M:if=/usr/share/tabset/vt100:\
  	:cl=\E[;H\E[2J:cd=\E[0J:ce=\E[0K:cm=\E[%i%2;%2H:up=\EM:do=\ED:\
  	:ku=\E[A:kd=\E[B:kr=\E[C:kl=\E[D:kh=\E[H:\
  	:so=\E[7m:se=\E[0m\E[1m:us=\E[4m:ue=\E[0m\E[1m:sr=\EM:
***************
*** 2539,2545 ****
  	:do=^J:le=^H:bs:cd=\EJ:ce=\EK:cl=^L:cm=\EY%+ %+ :co#80: \
  	:do=\n:ho=\EH:li#24:ll=\EY7 :nd=\EC:pt:up=^K:
  y6|t1061|teleray 1061:\
! 	:if=/usr/lib/tabset/teleray:\
  	:ct=\EG:st=\EF:do=^J:\
  	:al=2*\EL:am:le=^H:bs:cd=1\EJ:ce=\EK:cl=1^L:cm=\EY%+ %+ :co#80:\
  	:dc=\EQ:dl=2*\EM:ei=:ho=\EH:ic=\EP:im=:ip=0.4*:\
--- 2539,2545 ----
  	:do=^J:le=^H:bs:cd=\EJ:ce=\EK:cl=^L:cm=\EY%+ %+ :co#80: \
  	:do=\n:ho=\EH:li#24:ll=\EY7 :nd=\EC:pt:up=^K:
  y6|t1061|teleray 1061:\
! 	:if=/usr/share/tabset/teleray:\
  	:ct=\EG:st=\EF:do=^J:\
  	:al=2*\EL:am:le=^H:bs:cd=1\EJ:ce=\EK:cl=1^L:cm=\EY%+ %+ :co#80:\
  	:dc=\EQ:dl=2*\EM:ei=:ho=\EH:ic=\EP:im=:ip=0.4*:\
***************
*** 2585,2591 ****
  	:nd=^L:pt:se=\EG0:sf=\n:so=\EG4:sr=\Ej:ue=\EG0:up=^K:us=\EG8:
  # from John Gillmore hoptoad!gnu@lll-crg.arpa
  wv|wyse-vp|wyse|Wyse 50 in ADDS Viewpoint emulation mode with "enhance" on:\
! 	:am:do=^J:if=/usr/lib/tabset/wyse-adds:\
  	:le=^H:bs:li#24:co#80:cm=\EY%+ %+ :cd=\Ek:ce=\EK:nd=^F:\
  	:up=^Z:cl=^L:ho=^A:ll=^A^Z:kl=^U:kr=^F:kd=^J:ku=^Z:kh=^A:\
  	:pt:so=^N:se=^O:us=^N:ue=^O:dl=\El:al=\EM:im=\Eq:ei=\Er:dc=\EW:\
--- 2585,2591 ----
  	:nd=^L:pt:se=\EG0:sf=\n:so=\EG4:sr=\Ej:ue=\EG0:up=^K:us=\EG8:
  # from John Gillmore hoptoad!gnu@lll-crg.arpa
  wv|wyse-vp|wyse|Wyse 50 in ADDS Viewpoint emulation mode with "enhance" on:\
! 	:am:do=^J:if=/usr/share/tabset/wyse-adds:\
  	:le=^H:bs:li#24:co#80:cm=\EY%+ %+ :cd=\Ek:ce=\EK:nd=^F:\
  	:up=^Z:cl=^L:ho=^A:ll=^A^Z:kl=^U:kr=^F:kd=^J:ku=^Z:kh=^A:\
  	:pt:so=^N:se=^O:us=^N:ue=^O:dl=\El:al=\EM:im=\Eq:ei=\Er:dc=\EW:\
***************
*** 2683,2689 ****
  # enter bold mode (md), enter reverse mode (mr), turn off all attributes (me)
  # Kimtron ABM 85 added by Dual Systems
  zd|abm85|Kimtron ABM 85:\
! 	:is=\EC\EX\Eg\En\E%\Er\E(\Ek\Em\Eq:if=/usr/lib/tabset/stdcrt:\
  	:li#24:co#80:am:bs:bw:ms:pt:\
  	:cl=\E*:cd=\Ey:dl=\ER:al=\EE:ce=\Et:dc=\EW:im=\EQ:ei=\Er:\
  	:cm=\E=%+ %+ :do=^J:nd=^L:up=^K:bt=\EI:\
--- 2683,2689 ----
  # enter bold mode (md), enter reverse mode (mr), turn off all attributes (me)
  # Kimtron ABM 85 added by Dual Systems
  zd|abm85|Kimtron ABM 85:\
! 	:is=\EC\EX\Eg\En\E%\Er\E(\Ek\Em\Eq:if=/usr/share/tabset/stdcrt:\
  	:li#24:co#80:am:bs:bw:ms:pt:\
  	:cl=\E*:cd=\Ey:dl=\ER:al=\EE:ce=\Et:dc=\EW:im=\EQ:ei=\Er:\
  	:cm=\E=%+ %+ :do=^J:nd=^L:up=^K:bt=\EI:\
***************
*** 2723,2729 ****
  #from  malman@bbn-vax.arpa
  zE|kt7|kimtron model kt-7:\
  	:am:bs:co#80:li#24:cm=\E=%+ %+ :cl=^Z:cd=\EY:ce=\ET:is=\El\E":\
! 	:al=\EE:dl=\ER:im=:ei=:ic=\EQ:dc=\EW:if=/usr/lib/tabset/stdcrt:\
  	:ho=^^:nd=^L:bt=\EI:pt:so=\EG4:se=\EG0:sg#0:us=\EG8:ue=\EG0:ug#0:\
  	:up=^K:do=^V:kb=^H:ku=^K:kd=^V:kl=^H:kr=^L:kh=^^:ma=^V^J^L :\
  	:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:k6=^AE\r:k7=^AF\r:\
--- 2723,2729 ----
  #from  malman@bbn-vax.arpa
  zE|kt7|kimtron model kt-7:\
  	:am:bs:co#80:li#24:cm=\E=%+ %+ :cl=^Z:cd=\EY:ce=\ET:is=\El\E":\
! 	:al=\EE:dl=\ER:im=:ei=:ic=\EQ:dc=\EW:if=/usr/share/tabset/stdcrt:\
  	:ho=^^:nd=^L:bt=\EI:pt:so=\EG4:se=\EG0:sg#0:us=\EG8:ue=\EG0:ug#0:\
  	:up=^K:do=^V:kb=^H:ku=^K:kd=^V:kl=^H:kr=^L:kh=^^:ma=^V^J^L :\
  	:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:k6=^AE\r:k7=^AF\r:\
***************
*** 2803,2809 ****
  	:is=\E<\E=\E[?3l\E[?7l\E(B\E[J\E7\E[;r\E8\E[m\E[q:\
  	:dl=\E[M:al=\E[L:dc=\E[P:im=\E[4h:ei=\E[4l:\
  	:ks=\E[?1h\E=:ke=\E[?1l\E>:\
! 	:if=/usr/lib/tabset/vt100:ku=\EOA:kd=\EOB:kr=\EOC:kl=\EOD:\
  	:kh=\E[H:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:pt:sr=\EM:
  zv|go140w|graphon go-140 in 132 column mode:\
  	:co#132:is=\E<\E=\E[?3h\E[?7h\E(B\E[J\E7\E[;r\E8\E[m\E[q:\
--- 2803,2809 ----
  	:is=\E<\E=\E[?3l\E[?7l\E(B\E[J\E7\E[;r\E8\E[m\E[q:\
  	:dl=\E[M:al=\E[L:dc=\E[P:im=\E[4h:ei=\E[4l:\
  	:ks=\E[?1h\E=:ke=\E[?1l\E>:\
! 	:if=/usr/share/tabset/vt100:ku=\EOA:kd=\EOB:kr=\EOC:kl=\EOD:\
  	:kh=\E[H:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:pt:sr=\EM:
  zv|go140w|graphon go-140 in 132 column mode:\
  	:co#132:is=\E<\E=\E[?3h\E[?7h\E(B\E[J\E7\E[;r\E8\E[m\E[q:\
***************
*** 2958,2964 ****
  # funny terminal that the TANDEM uses.
  zA|653|t653x|Tandem 653x multipage terminal:\
  	:li#24:co#80:ho=\EH:cm=\023%+ %+ :cl=\EI:cd=\EJ:ce=\EK:am:bs:\
! 	:if=/usr/lib/tabset/tandem653:sb=\ES:sr=\ET:da:db:so=\E6$:se=\E6 :\
  	:us=\E60:ue=\E6 :sg#1:ug#1:up=\EA:do=\012:le=\010:nd=\EC:\
  	:hs:ts=\Eo:fs=\r:ds=\Eo\r:ws#64:
  # From Paul Leondis, unllab@amber.berkeley.edu
--- 2958,2964 ----
  # funny terminal that the TANDEM uses.
  zA|653|t653x|Tandem 653x multipage terminal:\
  	:li#24:co#80:ho=\EH:cm=\023%+ %+ :cl=\EI:cd=\EJ:ce=\EK:am:bs:\
! 	:if=/usr/share/tabset/tandem653:sb=\ES:sr=\ET:da:db:so=\E6$:se=\E6 :\
  	:us=\E60:ue=\E6 :sg#1:ug#1:up=\EA:do=\012:le=\010:nd=\EC:\
  	:hs:ts=\Eo:fs=\r:ds=\Eo\r:ws#64:
  # From Paul Leondis, unllab@amber.berkeley.edu
*** /usr/src/share/tmac/Makefile.old	Sat Feb 21 18:27:47 1987
--- /usr/src/share/tmac/Makefile	Wed Oct 23 21:22:34 1996
***************
*** 3,19 ****
  # All rights reserved.  The Berkeley software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)Makefile	6.2 (Berkeley) 5/28/85
  #
  #
  #  Makefile for -man macros
  #
  
! SRCS=	tmac.an tmac.an.new tmac.an6n tmac.an6t
  
  all:	${SRCS}
  
  install:${SRCS}
! 	for i in ${SRCS}; do (install -c $$i ${DESTDIR}/usr/lib/tmac/$$i); done
  
  clean:
--- 3,23 ----
  # All rights reserved.  The Berkeley software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)Makefile	6.2.1 (2.11BSD) 1996/10/21
  #
  #
  #  Makefile for -man macros
  #
  
! SRCS=	tmac.a tmac.an tmac.an.new tmac.an6n tmac.an6t tmac.ayday \
! 	tmac.cp tmac.imagen tmac.os tmac.r tmac.s tmac.scover \
! 	tmac.sdisp tmac.skeep tmac.srefs tmac.vcat
  
  all:	${SRCS}
  
  install:${SRCS}
! 	-mkdir -p ${DESTDIR}/usr/share/tmac
! 	-chmod a+r,a+x ${DESTDIR}/usr/share/tmac
! 	install -c -m 444 ${SRCS} ${DESTDIR}/usr/share/tmac
  
  clean:
*** /usr/src/share/tmac/tmac.an.new.old	Sat Feb 21 18:27:47 1987
--- /usr/src/share/tmac/tmac.an.new	Thu Oct 31 22:18:00 1996
***************
*** 2,8 ****
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)tmac.an.new	6.4 (Berkeley) 5/30/86
  .\"
  '	DT, PD, SM, and B macros invoked internally.
  '	# month name
--- 2,8 ----
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)tmac.an.new	6.4.1 (2.11BSD) 1996/10/31
  .\"
  '	DT, PD, SM, and B macros invoked internally.
  '	# month name
***************
*** 48,57 ****
--- 48,59 ----
  .de UC
  .if t \{\
  .	ds ]W 3rd Berkeley Distribution
+ .	if "\\$1"2" .ds ]W 2rd Berkeley Distribution
  .	if "\\$1"3" .ds ]W 3rd Berkeley Distribution
  .	if "\\$1"4" .ds ]W 4th Berkeley Distribution
  .	if "\\$1"5" .ds ]W 4.2 Berkeley Distribution
  .	if "\\$1"6" .ds ]W 4.3 Berkeley Distribution
+ .	if "\\$1"7" .ds ]W 4.4 Berkeley Distribution
  .\}
  ..
  '	# reset the basic page layout
*** /usr/src/share/tmac/tmac.an.old	Sat Feb 21 18:27:47 1987
--- /usr/src/share/tmac/tmac.an	Mon Oct 21 20:28:30 1996
***************
*** 2,17 ****
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)tmac.an	6.1 (Berkeley) 5/28/85
  .\"
  .de th
! .if t .so /usr/lib/tmac/tmac.an6t
! .if n .so /usr/lib/tmac/tmac.an6n
  .t1 "\\$1" "\\$2" "\\$3"
  ..
  .de TH
  .rn TH xx
! .so /usr/lib/tmac/tmac.an.new
  .TH "\\$1" "\\$2" "\\$3" "\\$4" "\\$5"
  .rm xx
  ..
--- 2,17 ----
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)tmac.an	6.1.1 (2.11BSD) 1996/10/21
  .\"
  .de th
! .if t .so /usr/share/tmac/tmac.an6t
! .if n .so /usr/share/tmac/tmac.an6n
  .t1 "\\$1" "\\$2" "\\$3"
  ..
  .de TH
  .rn TH xx
! .so /usr/share/tmac/tmac.an.new
  .TH "\\$1" "\\$2" "\\$3" "\\$4" "\\$5"
  .rm xx
  ..
*** /usr/src/share/tmac/tmac.cp.old	Thu Aug  5 14:41:18 1982
--- /usr/src/share/tmac/tmac.cp	Mon Oct 21 20:30:10 1996
***************
*** 27,33 ****
  ..
  .if \nM=1 .so /usr/mel/aip/countrev
  .if \nM=2 .so /usr/mel/aip/findbig
! .if \nM=0 .so /usr/lib/tmac/tmac.a
  .br
  .af % 1
  .CM
--- 27,33 ----
  ..
  .if \nM=1 .so /usr/mel/aip/countrev
  .if \nM=2 .so /usr/mel/aip/findbig
! .if \nM=0 .so /usr/share/tmac/tmac.a
  .br
  .af % 1
  .CM
***************
*** 118,124 ****
  .if n .if \\n(.$>1 \\$1\\c
  .if n .if \\n(.$>1 \\&\\$2
  ..
! .so /usr/lib/tmac/tmac.srefs
  .rm CS CE
  .de UX
  .ie \\n(GA>0 \s-2UNIX\s0\\$1
--- 118,124 ----
  .if n .if \\n(.$>1 \\$1\\c
  .if n .if \\n(.$>1 \\&\\$2
  ..
! .so /usr/share/tmac/tmac.srefs
  .rm CS CE
  .de UX
  .ie \\n(GA>0 \s-2UNIX\s0\\$1
*** /usr/src/share/tmac/tmac.os.old	Sat May  3 20:18:50 1980
--- /usr/src/share/tmac/tmac.os	Mon Oct 21 20:30:31 1996
***************
*** 63,69 ****
  ..
  .de TM
  .if \\n(IM=0 .if \\n(MN=0 .pn 0
! .so /usr/lib/tmac/tmac.scover
  .if \\n(IM=0 .if \\n(MN=0 .rm IM
  .if \\n(IM=0 .if \\n(MN=0 .rm MF
  .if \\n(IM=0 .if \\n(MN=0 .rm MR
--- 63,69 ----
  ..
  .de TM
  .if \\n(IM=0 .if \\n(MN=0 .pn 0
! .so /usr/share/tmac/tmac.scover
  .if \\n(IM=0 .if \\n(MN=0 .rm IM
  .if \\n(IM=0 .if \\n(MN=0 .rm MF
  .if \\n(IM=0 .if \\n(MN=0 .rm MR
*** /usr/src/share/tmac/tmac.s.old	Sat Jan 11 11:46:59 1986
--- /usr/src/share/tmac/tmac.s	Mon Oct 21 20:30:44 1996
***************
*** 1,4 ****
! .ds // /usr/lib/ms/
  .	\" IZ - initialize (before text begins)
  .de IZ
  .nr FM 1i
--- 1,4 ----
! .ds // /usr/share/ms/
  .	\" IZ - initialize (before text begins)
  .de IZ
  .nr FM 1i
*** /usr/src/sys/pdpdist/inetd.conf.old	Wed May 10 16:43:53 1989
--- /usr/src/sys/pdpdist/inetd.conf	Fri Nov  1 19:25:03 1996
***************
*** 6,12 ****
  shell	stream	tcp	nowait	root	/etc/rshd	rshd
  login	stream	tcp	nowait	root	/etc/rlogind	rlogind
  exec	stream	tcp	nowait	root	/etc/rexecd	rexecd
! #uucpd	stream	tcp	nowait	root	/etc/uucpd	uucpd
  #nntp	stream	tcp	nowait	usenet	/etc/nntpd	nntpd
  #finger	stream	tcp	nowait	nobody	/etc/fingerd	fingerd
  #tftp	dgram	udp	wait	nobody	/etc/tftpd	tftpd
--- 6,12 ----
  shell	stream	tcp	nowait	root	/etc/rshd	rshd
  login	stream	tcp	nowait	root	/etc/rlogind	rlogind
  exec	stream	tcp	nowait	root	/etc/rexecd	rexecd
! #uucpd	stream	tcp	nowait	root	/usr/libexec/uucpd	uucpd
  #nntp	stream	tcp	nowait	usenet	/etc/nntpd	nntpd
  #finger	stream	tcp	nowait	nobody	/etc/fingerd	fingerd
  #tftp	dgram	udp	wait	nobody	/etc/tftpd	tftpd
*** /usr/src/sys/pdpdist/passwd.old	Mon Oct  8 14:07:40 1990
--- /usr/src/sys/pdpdist/passwd	Wed Oct 23 15:27:25 1996
***************
*** 3,7 ****
  operator:*:2:5:System &:/usr/guest/operator:/bin/csh
  bin:*:3:20:Binaries Commands and Source:/:/bin/csh
  nobody:*:32767:31:Nobody:/nonexistent:/dev/null
! uucp:*:66:1:UNIX-to-UNIX Copy:/usr/spool/uucppublic:/usr/lib/uucp/uucico
  sms:*:10:10:Steven M. Schultz (sms@wlv.imsd.contel.com):/usr/guest/sms:/bin/csh
--- 3,7 ----
  operator:*:2:5:System &:/usr/guest/operator:/bin/csh
  bin:*:3:20:Binaries Commands and Source:/:/bin/csh
  nobody:*:32767:31:Nobody:/nonexistent:/dev/null
! uucp:*:66:1:UNIX-to-UNIX Copy:/usr/spool/uucppublic:/usr/sbin/uucico
  sms:*:10:10:Steven M. Schultz (sms@wlv.imsd.contel.com):/usr/guest/sms:/bin/csh