New termcap and terminfo database files; now with :bs: re-added to the

termcap format based on changes submitted to the terminfo master by me

1 files changed, 2099 insertions, 732 deletions

diff --git a/share/terminfo/terminfo.src b/share/terminfo/terminfo.src
index ebfbbe65696..7628fbb5d02 100644
--- a/share/terminfo/terminfo.src
+++ b/share/terminfo/terminfo.src
@@ -1,7 +1,6 @@
-#	$OpenBSD: terminfo.src,v 1.3 1996/10/28 19:24:15 tholo Exp $
 ######## TERMINAL TYPE DESCRIPTIONS SOURCE FILE
 #
-#	Version 9.13.8
+#	Version 9.13.24
 #	terminfo syntax
 #
 #	Eric S. Raymond		(current maintainer)
@@ -19,15 +18,18 @@
 # Other terminfo and termcap files exist, supported by various OS vendors
 # or as relics of various older versions of UNIX.  This one is the longest
 # and most comprehensive one in existence.  It subsumes not only the entirety
-# of the historical 4.4BSD, GNU, System V and SCO termcap files, but also large
-# numbers of vendor-maintained termcap and terminfo entries more complete
-# and carefully tested than those in historical termcap/terminfo versions.
+# of the historical 4.4BSD, GNU, System V and SCO termcap files and the BRL
+# termcap file, but also large numbers of vendor-maintained termcap and
+# terminfo entries more complete and carefully tested than those in historical
+# termcap/terminfo versions.
 #
 # Pointers to related resources (including the ncurses distribution) may
 # be found at <http://www.ccil.org/terminfo>.
 #
 # INTERNATIONALIZATION:
 #
+# This file uses only the US-ASCII character set (no ISO8859 characters).
+#
 # This file assumes a US-ASCII character set. If you need to fix this, start
 # by global-replacing \E(B and \E)B with the appropriate ISO 6429 enablers
 # for your character set.  \E(A and \E)A enables the British character set
@@ -187,14 +189,25 @@
 #
 # These capabilities are used by tac(1m), the terminfo action checker soon
 # to be distributed with ncurses.
+#
+# TABSET FILES
+#
+# All the entries in this file have been edited to assume that the tabset
+# files directory is /usr/share/tabset, in conformance with the File Hierarchy
+# Standard for Linux and free BSD systems.  Some vendors (notably Sun) use
+# /usr/lib/tabset or (more recently) /usr/share/lib/tabset.  
+#
+# No curses package we know of uses these files.  If their location is an
+# issue, you will have to hand-patch the file locations before compiling
+# this file.
 # 
 # REQUEST FOR CONTACT INFORMATION AND HISTORICAL MATERIAL:
 #
 # As the ANSI/ECMA-48 standard and variants take firmer hold, and as
 # character-cell terminals are increasingly replaced by X displays, much of
 # this file is becoming a historical document (this is part of the reason for
-# the new organization, which puts ANSI types, xterm, and vt100 up front in
-# confidence that this will catch 95% of new hardware).
+# the new organization, which puts ANSI types, xterm, free-Unix consoles,
+# and vt100 up front in confidence that this will catch 95% of new hardware).
 #
 # For the terminal types still alive, I'd like to have manufacturer's
 # contact data (Internet address and/or snail-mail + phone).
@@ -209,8 +222,8 @@
 # I'm especially interested in identifying the obscure entries listed under
 # `Miscellaneous obsolete terminals, manufacturers unknown' before the tribal
 # wisdom about them gets lost.  If you know a lot about obscure old terminals,
-# please go to the terminfo resource page, grab the file ufo.ti, and eyeball
-# it for things you can identify. 
+# please go to the terminfo resource page, grab the UFO file (ufo.ti), and 
+# eyeball it for things you can identify and describe. 
 #
 # If you have been around long enough to contribute, please read the file
 # with this in mind and send me your annotations.
@@ -234,6 +247,7 @@
 # If you claim you own it, you will merely succeed in looking like a fool. 
 # Use it as you like.  Use it at your own risk.  Copy and redistribute freely.
 # There are no guarantees anywhere.  Svaha!
+#
 
 ######## STANDARD AND SPECIAL TYPES
 #
@@ -276,7 +290,7 @@ glasstty|classic glass tty interpreting ASCII control characters,
 # will work with any Intel console, they all seem to have inherited \E[11m
 # from the ANSI.SYS de-facto standard.
 klone+acs|alternate character set for ansi.sys displays, 
-	acsc=`\004a\261f\370g\361h\260j\331k\277l\332m\300n\305o~q\304r\362s_t\303u\264v\301w\302x\263y\371z\372{\373|\374}\375~\376.\031-\030\054\021+^P0\333p\304r\304y\363z\362{\343|\330}\234, 
+	acsc=`\004a\261f\370g\361h\260j\331k\277l\332m\300n\305o~q\304r\362s_t\303u\264v\301w\302x\263y\371z\372{\373|\374}\375~\376.\031-\030\,\021+^P0\333p\304r\304y\363z\362{\343|\330}\234, 
 	rmacs=\E[10m, smacs=\E[11m, 
 
 # Highlight controls corresponding to the ANSI.SYS standard.  Most 
@@ -301,6 +315,12 @@ klone+sgr-dumb|attribute control for ansi.sys displays (no ESC [ 11 m),
 	sgr0=\E[0;10m, smacs=\E[12m, smso=\E[7m, smul=\E[4m, 
 	use=klone+acs, 
 
+# KOI8 (RFC1489) alternate character set 
+# From: Qing Long <qinglong@Bolizm.ihep.su>, 24 Feb 1996.
+klone+koi8acs|alternate character set for ansi.sys displays with KOI8 charset, 
+	acsc=l\202m\204k\203j\205u\207t\206v\210w\211q\200x\201n\212o\213s\214p\216r\217`\004a\237f\234g\232~\225.\037-\036+\020\,\021h\222I\2200\215y\230z\231{\267}L|\274, 
+	rmacs=\E[10m, smacs=\E[11m, 
+
 # ANSI.SYS color control.  The setb/setf caps depend on the coincidence
 # between SVr4/XPG4's color numbers and ANSI.SYS attributes.  Here are longer
 # but equivalent strings that don't rely on that coincidence:
@@ -351,13 +371,51 @@ ansi-mini|any ansi terminal with pessimistic assumptions,
 	cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, el=\E[K, home=\E[H, 
 	ht=^I, 
 
+# ANSI X3.64 from emory!mlhhh (Hugh Hansard) via BRL
+#
+# The following is an entry for the full ANSI 3.64 (1977).  It lacks
+# padding, but most terminals using the standard are "fast" enough
+# not to require any -- even at 9600 bps.  If you encounter problems,
+# try including the padding specifications.
+#
+# Note: the "as" and "ae" specifications are not implemented here, for
+# the available termcap documentation does not make clear WHICH alternate
+# character set to specify.  ANSI 3.64 seems to make allowances for several.
+# Please make the appropriate adjustments to fit your needs -- that is
+# if you will be using alternate character sets.
+#
+# There are very few terminals running the full ANSI 3.64 standard,
+# so I could only test this entry on one verified terminal (Visual 102).
+# I would appreciate the results on other terminals sent to me.
+#
+# Please report comments, changes, and problems to:
+#
+# U.S. MAIL:   Hugh Hansard
+#              Box: 22830
+#              Emory University
+#              Atlanta, GA. 30322.
+#
+# USENET {akgua,msdc,sb1,sb6,gatech}!emory!mlhhh.
+#
+ansi77|ansi 3.64 standard 1977 version, 
+	am, mir, 
+	cols#80, it#8, lines#24, 
+	bel=^G, clear=\E[;H\E[2J, cr=^M, csr=\E[%i%p1%d;%p2%dr, 
+	cub1=^H, cud1=\E[B, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, 
+	cuu1=\E[A, dch1=\E[P, dl1=\E[M$<5*/>, ed=\E[J, el=\E[K, 
+	home=\E[H, ht=^I, il1=\E[L$<5*/>, ind=\ED, kbs=^H, 
+	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\EOP, 
+	kf2=\EOR, kf4=\EOS, khome=\E[H, nel=^M\ED, ri=\EM, 
+	rmir=\E[4l, rmso=\E[m, rmul=\E[m, smir=\E[4h, smso=\E[7m, 
+	smul=\E[4m, 
+
 # Procomm and some other ANSI emulations don't recognize all of the ANSI-
 # standard capabilities.  This entry deletes <cuu>, <cuf>, <cud>, <cub>, and 
 # <vpa>/<hpa> capabilities, forcing curses to use repetitions of <cuu1>, 
 # <cuf1>, <cud1> and <cub1>.  Also deleted <ich> and <ich1>, as QModem up to 
 # 5.03 doesn't recognize these.  Finally, we delete <rep> and <ri>, which seem
 # to confuse many emulators.  On the other hand, we can count on these programs
-# doing <rmacs>/<smacs>/<sgr>.  # Older versions of this entry featured 
+# doing <rmacs>/<smacs>/<sgr>. Older versions of this entry featured 
 # <invis=\E[9m>, but <invis=\E[8m> now seems to be more common under
 # ANSI.SYS influence.
 # From: Eric S. Raymond <esr@snark.thyrsus.com> Oct 30 1995
@@ -462,6 +520,16 @@ nansi.sysk|nansisysk|PC-DOS Public Domain NANSI.SYS with keypad redefined for vi
 	is2=U4 PC-DOS Public Domain NANSI.SYS with keypad redefined for vi 9-29-86\n\E[;75;8p, 
 	use=ansi.sysk, 
 
+# From: Federico Bianchi <bianchi@magna.cisid.unipi.it>, 15 Jan 1997
+ansi-nt|psx_ansi|Windows NT POSIX console, 
+	am, bw, msgr, 
+	cols#80, it#8, lines#25, 
+	bel=^G, clear=\E[2J, cr=^M, cub1=^H, cud1=^J, cuf1=\E[C, 
+	cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, ed=\E[J, el=\E[K, 
+	home=\E[H, ht=^I, ind=\E[S, kbs=^H, kcub1=\E[D, kcud1=\E[V, 
+	kcuf1=\E[C, kcuu1=\E[A, nel=\r\E[S, rc=\E[u, rev=\E[7m, 
+	ri=\E[T, rmso=\E[m, sc=\E[s, sgr0=\E[0m, smso=\E[7m, 
+
 #### ANSI console types
 #
 
@@ -514,8 +582,8 @@ linux|linux console,
 	kf2=\E[[B, kf20=\E[34~, kf3=\E[[C, kf4=\E[[D, kf5=\E[[E, 
 	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, 
 	khome=\E[1~, kich1=\E[2~, knp=\E[6~, kpp=\E[5~, kspd=^Z, 
-	nel=^M^J, rc=\E8, rev=\E[7m, ri=\EM, rmir=\E[4l, rmul=\E[24m, 
-	rs1=\Ec, sc=\E7, 
+	nel=^M^J, rc=\E8, rev=\E[7m, ri=\EM, rmir=\E[4l, rmso=\E[27m, 
+	rmul=\E[24m, rs1=\Ec, sc=\E7, 
 	sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;11%;m, 
 	smir=\E[4h, smul=\E[4m, tbc=\E[3g, u6=\E[%i%d;%dR, 
 	u7=\E[6n, u8=\E[?6c, u9=\E[c, vpa=\E[%i%p1%dd, 
@@ -539,8 +607,9 @@ linux-nic|linux with ich/ich1 suppressed for non-curses programs,
 	ich@, ich1@, 
 	use=linux, 
 
-linux-old|linux console with hardwired screen size, 
-	cols#80, lines#25, use=linux, 
+# This assumes you have used setfont(8) to load one of the Linux koi8-r fonts.
+linux-koi8|linux with koi8 alternate character set, 
+	use=linux, use=klone+koi8acs, 
 
 # SCO console and SOS-Syscons console for 386bsd
 # (scoansi: had unknown capabilities
@@ -709,6 +778,10 @@ iris-ansi|iris-ansi-net|IRIS emulating ANSI terminal,
 	rev=\E[7m, ri=\EM, rmam=\E[?7l, rmso=\E[m, rmul=\E[m, sc=\E7, 
 	sgr0=\E[m, smam=\E[?7h, smso=\E[1;7m, smul=\E[4m, 
 	tbc=\E[3g, 
+iris-ansi-ap|IRIS ANSI in application-keypad mode, 
+	is2=\E[?1l\E>\E[?7h, kf10=\E[010q, kf11=\E[011q, 
+	kf12=\E[012q, rmkx=\E>, smkx=\E=, 
+	use=iris-ansi, 
 
 # The following is a version of the ibm-pc entry distributed with PC/IX,
 # (Interactive Systems' System 3 for the Big Blue), modified by Richard
@@ -754,9 +827,9 @@ ibmpcx|xenix|ibmx|IBM PC xenix console display,
 # right corner without triggering a scroll.  The ncurses terminfo library can
 # handle this case with the <ich1> capability, and prefers <am> for better
 # optimization.  Bug: The <op> capability resets attributes.
-# From: Michael Hunter <mphunter@qnx.com> 25 Aug 1995
+# From: Michael Hunter <mphunter@qnx.com> 30 Jul 1996
 qnx|qnx4|qnx console, 
-	am, daisy, km, mir, msgr, xhpa, xt, 
+	daisy, km, mir, msgr, xhpa, xt, 
 	colors#8, cols#80, it#4, lines#25, ncv#3, pairs#8, 
 	acsc=l\332m\300k\277j\331q\304x\263u\264t\303n\305v\301w\302O\333a\261o\337s\334, 
 	bel=^G, blink=\E{, bold=\E<, civis=\Ey0, clear=\EH\EJ, 
@@ -805,10 +878,11 @@ qnx|qnx4|qnx console,
 	krpl=\377\362, krst=\377\352, ksav=\377\361, 
 	kslt=\377\247, kspd=\377\335, ktbc=\377\344, 
 	kund=\377\365, mvpa=\E!%p1%02d, op=\ER, 
-	rep=\Eg%p2%' '%+%c%p1%c, rev=\E(, ri=\EI, rmcup=\ER, 
-	rmso=\E), rmul=\E], rs1=\ER, scp=\E@%p1%02d, 
+	rep=\Eg%p2%' '%+%c%p1%c, rev=\E(, ri=\EI, rmcup=\Eh\ER, 
+	rmso=\E), rmul=\E], rs1=\ER, setb=\E@%p1%Pb%gb%gf%d%d, 
+	setf=\E@%p1%Pf%gb%gf%d%d, 
 	sgr=%?%p1%t\E<%;%p2%t\E[%;%p3%t\E(%;%p4%t\E{%;%p6%t\E<%;, 
-	sgr0=\E}\E]\E>\E), smcup=, smso=\E(, smul=\E[, 
+	sgr0=\E}\E]\E>\E), smcup=\Ei, smso=\E(, smul=\E[, 
 
 #### NetBSD consoles
 #
@@ -827,7 +901,7 @@ qnx|qnx4|qnx console,
 pcvtXX|pcvt vt200 emulator (DEC VT220), 
 	am, km, mir, msgr, xenl, 
 	it#8, vt#3, 
-	acsc=llmmkkjjuuttvvwwqqxxnnoosspprr``aaffgg~~..--++\054\054hhII00yyzz, 
+	acsc=llmmkkjjuuttvvwwqqxxnnoosspprr``aaffgg~~..--++\,\,hhII00yyzz, 
 	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[J, cr=^M, 
 	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, 
 	cud=\E[%p1%dB, cud1=\E[B, cuf=\E[%p1%dC, cuf1=\E[C, 
@@ -900,11 +974,16 @@ x68k|x68k-ite|NetBSD/x68k ITE,
 
 #### FreeBSD console entries
 #
-# From: Andrew Chernov <ache@astral.msk.su> 29 Mar 1996
-# Andew Chernov maintains the FreeBSD termcap distributions.
+# From: Andrey Chernov <ache@astral.msk.su> 29 Mar 1996
+# Andrey Chernov maintains the FreeBSD termcap distributions.
 #
 # Note: Users of FreeBSD 2.1.0 and older versions must either upgrade
-# or comment out the <el1> capability in the console entry.
+# or comment out the :cb: capability in the console entry.
+#
+# Alexander Lukyanov reports:
+# I have seen FreeBSD-2.1.5R... The old el1 bug changed, but it is still there.
+# Now el1 clears not only to the line beginning, but also a large chunk
+# of previous line. But there is another bug - ech does not work at all.
 #
 
 # for syscons
@@ -967,7 +1046,7 @@ cons60r-m|cons60-koi8r-m|freebsd console w/koi8-r cyrillic (60-line mono),
 	lines#60, use=cons25r-m, 
 # ISO 8859-1 FreeBSD console
 cons25l1|cons25-iso8859|freebsd console w/iso 8859-1 chars, 
-	acsc=l\215m\216k\214j\213u\226t\225v\227w\230q\222x\231n\217o\220s\224p\221r\223`\201a\202f\207g\210~\237.\031-\030+\253\054\273I\247y\232z\233, 
+	acsc=l\215m\216k\214j\213u\226t\225v\227w\230q\222x\231n\217o\220s\224p\221r\223`\201a\202f\207g\210~\237.\031-\030+\253\,\273I\247y\232z\233, 
 	use=cons25w, 
 cons25l1-m|cons25-iso-m|freebsd console w/iso 8859-1 chars (mono), 
 	colors@, pairs@, 
@@ -1054,15 +1133,19 @@ ibmpc3|pc3-bold|IBM PC BSD/386 Console with bold instead of underline,
 # are kept available at ftp://gatekeeper.dec.com/pub/DEC/termcaps.
 #
 # In October 1995 DEC sold its terminals business, including the VT and Dorio
-# line and trademark, to SunRiver Data Systems.
+# line and trademark, to SunRiver Data Systems.  SunRiver has since changed
+# its name to Boundless Technologies; see http://www.boundless.com.
 #
+# (The <acsc>, <rmacs>, and <smacs> capabilities aren't in DEC's official
+# entry -- esr)
 
 vt52|dec vt52, 
 	cols#80, it#8, lines#24, 
+	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, 
 	bel=^G, clear=\EH\EJ, cr=^M, cub1=\ED, cud1=\EB, cuf1=\EC, 
 	cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, ed=\EJ, 
 	el=\EK, home=\EH, ht=^I, ind=^J, kbs=^H, kcub1=\ED, kcud1=\EB, 
-	kcuf1=\EC, kcuu1=\EA, nel=^M^J, ri=\EI, 
+	kcuf1=\EC, kcuu1=\EA, nel=^M^J, ri=\EI, rmacs=\EG, smacs=\EF, 
 
 # NOTE:  Any VT100 emulation, whether in hardware or software, almost
 # certainly includes what DEC called the `Level 1 editing extension' codes;
@@ -1091,12 +1174,29 @@ vt52|dec vt52,
 # reset upon login. Also setting the number of columns glitches 
 # the screen annoyingly. You can type "reset" to get them set.
 #
-# This is how the keypad gets assigned in Application Keypad mode.
-#	PF1 = kf1	  PF2 = kf2	    PF3   = kf3	      PF4 = kf4
-#	7   = kf9	  8   = kf10	    9     = kf0	      - 
-#	4   = kf5	  5   = kf6	    6     = kf7	      ,   = kf8
-#	1   = ka1	  2   = kb2	    3     = ka3
-#	0   = kc1	  .   = kc3	    ENTER = kent
+# Here's a diagram of the VT100 keypad keys with their bindings.
+# The top line is the name of the key (some DEC keyboards have the keys
+# labelled somewhat differently, like GOLD instead of PF1, but this is
+# the most "official" name).  The second line is the escape sequence it
+# generates in Application Keypad mode (where "$" means the ESC
+# character).  The third line contains two items, first the mapping of
+# the key in terminfo, and then in termcap.
+#   _______________________________________
+#  |   PF1   |   PF2   |   PF3   |   PF4   |
+#  |   $OP   |   $OQ   |   $OR   |   $OS   |
+#  |_kf1__k1_|_kf2__k2_|_kf3__k3_|_kf4__k4_|
+#  |    7         8         9         -    |
+#  |   $Ow   |   $Ox   |   $Oy   |   $Om   |
+#  |_kf9__k9_|_kf10_k;_|_kf0__k0_|_________|
+#  |    4    |    5    |    6    |    ,    |
+#  |   $Ot   |   $Ou   |   $Ov   |   $Ol   |
+#  |_kf5__k5_|_kf6__k6_|_kf7__k7_|_kf8__k8_|
+#  |    1    |    2    |    3    |         |
+#  |   $Oq   |   $Or   |   $Os   |  enter  |
+#  |_ka1__K1_|_kb2__K2_|_ka3__K3_|  $OM    |
+#  |         0         |   .     |         |
+#  |        $Op        |  $On    |         |
+#  |___kc1_______K4____|_kc3__K5_|_kent_@8_|
 #
 # And here, for those of you with orphaned VT100s lacking documentation, is
 # a description of the soft switches invoked when you do `Set Up'.
@@ -1167,7 +1267,7 @@ vt100-w-nam|vt100-nam-w|dec vt100 132 cols (w/advanced video no automargin),
 # vt100 with no advanced video.
 vt100-nav|vt100 without advanced video option, 
 	xmc#1, 
-	blink@, bold@, rev@, rmso=\E[m, rmul@, sgr@, sgr0=, smso=\E[7m, 
+	blink@, bold@, rev@, rmso=\E[m, rmul@, sgr@, sgr0@, smso=\E[7m, 
 	smul@, 
 	use=vt100, 
 vt100-nav-w|vt100-w-nav|dec vt100 132 cols 14 lines (no advanced video option), 
@@ -1234,8 +1334,8 @@ vt131|dec vt131,
 	rmam=\E[?7h, rmkx=\E[?1l\E>, rmso=\E[m$<2/>, 
 	rmul=\E[m$<2/>, 
 	rs1=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sc=\E7, 
-	sgr0=\E[m$<2/>, smkx=\E[?1h\E=, smso=\E[7m$<2/>, 
-	smul=\E[4m$<2/>, 
+	sgr0=\E[m$<2/>, smam=\E[?7h, smkx=\E[?1h\E=, 
+	smso=\E[7m$<2/>, smul=\E[4m$<2/>, 
 
 # vt132 - like vt100 but slower and has ins/del line and such.
 # I'm told that <smir>/<rmir> are backwards in the terminal from the
@@ -1258,18 +1358,19 @@ vt132|DEC vt132,
 vt220|vt200|DEC VT220 in vt100 emulation mode, 
 	am, mir, xenl, xon, 
 	cols#80, lines#24, vt#3, 
-	acsc=kkllmmjjnnwwqquuttvvxx, bel=^G, blink=\E[5m$<2>, 
-	bold=\E[1m$<2>, civis=\E[?25l, clear=\E[H\E[2J$<50>, 
-	cnorm=\E[?25h, cr=^M, csr=\E[%i%p1%d;%p2%dr, cub1=^H, 
-	cud1=\E[B, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH$<10>, 
-	cuu1=\E[A, dch1=\E[P, dl1=\E[M, ed=\E[J$<50>, el=\E[K$<3>, 
-	home=\E[H, ht=^I, if=/usr/share/tabset/vt100, il1=\E[L, 
-	ind=\ED$<20/>, is2=\E[1;24r\E[24;1H, kbs=^H, kcub1=\E[D, 
-	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[3~, 
-	kend=\E[4~, kf1=\EOP, kf10=\E[29~, kf2=\EOQ, kf3=\EOR, 
-	kf4=\EOS, kf5=\E[17~, kf6=\E[18~, kf7=\E[19~, kf8=\E[20~, 
-	kf9=\E[21~, khome=\E[1~, kich1=\E[2~, knp=\E[6~, kpp=\E[5~, 
-	rc=\E8, rev=\E[7m$<2>, rf=/usr/share/tabset/vt100, 
+	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, 
+	bel=^G, blink=\E[5m$<2>, bold=\E[1m$<2>, civis=\E[?25l, 
+	clear=\E[H\E[2J$<50>, cnorm=\E[?25h, cr=^M, 
+	csr=\E[%i%p1%d;%p2%dr, cub1=^H, cud1=\E[B, cuf1=\E[C, 
+	cup=\E[%i%p1%d;%p2%dH$<10>, cuu1=\E[A, dch1=\E[P, 
+	dl1=\E[M, ed=\E[J$<50>, el=\E[K$<3>, home=\E[H, ht=^I, 
+	if=/usr/share/tabset/vt100, il1=\E[L, ind=\ED$<20/>, 
+	is2=\E[1;24r\E[24;1H, kbs=^H, kcub1=\E[D, kcud1=\E[B, 
+	kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[3~, kend=\E[4~, kf1=\EOP, 
+	kf10=\E[29~, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\E[17~, 
+	kf6=\E[18~, kf7=\E[19~, kf8=\E[20~, kf9=\E[21~, 
+	khome=\E[1~, kich1=\E[2~, knp=\E[6~, kpp=\E[5~, rc=\E8, 
+	rev=\E[7m$<2>, rf=/usr/share/tabset/vt100, 
 	ri=\EM$<14/>, rmacs=\E(B$<4>, rmam=\E[?7l, rmir=\E[4l, 
 	rmso=\E[27m, rmul=\E[24m, 
 	rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sc=\E7, 
@@ -1411,7 +1512,7 @@ vt320-w-nam|vt300-w-nam|dec vt320 wide 7 bit terminal with no am,
 # keys were switched into application mode at the same time the numeric pad
 # is switched into application mode.  This changes the definitions of the
 # arrow keys.  Emacs v19 is smarter and mines its keys directly out of 
-# your termcap entry,
+# your termcap or terminfo entry,
 #
 # From: Daniel Glasser <dag@persoft.persoft.com>, 13 Oct 1993
 # (vt340: string capability "sb=\E[M" corrected to "sr";
@@ -1487,7 +1588,8 @@ vt400|vt400-24|dec-vt400|dec vt400 24x80 column autowrap,
 	smso=\E[7m, smul=\E[4m, tbc=\E[3g, 
 	tsl=\E[2$~\E[1$}\E[1;%dH, 
 
-# (vt420: I removed <kf0>, it collided with <kf10> -- esr)
+# (vt420: I removed <kf0>, it collided with <kf10>.  I also restored
+# a missing <sc> -- esr)
 vt420|DEC VT420, 
 	am, mir, xenl, xon, 
 	cols#80, lines#24, vt#3, 
@@ -1507,7 +1609,7 @@ vt420|DEC VT420,
 	rf=/usr/share/tabset/vt300, ri=\EM, rmacs=\E(B$<4>, 
 	rmam=\E[?7l, rmir=\E[4l, rmkx=\E>, 
 	rmsc=\E[?0;0r\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, 
-	rmso=\E[m, rmul=\E[m, rs3=\E[?67h\E[64;1"p, 
+	rmso=\E[m, rmul=\E[m, rs3=\E[?67h\E[64;1"p, sc=\E7, 
 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e\E(B%;, 
 	sgr0=\E[m$<2>, smacs=\E(0$<2>, smam=\E[?7h, smir=\E[4h, 
 	smkx=\E=, smso=\E[7m, smul=\E[4m, 
@@ -1536,7 +1638,7 @@ vt420pc|DEC VT420 w/PC keyboard,
 	kf45=\E[33;2~, kf46=\E[34;2~, kf47=\E[35;2~, 
 	kf48=\E[36;2~, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, 
 	kf8=\E[19~, kf9=\E[20~, khome=\E[H, 
-	pctrm=USR_TERM\072vt420pcdos\072, 
+	pctrm=USR_TERM\:vt420pcdos\:, 
 	pfx=\EP1;1|%?%{16}%p1%>%t%{0}%e%{21}%p1%>%t%{1}%e%{25}%p1%>%t%{2}%e%{27}%p1%>%t%{3}%e%{30}%p1%>%t%{4}%e%{5}%;%p1%+%d/%p2%s\E\\, use=vt420, 
 
 vt420pcdos|DEC VT420 w/PC for DOS Merge, 
@@ -1563,49 +1665,6 @@ vt510pc|DEC VT510 w/PC keyboard,
 vt510pcdos|DEC VT510 w/PC for DOS Merge, 
 	use=vt420pcdos, 
 
-#       
-######
-#       CDE Terminal Emulator                                              
-# 
-######
-
-#	Reconstructed via infocmp from file: /usr/share/lib/terminfo/d/dtterm
-dtterm,
-	am, mir, msgr, xenl, xon,
-	colors#8, cols#80, it#8, lines#24, lm#0, pairs#8,
-	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	batt1=f1, batt2=f1md, bel=^G, blink=\E[5m, bold=\E[1m,
-	box1=lqkxjmwuvtn, box2=lqkxjmwuvtn, civis=\E[?25l,
-	clear=\E[H\E[J, cnorm=\E[?25h, colb0=\E[40m,
-	colb1=\E[41m, colb2=\E[42m, colb3=\E[43m,
-	colb4=\E[44m, colb5=\E[45m, colb6=\E[46m,
-	colb7=\E[47m, colf0=\E[30m, colf1=\E[31m,
-	colf2=\E[32m, colf3=\E[33m, colf4=\E[34m,
-	colf5=\E[35m, colf6=\E[36m, colf7=\E[37m, cr=\r,
-	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=\b,
-	cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C,
-	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
-	dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, dl=\E[%p1%dM,
-	dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K,
-	flash=\E[?5h$<200>\E[?5l, font0=\E(B, font1=\E(0,
-	home=\E[H, ht=\t, hts=\EH, ich=\E[%p1%d@,
-	il=\E[%p1%dL, il1=\E[L, ind=\ED, invis=\E[8m,
-	is2=\E\sF\E>\E[?1l\E[?7h\E[?45l, kbs=\b, kcub1=\E[D,
-	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[3~,
-	kf1=\E[11~, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~,
-	kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, kf16=\E[29~,
-	kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, kf2=\E[12~,
-	kf20=\E[34~, kf3=\E[13~, kf4=\E[14~, kf5=\E[15~,
-	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
-	kfnd=\E[1~, khlp=\E[28~, kich1=\E[2~, knp=\E[6~,
-	kpp=\E[5~, nel=\EE, op=\E[39;49m, rc=\E8, rev=\E[7m,
-	ri=\EM, rmacs=^O, rmam=\E[?7l, rmir=\E[4l,
-	rmso=\E[22;27m, rmul=\E[24m, sc=\E7,
-	setab=\E[%p1%{40}%+%dm, setaf=\E[%p1%{30}%+%dm,
-	sgr=\E[0%?%p1%t;2;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p6%t;1%;%?%p7%t;8%;m%?%p9%t^N%e^O%;,
-	sgr0=\E[0m, smacs=^N, smam=\E[?7h, smir=\E[4h,
-	smso=\E[2;7m, smul=\E[4m, tbc=\E[3g,
-
 # VT520/VT525
 #
 # The VT520 is a monochrome text terminal capable of managing up to
@@ -1619,7 +1678,7 @@ dtterm,
 # terminal mode is being used.  If Set-Up has been disabled or
 # assigned to an unknown key, Set-Up may be entered by pressing
 # [F3] as the first key after power up, regardless of keyboard type.
-# (vt520: I added <rmam>/<smam> based on the init string -- esr)
+# (vt520: I added <rmam>/<smam> based on the init string, also <sc> -- esr)
 vt520|DEC VT520, 
 	am, mir, xenl, xon, 
 	cols#80, lines#24, vt#3, 
@@ -1640,13 +1699,13 @@ vt520|DEC VT520,
 	rc=\E8, rev=\E[7m$<2>, rf=/usr/share/tabset/vt300, 
 	ri=\EM, rmacs=\E(B$<4>, rmam=\E[?7l, rmir=\E[4l, 
 	rmsc=\E[?0;0r\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, 
-	rmso=\E[m, rmul=\E[m, rs3=\E[?67h\E[64;1"p, 
+	rmso=\E[m, rmul=\E[m, rs3=\E[?67h\E[64;1"p, sc=\E7, 
 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e\E(B%;, 
 	sgr0=\E[m$<2>, smacs=\E(0$<2>, smam=\E[?7h, smir=\E[4h, 
 	smso=\E[7m, smul=\E[4m, 
 
 # (vt525: I added <rmam>/<smam> based on the init string;
-# removed <rmso>=\E[m, <rmul>=\E[m, -- esr)
+# removed <rmso>=\E[m, <rmul>=\E[m, added <sc> -- esr)
 vt525|DEC VT525, 
 	am, mir, xenl, xon, 
 	cols#80, lines#24, vt#3, 
@@ -1667,7 +1726,7 @@ vt525|DEC VT525,
 	rc=\E8, rev=\E[7m$<2>, rf=/usr/share/tabset/vt300, 
 	ri=\EM, rmacs=\E(B$<4>, rmam=\E[?7l, rmir=\E[4l, 
 	rmsc=\E[?0;0r\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, 
-	rmso=\E[m, rmul=\E[m, rs3=\E[?67h\E[64;1"p, 
+	rmso=\E[m, rmul=\E[m, rs3=\E[?67h\E[64;1"p, sc=\E7, 
 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e\E(B%;, 
 	sgr0=\E[m$<2>, smacs=\E(0$<2>, smam=\E[?7h, smir=\E[4h, 
 	smso=\E[7m, smul=\E[4m, 
@@ -1677,9 +1736,14 @@ vt525|DEC VT525,
 
 # John Hawkinson <jhawk@MIT.EDU> tells us that the EWAN telnet for Windows
 # (the best Windows telnet as of September 1995) presents the name `dec-vt100'
-# to telnetd.  We'll guess that it's vt102-like but doesn't grok ^N/^O.
+# to telnetd.   Michael Deutschmann <ldeutsch@mail.netshop.net> informs us
+# that this works best with a stock vt100 entry.
 dec-vt100|EWAN telnet's vt100 emulation, 
-	use=vt102-nsgr, 
+	use=vt100, 
+
+# From: Adrian Garside <94ajg2@eng.cam.ac.uk>, 19 Nov 1996
+dec-vt220|DOS tnvt200 terminal emulator, 
+	am@, use=vt220, 
 
 # Zstem340 is an (IMHO) excellent VT emulator for PC's.  I recommend it to
 # anyone who needs PC VT340 emulation. (or anything below that level, for
@@ -1729,81 +1793,119 @@ x10term|vs100-x10|xterm terminal emulator (X10 window system),
 	rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m, 
 	sgr0=\E[m, smam=\E[?7h, smir=\E[4h, smkx=\E[?1h\E=, 
 	smso=\E[7m, smul=\E[4m, 
-# This entry is designed for XFree86 version 3.1.2E.
-# It is *way* more featureful than the stock X consortium entry (has <acsc>,
-# for starters -- note that this only works for some fonts, including the
-# `fixed' series).  The <kmous> key is actually the \E[M prefix returned by
-# xterm's internal mouse-tracking facility; ncurses will interpret the
-# following three bytes of mouse status information.
-# From: Eric S. Raymond <esr@snark.thyrsus.com> 14 Dec 1995
-# Updated: T.Dickey <dickey@clark.net> 12 May 1996, for XFree86 3.1.2E
-xterm-color|xterm terminal emulator (XFree86 3.1.2E and above), 
-	am, bce, km, mir, msgr, xenl, xon, 
-	cols#80, it#8, lines#65, 
-	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~..--++\054\054II00, 
+# Compatible with the R5 xterm 
+# (from the XFree86 3.2 distribution, <blink=@> removed)
+xterm-r5|xterm R5 version, 
+	am, km, msgr, xenl, 
+	cols#80, it#8, lines#24, 
 	bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=^M, 
 	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, 
 	cud=\E[%p1%dB, cud1=^J, cuf=\E[%p1%dC, cuf1=\E[C, 
 	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, 
 	dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, 
-	el=\E[K, enacs=\E(B\E)0, home=\E[H, hpa=\E[%i%p1%dj, ht=^I, 
-	ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=^J, 
-	is=\E(0,
-	is2=\E[r\E[m\E[H\E[2J\E[?7h\E[?1;3;4;6l\E[4l, kbs=^H, 
-	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kdch1=\177, 
-	kend=\EOF, kent=\EOM, kf1=\E[11~, kf10=\E[21~, kf11=\E[23~, 
-	kf12=\E[24~, kf13=\E[25~, kf14=\E[26~, kf15=\E28~, 
-	kf16=\E29~, kf17=\E[31~, kf18=\E[32~, kf19=\E33~, 
-	kf2=\E[12~, kf20=\E34~, kf3=\E[13~, kf4=\E[14~, kf5=\E[15~, 
-	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khome=\EOH, 
-	kich1=\E[2~, kmous=\E[M, knp=\E[6~, kpp=\E[5~, rc=\E8, 
-	rev=\E[7m, ri=\EM, rmacs=^O, rmam=\E[?7l, 
+	el=\E[K, home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@, 
+	il=\E[%p1%dL, il1=\E[L, ind=^J, kbs=^H, kcub1=\EOD, 
+	kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kdch1=\E[3~, 
+	kdl1=\E[31~, kel=\E[8~, kf0=\EOq, kf1=\E[11~, kf10=\E[21~, 
+	kf11=\E[23~, kf12=\E[24~, kf2=\E[12~, kf3=\E[13~, 
+	kf4=\E[14~, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, 
+	kf9=\E[20~, khome=\E[7~, kich1=\E[2~, kil1=\E[30~, 
+	knp=\E[6~, kpp=\E[5~, rc=\E8, rev=\E[7m, ri=\EM, 
+	rmkx=\E[?1l\E>, rmso=\E[m, 
+	rs1=\E>\E[1;3;4;5;6l\E[?7h\E[m\E[r\E[2J\E[H, sc=\E7, 
+	sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;m, 
+	sgr0=\E[m, smkx=\E[?1h\E=, smso=\E[7m, tbc=\E[3g, 
+# Compatible with the R6 xterm
+# (from XFree86 3.2 distribution, <acsc> and <it> added, <blink@> removed)
+xterm-r6|xterm-old|xterm X11R6 version, 
+	am, km, mir, msgr, xenl, 
+	cols#80, it#8, lines#24, 
+	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, 
+	bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=^M, 
+	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, 
+	cud=\E[%p1%dB, cud1=^J, cuf=\E[%p1%dC, cuf1=\E[C, 
+	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, 
+	dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, 
+	el=\E[K, enacs=\E)0, home=\E[H, ht=^I, il=\E[%p1%dL, 
+	il1=\E[L, ind=^J, 
+	is2=\E7\E[r\E[m\E[?7h\E[?1;3;4;6l\E[4l\E8\E>, kbs=^H, 
+	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, 
+	kdch1=\E[3~, kf1=\EOP, kf10=\E[21~, kf11=\E[23~, 
+	kf12=\E[24~, kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, 
+	kf16=\E[29~, kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, 
+	kf2=\EOQ, kf20=\E[34~, kf3=\EOR, kf4=\EOS, kf5=\E[15~, 
+	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, kfnd=\E[1~, 
+	kich1=\E[2~, knp=\E[6~, kpp=\E[5~, kslt=\E[4~, meml=\El, 
+	memu=\Em, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O, 
 	rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, rmkx=\E[?1l\E>, 
-	rmso=\E[m, rmul=\E[m, rs1=^O, 
-	rs2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l\E<, 
-	sc=\E7, sgr0=\E[m, smacs=^N, smam=\E[?7h, smcup=\E7\E[?47h, 
+	rmso=\E[m, rmul=\E[m, 
+	rs2=\E7\E[r\E[m\E[?7h\E[?1;3;4;6l\E[4l\E8\E>, sc=\E7, 
+	sgr0=\E[m, smacs=^N, smcup=\E7\E[?47h, smir=\E[4h, 
+	smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g, 
+# This is the stock xterm entry supplied with XFree86 3.2
+# The name has been changed and some aliases have been removed.
+xterm-xf86-v32|xterm terminal emulator (X Window System), 
+	am, bce, km, mir, msgr, xenl, 
+	colors#8, cols#80, it#8, lines#24, pairs#64, 
+	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, 
+	bel=^G, bold=\E[1m, civis=\E[?25l, clear=\E[H\E[2J, 
+	cnorm=\E[?25h, cr=^M, csr=\E[%i%p1%d;%p2%dr, 
+	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=^J, 
+	cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, 
+	cuu=\E[%p1%dA, cuu1=\E[A, cvvis=\E[?25h, dch=\E[%p1%dP, 
+	dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, 
+	el=\E[K, el1=\E[1K, enacs=\E(B\E)0, flash=\E[?5h\E[?5l, 
+	home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@, 
+	ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=^J, 
+	is2=\E7\E[r\E[m\E[?7h\E[?1;3;4;6l\E[4l\E8\E>, 
+	ka1=\EOw, ka3=\EOu, kb2=\EOy, kbeg=\EOE, kbs=^H, kc1=\EOq, 
+	kc3=\EOs, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, 
+	kdch1=\177, kend=\EOF, kent=\EOM, kf1=\E[11~, kf10=\E[21~, 
+	kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, kf14=\E[26~, 
+	kf15=\E[28~, kf16=\E[29~, kf17=\E[31~, kf18=\E[32~, 
+	kf19=\E[33~, kf2=\E[12~, kf20=\E[34~, kf3=\E[13~, 
+	kf4=\E[14~, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, 
+	kf9=\E[20~, kfnd=\E[1~, khome=\EOH, kich1=\E[2~, 
+	kmous=\E[M, knp=\E[6~, kpp=\E[5~, kslt=\E[4~, meml=\El, 
+	memu=\Em, op=\E[39;49m, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O, 
+	rmam=\E[?7l, rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, 
+	rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m, rs1=^O, 
+	rs2=\E7\E[r\E[m\E[?7h\E[?1;3;4;6l\E[4l\E8\E>, sc=\E7, 
+	setab=\E[4%p1%dm, setaf=\E[3%p1%dm, 
+	setb=\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m, 
+	setf=\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m, 
+	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;, 
+	sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smcup=\E7\E[?47h, 
 	smir=\E[4h, smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, 
-	tbc=\E[3k, u6=\E[%i%d;%dR, u7=\E[6n, u8=\E[?1;2c, u9=\E[c, 
-	vpa=\E[%i%p1%dd, 
-# Use this version if you have stock X consortium xterm, 
-# or an XFree86 xterm at version 3.1.2D or older.
-# Note that due to an array indexing error in the xterm code, even these
-# correct versions of <kend>/<khome> will probably fail in versions 
-# earlier than XFree86's 3.1.2C.
-xterm-x11r6|vs100-x11r6|xterm for XFree86 versions previous to 3.1.2E, 
-	bce@, 
-	colors@, pairs@, 
-	hpa@, kend=\EOe, khome=\EO\200, op@, vpa@, use=xterm-color,
+	tbc=\E[3g, vpa=\E[%i%p1%dd, 
 
-# Here's another way to choose the xterm version for your stock xterm.
-# The xterm-color choice is unabashedly biased towards up-to-date free-UNIX
-# systems (Linux, netBSD, freeBSD) running XFree86 3.1.2E or later. If you
-# have an older version of xterm, you probably want to use use xterm-x11r6
-# instead.  If you need to use x10term you'll be all too painfully aware of it.
-xterm|vs100|xterm terminal emulator (X11R6 Window System), 
-	use=xterm-x11r6, 
+# This is xterm for ncurses. It mainly adds mappings for more high-half
+# characters.  Note that these will only work for fixed-width fonts.
+# Once XFree86 3.2 is established, we'll switch this to use=xterm-xf86-v32
+xterm|vs100|xterms|xterm terminal emulator (X Window System), 
+	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~..--++\,\,II00, 
+	u6=\E[%i%d;%dR, u7=\E[6n, u8=\E[?1;2c, u9=\E[c, 
+	use=xterm-r6, 
 
 # These entries allow access to the X titlebar and icon name as a status line. 
 # Note that twm (and possibly window managers descended from it such as tvtwm, 
 # ctwm, and vtwm) track windows by icon-name; thus, you don't want to mess
 # with it.
-xterm-sl|access X title line and icon name, 
+xterm+sl|access X title line and icon name, 
 	hs, 
 	wsl#40, 
 	dsl=\E]0;\007, fsl=^G, tsl=\E]0;, 
-xterm-sl-twm|access X title line (pacify twm-descended window managers), 
+xterm+sl-twm|access X title line (pacify twm-descended window managers), 
 	hs, 
 	wsl#40, 
 	dsl=\E]2;\007, fsl=^G, tsl=\E]2;, 
 
 #
-# The following xterm varients don't depend on your base version
+# The following xterm variants don't depend on your base version
 #
 xterm-bold|xterm terminal emulator (X11R6 Window System) standout w/bold, 
 	smso=\E[1m, 
 	use=xterm, 
-xterms|vs100s|xterm terminal emulator (small screen 24x80), 
-	cols#80, lines#24, use=xterm, 
 # (kterm: this had extension capabilities ":KJ:TY=ascii:" -- esr)
 # (kterm should not invoke DEC Graphics as the alternate character set
 #  -- Kenji Rikitake)
@@ -1821,11 +1923,72 @@ xterm1|xterm terminal emulator ignoring the alternate screen buffer,
 	rmcup@, smcup@, 
 	use=xterm, 
 
-# Sigh...this ought to grok ecma+color, but it doesn't.
-# From: Thomas Dickey <dickey@clark.net> 13 Dec 1995
-rxvt|rxvt terminal emulator, 
-	kend=\EOw, khome=\E[H, kmous@, use=xterm-x11r6, 
-	use=klone+color, 
+# This describes the capabilities of color_xterm, an xterm variant from
+# before ECMA-64 color support was folded into the main-line xterm release.
+# This entry is straight from color_xterm's maintainer.
+# From: Jacob Mandelson <jlm@ugcs.caltech.edu>, 09 Nov 1996
+color_xterm|cx|cx100|color_xterm color terminal emulator for X, 
+	am, km, mir, msgr, xenl, 
+	colors#8, cols#80, it#8, lines#65, pairs#64, 
+	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, 
+	bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=^M, 
+	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, 
+	cud=\E[%p1%dB, cud1=^J, cuf=\E[%p1%dC, cuf1=\E[C, 
+	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, 
+	dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, 
+	el=\E[K, el1=\E[1K, enacs=\E(B\E)0, home=\E[H, ht=^I, 
+	ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, ind=^J, 
+	is1=\E[r\E[m\E[?7h\E[?4;6l\E[4l, ka1=\EOw, ka3=\EOy, 
+	kb2=\EOu, kbs=^H, kc1=\EOq, kc3=\EOs, kcub1=\EOD, kcud1=\EOB, 
+	kcuf1=\EOC, kcuu1=\EOA, kend=\E[8~, kent=\EOM, kf1=\E[11~, 
+	kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf2=\E[12~, 
+	kf3=\E[13~, kf4=\E[14~, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, 
+	kf8=\E[19~, kf9=\E[20~, khome=\E[7~, kich1=\E[2~, 
+	kmous=\E[M, knp=\E[6~, kpp=\E[5~, op=\E[39;49m, rc=\E8, 
+	rev=\E[7m, ri=\EM, rmacs=^O, rmam=\E[?7l, 
+	rmcup=\E>\E[?41;1r, rmir=\E[4l, rmso=\E[27m, rmul=\E[24m, 
+	rs1=\E(B\017\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l\E<, 
+	sc=\E7, setab=\E[4%p1%dm, setaf=\E[3%p1%dm, 
+	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;, 
+	sgr0=\E[m, smacs=^N, smam=\E[?7h, 
+	smcup=\E[?1;41s\E[?1;41h\E=, smir=\E[4h, smso=\E[7m, 
+	smul=\E[4m, 
+
+# From: Mark Olesen & Thomas Dickey <dickey@clark.net> 13 Jul 1996
+rxvt|reduced xterm terminal (X Window System), 
+	am, bce, km, mir, msgr, xenl, xon, 
+	colors#8, cols#80, it#8, lines#24, pairs#64, 
+	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, 
+	bel=^G, blink=\E[5m, bold=\E[1m, civis=\E[?25l, 
+	clear=\E[H\E[2J, cnorm=\E[?25h, cr=^M, 
+	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, 
+	cud=\E[%p1%dB, cud1=^J, cuf=\E[%p1%dC, cuf1=\E[C, 
+	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, 
+	cvvis=\E[?25h, dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, 
+	dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, 
+	enacs=\E(B\E)0, flash=\E[?5h\E[?5l, home=\E[H, 
+	hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@, 
+	il=\E[%p1%dL, il1=\E[L, ind=^J, is1=\E[?47l\E=\E[?1l, 
+	is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l, 
+	kDC=\E[3$, kEND=\E[8$, kHOM=\E[7$, kLFT=\E[d, kNXT=\E[6$, 
+	kPRV=\E[5$, kRIT=\E[c, ka1=\EOq, ka3=\EOs, kb2=\EOr, kbs=^H, 
+	kc1=\EOp, kc3=\EOn, kcbt=\E[Z, kcub1=\E[D, kcud1=\E[B, 
+	kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[3~, kend=\E[8~, kent=\EOM, 
+	kf0=\E[21~, kf1=\E[11~, kf10=\E[21~, kf11=\E[23~, 
+	kf12=\E[24~, kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, 
+	kf16=\E[29~, kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, 
+	kf2=\E[12~, kf20=\E[34~, kf3=\E[13~, kf4=\E[14~, 
+	kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, 
+	khome=\E[7~, kich1=\E[2~, kmous=\E[M, knp=\E[6~, kpp=\E[5~, 
+	op=\E[39m\E[49m, rc=\E8, rev=\E[7m, ri=\EM, 
+	rmacs=\E(B\E)0\017, rmcup=\E[?47l\E8, rmir=\E[4l, 
+	rmkx=\E>, rmso=\E[27m, rmul=\E[24m, 
+	rs1=\E>\E[1;3;4;5;6l\E[?7h\E[m\E[r\E[2J\E[H, 
+	rs2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l\E>, 
+	sc=\E7, setb=\E[4%p1%dm, setf=\E[3%p1%dm, sgr0=\E[m, 
+	smacs=\E(B\E)U\016, smcup=\E7\E[?47h, smir=\E[4h, 
+	smkx=\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g, 
+	vpa=\E[%i%p1%dd, 
 
 # From: David J. MacKenzie <djm@va.pubnix.com> 20 Apr 1995
 # Here's a termcap entry I've been using for xterm_color, which comes
@@ -1835,11 +1998,11 @@ rxvt|rxvt terminal emulator,
 xterm-pcolor|xterm with color used for highlights and status line, 
 	bold=\E[1m\E[43m, rev=\E[7m\E[34m, smso=\E[7m\E[31m, 
 	smul=\E[4m\E[42m, 
-	use=xterm-sl, use=xterm, 
+	use=xterm+sl, use=xterm, 
 
 # HP ships this, except for the pb#9600 which was merged in from BSD termcap.
 # (hpterm: added empty <acsc>, we have no idea what ACS chars look like --esr)
-hpterm|X-hpterm|hp X11 terminal emulator, 
+xhpterm|X-hpterm|hp X11 terminal emulator, 
 	am, da, db, mir, xhp, 
 	cols#80, lh#2, lines#24, lm#0, lw#8, nlab#8, pb#9600, xmc#0, 
 	acsc=, bel=^G, bold=\E&dB, cbt=\Ei, clear=\E&a0y0C\EJ, cr=^M, 
@@ -1910,6 +2073,42 @@ emu|emu native mode,
 	sgr0=\ES, smacs=\200, smir=\EY, smso=\ES\ET, smul=\ES\EV, 
 	tbc=\Ej, 
 
+######## MGR
+#
+# MGR is a Bell Labs window system lighter-weight than X.
+# These entries describe MGR's xterm-equivalent. 
+# They are courtesy of Vincent Broman <broman@nosc.mil> 14 Jan 1997 
+#
+
+mgr|Bellcore MGR (non X) window system terminal emulation, 
+	am, km, 
+	bel=^G, bold=\E2n, civis=\E9h, clear=^L, cnorm=\Eh, cr=^M, 
+	csr=\E%p1%d;%p2%dt, cub1=^H, cud1=\Ef, cuf1=\Er, 
+	cup=\E%p2%d;%p1%dM, cuu1=\Eu, cvvis=\E0h, 
+	dch=\E%p1%dE$<5>, dch1=\EE, dl=\E%p1%dd$<3*>, 
+	dl1=\Ed$<3>, ed=\EC, el=\Ec, hd=\E1;2f, ht=^I, hu=\E1;2u, 
+	ich=\E%p1%dA$<5>, ich1=\EA, il=\E%p1%da$<3*>, 
+	il1=\Ea$<3>, ind=^J, kbs=^H, kcub1=\E[D, kcud1=\E[B, 
+	kcuf1=\E[C, kcuu1=\E[A, nel=^M^J, rev=\E1n, rmam=\E5S, 
+	rmso=\E0n, rmul=\E0n, sgr0=\E0n, smam=\E5s, smso=\E1n, 
+	smul=\E4n, 
+mgr-sun|Mgr window with Sun keyboard, 
+	ka1=\E[214z, ka3=\E[216z, kb2=\E[218z, kc1=\E[220z, 
+	kc3=\E[222z, kcpy=\E197z, kend=\E[220z, kent=\E[250z, 
+	kf1=\E[224z, kf10=\E[233z, kf11=\E[234z, kf12=\E[235z, 
+	kf2=\E[225z, kf3=\E[226z, kf4=\E[227z, kf5=\E[228z, 
+	kf6=\E[229z, kf7=\E[230z, kf8=\E[231z, kf9=\E[232z, 
+	kfnd=\E[200z, khlp=\E[207z, khome=\E[214z, knp=\E[222z, 
+	kopn=\E[198z, kpp=\E[216z, kund=\E[195z, 
+	use=mgr, 
+mgr-linux|Mgr window with Linux keyboard, 
+	ka1=\E[H, ka3=\E[5~, kb2=\E[G, kc1=\E[Y, kc3=\E[6~, 
+	kdch1=\E[3~, kend=\E[4~, kf0=\E[[J, kf1=\E[[A, kf10=\E[21~, 
+	kf11=\E[23~, kf12=\E[24~, kf2=\E[[B, kf3=\E[[C, kf4=\E[[D, 
+	kf5=\E[[E, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, 
+	khome=\E[1~, knp=\E[6~, kpp=\E[5~, 
+	use=mgr, 
+
 ######## UNIX VIRTUAL TERMINALS AND VIRTUAL CONSOLES
 #
 
@@ -1951,23 +2150,24 @@ eterm|gnu emacs term.el terminal emulation,
 # Entries for use by the FSF's `screen' program.  The screen and
 # screen-w entries came with version 3.7.1.  The screen2 and screen3 entries
 # come from University of Wisconsin and may be older.
+# (screen: added <cnorm> on ANSI model -- esr)
 
 screen|VT 100/ANSI X3.64 virtual terminal, 
 	am, km, mir, msgr, xenl, 
 	colors#8, cols#80, it#8, lines#24, pairs#64, 
-	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~..--++\054\054hhII00, 
+	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~..--++\,\,hhII00, 
 	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, civis=\E[?25l, 
-	clear=\E[H\E[J, cr=^M, csr=\E[%i%p1%d;%p2%dr, 
-	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=^J, 
-	cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, 
-	cuu=\E[%p1%dA, cuu1=\EM, cvvis=\E[34l, dch=\E[%p1%dP, 
-	dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, 
-	enacs=\E(B\E)0, flash=\Eg, home=\E[H, ht=^I, hts=\EH, 
-	ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, ind=^J, is2=\E)0, 
-	kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, 
-	kdch1=\E[3~, kf1=\EOP, kf10=\E[21~, kf11=\E[23~, 
-	kf12=\E[24~, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\E[15~, 
-	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, 
+	clear=\E[H\E[J, cnorm=\E[?25h, cr=^M, 
+	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, 
+	cud=\E[%p1%dB, cud1=^J, cuf=\E[%p1%dC, cuf1=\E[C, 
+	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\EM, 
+	cvvis=\E[34l, dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, 
+	dl1=\E[M, ed=\E[J, el=\E[K, enacs=\E(B\E)0, flash=\Eg, 
+	home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, 
+	il1=\E[L, ind=^J, is2=\E)0, kbs=^H, kcub1=\EOD, kcud1=\EOB, 
+	kcuf1=\EOC, kcuu1=\EOA, kdch1=\E[3~, kf1=\EOP, kf10=\E[21~, 
+	kf11=\E[23~, kf12=\E[24~, kf2=\EOQ, kf3=\EOR, kf4=\EOS, 
+	kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, 
 	khome=\E[1~, kich1=\E[2~, kll=\E[4~, knp=\E[6~, kpp=\E[5~, 
 	nel=\EE, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O, rmir=\E[4l, 
 	rmkx=\E[?1l\E>, rmso=\E[23m, rmul=\E[24m, rs2=\Ec, sc=\E7, 
@@ -2026,8 +2226,8 @@ oldsun|Sun Microsystems Workstation console,
 	kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, khome=\E[H, 
 	rmso=\E[m, sgr0=\E[m, smso=\E[7m, 
 # From: Alexander Lukyanov <lav@video.yars.free.net>, 14 Nov 1995
-# lines capability later corrected by J.T. Conklin <jtc@cygnus.com>
-sun|sun1|sun2|Sun Microsystems Inc. workstation console, 
+# <lines> capability later corrected by J.T. Conklin <jtc@cygnus.com>
+sun-il|Sun Microsystems console with working insert-line, 
 	am, km, msgr, 
 	cols#80, lines#34, 
 	bel=^G, bold=\E[1m, clear=^L, cr=^M, cub1=^H, cud1=^J, 
@@ -2044,11 +2244,17 @@ sun|sun1|sun2|Sun Microsystems Inc. workstation console,
 	rmso=\E[m, rmul=\E[m, rs2=\E[s, 
 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;m, 
 	sgr0=\E[m, smso=\E[7m, smul=\E[4m, 
+# On a SparcStation 5, <il1>/<il> flake out on the last line.
+# Unfortunately, without them the terminal has no way to scroll.
+sun-ss5|Sun SparcStation 5 console, 
+	il@, il1@, use=sun-il, 
+# If you are using an SS5, change the sun definition to use sun-ss5.
+sun|sun1|sun2|Sun Microsystems Inc. workstation console, 
+	use=sun-il, 
+
 # From: <john@ucbrenoir>  Tue Sep 24 13:14:44 1985
-# (sun-s: I added lines#34 because the Lukyanov entry for sun has 35 -- esr)
 sun-s|Sun Microsystems Workstation window with status line, 
 	hs, 
-	lines#34, 
 	dsl=\E]l\E\\, fsl=\E\\, tsl=\E]l, use=sun, 
 sun-e-s|sun-s-e|Sun Microsystems Workstation with status hacked for emacs, 
 	hs, 
@@ -2071,8 +2277,8 @@ sun-e|sun-nic|sune|Sun Microsystems Workstation without insert character,
 	ich1@, rmir@, smir@, 
 	use=sun, 
 sun-c|sun-cmd|Sun Microsystems Workstation console with scrollable history, 
-	rmcup=\E[>4h, smcup=\E[>4l, 
-	use=sun, 
+	lines#35, 
+	rmcup=\E[>4h, smcup=\E[>4l, use=sun, 
 
 #### Iris consoles
 #
@@ -2080,20 +2286,21 @@ sun-c|sun-cmd|Sun Microsystems Workstation console with scrollable history,
 # (wsiris: this had extension capabilities
 #	:HS=\E7F2:HE=\E7F7:\
 #	:CT#2:CZ=*Bblack,red,green,yellow,blue,magenta,cyan,*Fwhite:
-# See the note on Iris extensions near the end of this file.
+# See the note on Iris extensions near the end of this file.  
 # Finally, removed suboptimal <clear>=\EH\EJ and added <cud1> & 
 # <flash> from BRL -- esr)
 wsiris|iris40|iris emulating a 40 line visual 50 (approximately), 
 	am, 
 	cols#80, it#8, lines#40, 
-	clear=\Ev, cnorm=\E>, cub1=^H, cud1=\EB, cuf1=\EC, 
+	bel=^G, clear=\Ev, cnorm=\E>, cub1=^H, cud1=\EB, cuf1=\EC, 
 	cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, cvvis=\E;, 
 	dim=\E7F2, dl1=\EM, ed=\EJ, el=\EK, 
 	flash=\E7F4\E7B1\013\E7F7\E7B0, home=\EH, ht=^I, il1=\EL, 
-	is2=\E7B0\E7F7\E7C2\E7R3, kcub1=\ED, kcud1=\EB, 
+	ind=^J, is2=\E7B0\E7F7\E7C2\E7R3, kcub1=\ED, kcud1=\EB, 
 	kcuf1=\EC, kcuu1=\EA, kf0=\E0, kf1=\E1, kf2=\E2, kf3=\E3, 
 	kf4=\E4, kf5=\E5, kf6=\E6, kf7=\E7, kf8=\E8, kf9=\E9, ri=\EI, 
-	rmso=\E0@, rmul=\E7R3\E0@, smso=\E9P, smul=\E7R2\E9P, 
+	rmso=\E0@, rmul=\E7R3\E0@, sgr0=\E7F7, smso=\E9P, 
+	smul=\E7R2\E9P, 
 
 #### NeWS consoles
 #
@@ -2154,10 +2361,44 @@ nextshell|NeXT Shell application,
 	bel=^G, cr=^M, cub1=^H, cud1=^J, ht=^I, kbs=^H, kcub1=^H, 
 	kcud1=^J, nel=^M^J, 
 
+### Common Desktop Environment
+#
+
+# This ships with Sun's CDE in Solaris 2.5
+dtterm|CDE desktop terminal, 
+	am, mir, msgr, xenl, xon, 
+	colors#8, cols#80, it#8, lines#24, lm#0, pairs#64, 
+	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, 
+	bel=^G, blink=\E[5m, bold=\E[1m, civis=\E[?25l, 
+	clear=\E[H\E[J, cnorm=\E[?25h, cr=^M, 
+	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, 
+	cud=\E[%p1%dB, cud1=^J, cuf=\E[%p1%dC, cuf1=\E[C, 
+	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, 
+	dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, dl=\E[%p1%dM, 
+	dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, 
+	flash=\E[?5h$<200>\E[?5l, home=\E[H, ht=^I, hts=\EH, 
+	ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, ind=\ED, 
+	invis=\E[8m, is2=\E F\E>\E[?1l\E[?7h\E[?45l, kbs=^H, 
+	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, 
+	kdch1=\E[3~, kf1=\E[11~, kf10=\E[21~, kf11=\E[23~, 
+	kf12=\E[24~, kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, 
+	kf16=\E[29~, kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, 
+	kf2=\E[12~, kf20=\E[34~, kf3=\E[13~, kf4=\E[14~, 
+	kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, 
+	kfnd=\E[1~, khlp=\E[28~, kich1=\E[2~, knp=\E[6~, kpp=\E[5~, 
+	kslt=\E[4~, nel=\EE, op=\E[39;49m, rc=\E8, rev=\E[7m, ri=\EM, 
+	rmacs=^O, rmam=\E[?7l, rmir=\E[4l, rmso=\E[22;27m, 
+	rmul=\E[24m, sc=\E7, setab=\E[%p1%{40}%+%dm, 
+	setaf=\E[%p1%{30}%+%dm, 
+	sgr=\E[0%?%p1%t;2;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p6%t;1%;%?%p7%t;8%;m%?%p9%t\016%e\017%;, 
+	sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smir=\E[4h, 
+	smso=\E[2;7m, smul=\E[4m, tbc=\E[3g, 
+
 ######## COMMON TERMINAL TYPES
 #
 # This section describes terminal classes and maker brands that are still
 # quite common, but have proprietary command sets not blessed by ANSI.
+#
 
 #### Altos
 #
@@ -2219,26 +2460,26 @@ altos4|alt4|altos-4|altos IV,
 #	:cC=^Al\r:cD=^Am\r:cE=^An\r:cF=^Ao\r:
 # Comparison with the k* capabilities makes it obvious that the c* things are
 # shift keys.  I have renamed them to keys 32 and up accordingly.  I have
-# also masde this entry relative to adm12 in order to give it an <sgr>. The
+# also made this entry relative to adm12 in order to give it an <sgr>. The
 # <invis> imported by use=adm+sgr may work, let me know. -- esr)
 altos7|alt7|altos VII, 
 	am, mir, 
 	cols#80, lines#24, xmc#0, 
-	acsc=l2m1k3j5t4u9v=w0q\072x6n8, blink=\EG2, bold=\EGt, 
+	acsc=l2m1k3j5t4u9v=w0q\:x6n8, blink=\EG2, bold=\EGt, 
 	clear=\E+^^, cr=^M, cub1=^H, cud1=^J, cuf1=^L, 
 	cup=\E=%p1%{32}%+%c%p2%{32}%+%c, cuu1=^K, dch1=\EW, 
 	dim=\EGp, dl=\ER, ed=\EY, el=\ET, home=^^, ht=^I, il1=\EE, 
 	ind=^J, invis=\EG1, 
-	is2=\E`\072\Ee(\EO\Ee6\Ec41\E~4\Ec21\Eu\E~2, 
-	kDL=^Am\r, kEOL=^An\r, kbs=^H, kcbt=^AK\r, kclr=^AL\r, 
-	kcub1=^H, kcud1=^J, kcuf1=^L, kcuu1=^K, kdch1=^AM\r, 
-	kel=^AN\r, kf0=^AI\r, kf1=^A@\r, kf2=^AA\r, kf3=^AB\r, 
-	kf32=^A`\r, kf33=^Aa\r, kf34=^Ab\r, kf35=^Ac\r, kf36=^Ad\r, 
-	kf37=^Ae\r, kf38=^Af\r, kf39=^Ag\r, kf4=^AC\r, kf40=^Ah\r, 
-	kf41=^Ai\r, kf42=^Aj\r, kf43=^Ak\r, kf5=^AD\r, kf6=^AE\r, 
-	kf7=^AF\r, kf8=^AG\r, kf9=^AH\r, khome=^^, kil1=^AJ\r, 
-	kind=^AO\r, knp=\EK, kpp=\EJ, mc4=\EJ, mc5=\Ed#, nel=^M^J, 
-	ri=\Ej, rmir=\Er, smir=\Eq, 
+	is2=\E`\:\Ee(\EO\Ee6\Ec41\E~4\Ec21\Eu\E~2, kDL=^Am\r, 
+	kEOL=^An\r, kbs=^H, kcbt=^AK\r, kclr=^AL\r, kcub1=^H, 
+	kcud1=^J, kcuf1=^L, kcuu1=^K, kdch1=^AM\r, kel=^AN\r, 
+	kf0=^AI\r, kf1=^A@\r, kf2=^AA\r, kf3=^AB\r, kf32=^A`\r, 
+	kf33=^Aa\r, kf34=^Ab\r, kf35=^Ac\r, kf36=^Ad\r, kf37=^Ae\r, 
+	kf38=^Af\r, kf39=^Ag\r, kf4=^AC\r, kf40=^Ah\r, kf41=^Ai\r, 
+	kf42=^Aj\r, kf43=^Ak\r, kf5=^AD\r, kf6=^AE\r, kf7=^AF\r, 
+	kf8=^AG\r, kf9=^AH\r, khome=^^, kil1=^AJ\r, kind=^AO\r, 
+	knp=\EK, kpp=\EJ, mc4=\EJ, mc5=\Ed#, nel=^M^J, ri=\Ej, 
+	rmir=\Er, smir=\Eq, 
 	use=adm+sgr, 
 altos7pc|alt7pc|altos PC VII, 
 	kend=\ET, use=altos7, 
@@ -2274,7 +2515,7 @@ hp+pfk-cr|hp function keys w/o CR,
 	kf1=\Ep, kf2=\Eq, kf3=\Er, kf4=\Es, kf5=\Et, kf6=\Eu, kf7=\Ev, 
 	kf8=\Ew, 
 
-# The 2621s use the same keys for the arrows and function keys, 
+# The hp2621s use the same keys for the arrows and function keys, 
 # but not separate escape sequences. These definitions allow the 
 # user to use those keys as arrow keys rather than as function 
 # keys.
@@ -2299,15 +2540,15 @@ hp262x|HP 262x terminals,
 	sgr=\E&d%'@'%?%p1%t%'B'%|%;%?%p2%t%'D'%|%;%?%p3%t%'B'%|%;%?%p4%t%'A'%|%;%c, 
 	sgr0=\E&d@, smkx=\E&s1A, smso=\E&dB, smul=\E&dD, 
 
-# Note: no <home> on HP's since that homes to top of memory, not screen.
+# Note: no <home> on HPs since that homes to top of memory, not screen.
 # Due to severe 2621 braindamage, the only way to get the arrow keys to
 # transmit anything at all is to turn on the function key labels
 # with <smkx>, and even then the user has to hold down shift!
 # The default 2621 turns off the labels except when it has to to 
 # enable the function keys. If your installation prefers labels 
 # on all the time, or off all the time (at the "expense" of the 
-# function keys) move the # 2621-nl or 2621-wl labels to the 
-# front using reorder.
+# function keys), use 2621-nl or 2621-wl.
+# 
 # Note: there are newer ROMs for 2621's that allow you to set 
 # strap A so the regular arrow keys xmit \EA, etc, as with the 
 # 2645. However, even with this strap set, the terminal stops 
@@ -2315,9 +2556,9 @@ hp262x|HP 262x terminals,
 # Since there is no way to set/unset the strap with an escape 
 # sequence, we don't use it in the default.
 # If you like, you can use 2621-ba (brain-damaged arrow keys).
-hp2621-ba|2621-ba|2621 w/new rom and strap A set, 
-	rmkx@, smkx@, 
-	use=hp+arrows, use=hp2621, 
+hp2621-ba|2621 w/new rom and strap A set, 
+	rmkx@, smkx@, use=hp+arrows, 
+	use=hp2621, 
 
 # hp2621 with function labels. Most of the time they are off,
 # but inside vi, the function key labels appear. You have to
@@ -2325,7 +2566,7 @@ hp2621-ba|2621-ba|2621 w/new rom and strap A set,
 hp2621|hp2621a|hp2621A|2621|2621a|2621A|hp2621-wl|2621-wl|hp 2621 w/labels, 
 	is2=\E&jA\r, rmkx=\E&jA, 
 	use=hp2621-fl, 
-hp2621-fl|2621-fl|hp 2621, 
+hp2621-fl|hp 2621, 
 	xhp@, xon, 
 	pb#19200, 
 	cbt=\Ei, cup=\E&a%p2%dc%p1%dY, dch1=\EP$<2>, ht=\011$<2>, 
@@ -2333,15 +2574,15 @@ hp2621-fl|2621-fl|hp 2621,
 	sgr0=\E&d@, smkx=\E&jB, smso=\E&dD, smul=\E&dD, 
 	use=hp+pfk+cr, use=hpgeneric, 
 
-# To use 2621p printer, setenv TERM=2621p, PRINTER=2612p
-hp2621p|2621p|2621P|hp 2621 with printer, 
+# To use hp2621p printer, setenv TERM=2621p, PRINTER=2612p
+hp2621p|hp 2621 with printer, 
 	mc4=\E&p13C, mc5=\E&p11C, use=hp2621, 
 
-hp2621p-a|2621p-a|hp2621p with fn as arrows, 
+hp2621p-a|hp2621p with fn as arrows, 
 	use=hp+pfk+arrows, use=hp2621p, 
 
 # hp2621 with k45 keyboard
-hp2621-k45|hp2621k45|2621k45|k45|hp 2621 with 45 keyboard, 
+hp2621-k45|hp2621k45|k45|hp 2621 with 45 keyboard, 
 	kbs=^H, kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA, 
 	khome=\Eh, rmkx=\E&s0A, smkx=\E&s1A, 
 	use=hp2621, 
@@ -2390,7 +2631,7 @@ hp2621-nt|hp 2621 w/no tabs,
 # for 9600.
 #
 # (hp2624: replaced NUL sequences in flash with mandatory pauses -- esr)
-hp2624|hp2624a|hp2624b|hp2624b-4p|2624-4p|2624|2624a|2624b|Hewlett Packard 2624 B, 
+hp2624|hp2624a|hp2624b|hp2624b-4p|Hewlett Packard 2624 B, 
 	da, db, 
 	lm#96, 
 	flash=\E&w13F$<66/>\E&w12F$<66/>\E&w13F$<66/>\E&w12F, use=hp+labels, use=scrhp, 
@@ -2412,7 +2653,7 @@ hp2624|hp2624a|hp2624b|hp2624b-4p|2624-4p|2624|2624a|2624b|Hewlett Packard 2624
 # 
 # The padding probably should be changed.
 #
-hp2626|hp2626a|hp2626p|2626|2626a|2626p|2626A|2626P|hp 2626, 
+hp2626|hp2626a|hp2626p|hp 2626, 
 	da, db, 
 	lm#0, pb#19200, 
 	ed=\ED\EJ$<500>\EC, indn=\E&r%p1%dD, ip=$<4>, 
@@ -2430,7 +2671,7 @@ hp2626|hp2626a|hp2626p|2626|2626a|2626p|2626A|2626P|hp 2626,
 # Note that this clears the tabs so it must be done by tset before
 # it sets the tabs.
 #
-hp2626-s|2626-s|hp 2626 using only 23 lines, 
+hp2626-s|hp 2626 using only 23 lines, 
 	eslok, hs, 
 	lines#23, 
 	fsl=\E&d@\E&w7f2p1I\E&w4f1I, 
@@ -2438,16 +2679,16 @@ hp2626-s|2626-s|hp 2626 using only 23 lines,
 	tsl=\E&w7f2p2I\E&w4f2I\r\EK\E&a%p1%dC, 
 	use=hp2626, 
 # Force terminal back to 24 lines after being 23.
-hp2626-ns|2626-ns|hp 2626 using all 24 lines, 
+hp2626-ns|hp 2626 using all 24 lines, 
 	is1=\E&q3t0{0H \E&w0f118n1I \E&w0f1n2I \E&w2f1i0d0u23l0S \E&w3f2I \E&w7f2p1I \r, use=hp2626, 
 # Various entries useful for small windows on 2626.
-hp2626-12|2626-12|hewlett-packard 2626 12 lines, 
+hp2626-12|hewlett-packard 2626 12 lines, 
 	lines#12, use=hp2626, 
-hp2626-12x40|2626-12x40|hewlett-packard 2626 12 lines 40 columns, 
+hp2626-12x40|hewlett-packard 2626 12 lines 40 columns, 
 	cols#40, lines#12, use=hp2626, 
-hp2626-x40|2626-x40|hewlett-packard 2626 40 columns, 
+hp2626-x40|hewlett-packard 2626 40 columns, 
 	cols#40, use=hp2626, 
-hp2626-12-s|2626-12-s|hewlett-packard 2626 11 lines plus status, 
+hp2626-12-s|hewlett-packard 2626 11 lines plus status, 
 	lines#11, use=hp2626-s, 
 
 #
@@ -2459,7 +2700,7 @@ hp2627a-rev|hp 2627 with reverse video colors,
 	kbs=^H, kcub1=^H, kcud1=^J, nel=^M^J, rmul=\E&v0S\E&d@, 
 	smul=\E&dD\E&v1S, 
 	use=hp2621-nl, 
-hp2627a|2627|hp 2627 color terminal with no labels, 
+hp2627a|hp 2627 color terminal with no labels, 
 	cr=^M, cud1=^J, ht=^I, ind=^J, 
 	is2=\E&v0m1a1b0c1i0a1b1c2i1a0b0c0i0S\E&j@\r\E3\r, 
 	kbs=^H, kcub1=^H, kcud1=^J, nel=^M^J, rmso=\E&v0S, 
@@ -2471,15 +2712,27 @@ hp2627c|hp 2627 color (cyan) terminal with no labels,
 	kbs=^H, kcub1=^H, kcud1=^J, nel=^M^J, 
 	use=hp2627a, 
 
-# 2640a doesn't have the Y cursor addressing feature, and C is 
+# hp2640a doesn't have the Y cursor addressing feature, and C is 
 # memory relative instead of screen relative, as we need.
 #
-hp2640a|2640a|hp 2640a, 
+hp2640a|hp 2640a, 
 	cup@, rmkx@, smkx@, use=hp2645, 
 
 hp2640b|hp2644a|hp 264x series, 
 	rmkx@, smkx@, use=hp2645, 
 
+# (hp2641a: removed unknown :gu: -- esr)
+hp2641a|hp2645a|hp2647a|HP 264?A series BRL entry, 
+	am, da, db, mir, xhp, 
+	cols#80, lines#24, 
+	bel=^G, clear=\EH\EJ, cr=^M, cub1=^H, cud1=^J, cuf1=\EC, 
+	cup=\E&a%p2%2dc%p1%2dY, cuu1=\EA, dch1=\EP, dl1=\EM, 
+	ed=\EJ, el=\EK, hpa=\E&a%p1%2dC, ht=^I, 
+	if=/usr/share/tabset/std, il1=\EL, ind=^J, 
+	is2=\EE$<500/>, kbs=^H, kcub1=^H, kcud1=^J, nel=^M^J, 
+	rmir=\ER, rmso=\E&d@, smir=\EQ, smso=\E&dB, 
+	vpa=\E&a%p1%2dY, 
+
 # This terminal should be used at 4800 baud or less. It needs padding for
 # plain characters at 9600, I guessed at an appropriate cr delay.  It really
 # wants ^E/^F handshaking, but that doesn't work well even if you write
@@ -2495,7 +2748,7 @@ hp2645|hp45|HP 2645 series,
 	sgr0=\E&d@, smkx=\E&s1A, smul=\E&dD, 
 	use=hpgeneric, 
 # You should use this terminal at 4800 baud or less.
-hp2648|hp2648a|2648a|2648A|2648|HP 2648a graphics terminal, 
+hp2648|hp2648a|HP 2648a graphics terminal, 
 	clear=\EH\EJ$<50>, cup=\E&a%p2%dc%p1%dY$<20>, 
 	dch1=\EP$<7>, ip=$<5>, 
 	use=hp2645, 
@@ -2506,7 +2759,7 @@ hp2648|hp2648a|2648a|2648A|2648|HP 2648a graphics terminal,
 hp150|hewlett packard Model 150, 
 	use=hp2622, 
 
-# Hp 2382a terminals, "the little ones." They don't have any 
+# HP 2382a terminals, "the little ones." They don't have any 
 # alternate character set support and sending out ^N/^O will 
 # leave the screen blank.
 hp2382a|hp2382|hewlett packard 2382a, 
@@ -2519,7 +2772,7 @@ hp2382a|hp2382|hewlett packard 2382a,
 	sgr0=\E&d@, smacs@, 
 	use=hp+labels, use=scrhp, 
 
-hp2621-a|hp2621a-a|2621-a|hp2621 with fn as arrows, 
+hp2621-a|hp2621a-a|hp2621 with fn as arrows, 
 	use=hp+pfk+arrows, use=hp2621-fl, 
 
 # newer hewlett packard terminals
@@ -2534,7 +2787,7 @@ newhpkeyboard|generic entry for HP extended keyboard,
 newhp|generic entry for new hewlett packard terminals, 
 	am, bw, mir, xhp, xon, 
 	cols#80, lines#24, pb#4800, 
-	acsc=T1R!U2S"W3O#V4P$t5u6w7v8\072'9(LQKWlRkT5I3@2[MAJSmFjGdHQ;Y+Z*X\0724>q\\\054x.n/, 
+	acsc=T1R!U2S"W3O#V4P$t5u6w7v8\:'9(LQKWlRkT5I3@2[MAJSmFjGdHQ;Y+Z*X\:4>q\,x.n/, 
 	bel=^G, blink=\E&dA, bold=\E&dF, cbt=\Ei, cr=^M, cub1=^H, 
 	cud1=^J, cuf1=\EC, cuu1=\EA, dch1=\EP$<2>, dim=\E&dH, 
 	dl1=\EM, ed=\EJ, el=\EK, ht=\011$<2>, hts=\E1, il1=\EL, ind=^J, 
@@ -2562,8 +2815,10 @@ scrhp|screen relative addressing for new HP ttys,
 	home=\E&a0y0C, hpa=\E&a%p1%dC, ll=\E&a0y0C\EA, 
 	mrcup=\E&a%p1%dr%p2%dC, vpa=\E&a%p1%dY, use=newhp, 
 
+# (hp+labels: added label values from a BRL termcap -- esr)
 hp+labels|"standard" label info for new HP ttys, 
 	lh#2, lw#8, nlab#8, 
+	lf0=f1, lf1=f2, lf2=f3, lf3=f4, lf4=f5, lf5=f6, lf6=f7, lf7=f8, 
 	pln=\E&f2a%p1%dk%p2%l%Pa%?%ga%t%ga%d%e1%;d0L%?%ga%!%t %;%p2%s, 
 	rmln=\E&j@, smln=\E&jB, 
 
@@ -2575,7 +2830,7 @@ hp+printer|"standard" printer info for HP ttys,
 # new 262x series of machines. It has dip-switched options. 
 # The firmware has a bug in it such that if you give it a null 
 # length label, the following character is eaten!
-hp2621b|2621b|hp 2621b with old style keyboard, 
+hp2621b|hp 2621b with old style keyboard, 
 	lh#1, lm#48, lw#8, nlab#8, 
 	kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA, khome=\Eh, 
 	kind=\ET, kll=\EF, kri=\ES, 
@@ -2583,15 +2838,15 @@ hp2621b|2621b|hp 2621b with old style keyboard,
 	smln=\E&jB, 
 	use=hp2621, 
 
-hp2621b-p|2621b-p|hp 2621b with printer, 
+hp2621b-p|hp 2621b with printer, 
 	use=hp+printer, use=hp2621b, 
 
 # hp2621b - new 2621b with new extended keyboard
 # these are closer to the new 26xx series than the other 2621b
-hp2621b-kx|2621b-kx|hp 2621b with extended keyboard, 
+hp2621b-kx|hp 2621b with extended keyboard, 
 	use=newhpkeyboard, use=hp2621b, 
 
-hp2621b-kx-p|2621b-kx-p|hp 2621b with new keyboard & printer, 
+hp2621b-kx-p|hp 2621b with new keyboard & printer, 
 	use=hp+printer, use=hp2621b-kx, 
 
 # Some assumptions are made in the following entries.
@@ -2607,20 +2862,20 @@ hp2621b-kx-p|2621b-kx-p|hp 2621b with new keyboard & printer,
 # 
 # Hp 2622a & hp2623a display and graphics terminals
 #
-hp2622|hp2622a|2622|2622a|hp 2622, 
+hp2622|hp2622a|hp 2622, 
 	da, db, 
 	lm#0, pb#19200, 
 	is2=\E&dj@\r, use=hp+pfk+cr, use=hp+labels, use=scrhp, 
 
 # The 2623 is a 2622 with extra graphics hardware.
-hp2623|hp2623a|2623|2623a|hp 2623, 
+hp2623|hp2623a|hp 2623, 
 	use=hp2622, 
 
 hp2624b-p|hp2624b-4p-p|hewlett packard 2624 B with printer, 
 	use=hp+printer, use=hp2624, 
 
 # The hewlett packard B can have an optional extra 6 pages of memory.
-hp2624-10p|hp2624a-10p|hp2624b-10p|2624-10p|2624a-10p|2624b-10p|hewlett packard 2624 B w/ 10 pages of memory, 
+hp2624-10p|hp2624a-10p|hp2624b-10p|hewlett packard 2624 B w/ 10 pages of memory, 
 	lm#240, use=hp2624, 
 
 hp2624b-10p-p|hewlett packard 2624 B w/ extra memory & printer, 
@@ -2635,7 +2890,7 @@ hp+color|hp with colors,
 	op=\E&v0S, scp=\E&v%p1%dS, 
 
 # <is2> sets the screen to be 80 columns wide
-hp2397a|2397a|hp2397|2397|hewlett packard 2397A color terminal, 
+hp2397a|hp2397|hewlett packard 2397A color terminal, 
 	is2=\E&w6f80X, 
 	use=memhp, use=hp+labels, use=hp+color, 
 
@@ -2672,12 +2927,13 @@ hpansi|hp700|hewlett packard 700/44 in HP-PCterm mode,
 	smsc=\E[>11h\EPO**x0/65;1/67\E\\$<250>, smso=\E[7m, 
 	smul=\E[4m, xoffc=g, xonc=e, 
 #
-hp2392|2392|2393|239x series, 
+# (hp2392: copied <rmir> here from hpex -- esr)
+hp2392|239x series, 
 	cols#80, 
 	cbt=\Ei, cup=\E&a%p1%dy%p2%dC, kf1=\Ep\r, kf2=\Eq\r, 
 	kf3=\Er\r, kf4=\Es\r, kf5=\Et\r, kf6=\Eu\r, kf7=\Ev\r, 
 	kf8=\Ew\r, khome=\Eh, kind=\EU, knp=\Eu, kpp=\Ev, kri=\EV, 
-	rmul=\E&d@, smir=\EQ, smul=\E&dD, vpa=\E&a%p1%dY, 
+	rmir=\ER, rmul=\E&d@, smir=\EQ, smul=\E&dD, vpa=\E&a%p1%dY, 
 	use=hpsub, 
 
 hpsub|hp terminals -- capability subset, 
@@ -2687,24 +2943,47 @@ hpsub|hp terminals -- capability subset,
 	cuu1=\EA, dch1=\EP, dl1=\EM, ed=\EJ, el=\EK, hpa=\E&a%p1%dC, 
 	ht=^I, if=/usr/share/tabset/stdcrt, il1=\EL, ind=^J, 
 	is2=\E&s1A\E<\E&k0\\, kbs=^H, kcub1=\ED, kcud1=\EB, 
-	kcuf1=\EC, kcuu1=\EA, khome=\Eh, rmir=\ER, rmkx=\E&s0A, 
-	rmso=\E&d@, sgr0=\E&d@, smkx=\E&s1A, smso=\E&dB, 
+	kcuf1=\EC, kcuu1=\EA, khome=\Eh, rmkx=\E&s0A, rmso=\E&d@, 
+	sgr0=\E&d@, smkx=\E&s1A, smso=\E&dB, 
 
 # hpex:
 #	May be used for most 24 x 80 hp terminals,
 # but has no padding added, so may allow runover in some terminals at high 
-# baud rates.  Will not work for 2640a or 2640b terminals, 98x6 and 98x5
-# terminal emulators or 98x6 consoles.  
+# baud rates.  Will not work for hp2640a or hp2640b terminals, hp98x6 and 
+# hp98x5 terminal emulators or hp98x6 consoles.  
 # 	Adds xy-cursor addressing, vertical cursor addressing, home, 
 # last line, and underline capabilities.
 #
-# (hpex: removed memory-lock capabilities ":ml=\El:mu=\Em:" -- esr)
+# (hpex: removed memory-lock capabilities ":ml=\El:mu=\Em:",
+# moved <rmir> here from hpsub -- esr)
 hpex|hp extended capabilites, 
 	cr=^M, cud1=^J, cup=\E&a%p1%dy%p2%dC, ht=^I, ind=^J, kbs=^H, 
-	kcub1=^H, kcud1=^J, nel=^M^J, rmul=\E&d@, smir=\EQ, 
+	kcub1=^H, kcud1=^J, nel=^M^J, rmir=\ER, rmul=\E&d@, smir=\EQ, 
 	smul=\E&dD, vpa=\E&a%p1%dY, 
 	use=hpsub, 
 
+# From: Ville Sulko <Ville.Sulko@bip.atk.tpo.fi>, 05 Aug 1996
+hp2|hpex2|hewlett-packard extended capabilities newer version, 
+	am, da, db, mir, xhp, 
+	cols#80, lh#2, lines#24, lm#0, lw#8, nlab#8, xmc#0, 
+	bel=^G, clear=\E&a0y0C\EJ, cr=^M, cub1=^H, cud1=\EB, 
+	cuf1=\EC, cup=\E&a%p1%dy%p2%dC, cuu1=\EA, dch1=\EP, 
+	dl1=\EM, ed=\EJ, el=\EK, hpa=\E&a%p1%dC, ht=^I, hts=\E1, 
+	il1=\EL, ind=^J, kbs=^H, kclr=\EJ, kctab=\E2, kcub1=\ED, 
+	kcud1=\EB, kcuf1=\EC, kcuu1=\EA, kdch1=\EP, kdl1=\EM, 
+	ked=\EJ, kel=\EK, kf1=\Ep, kf2=\Eq, kf3=\Er, kf4=\Es, kf5=\Et, 
+	kf6=\Eu, kf7=\Ev, kf8=\Ew, khome=\Eh, khts=\E1, kich1=\EQ, 
+	kil1=\EL, kind=\ES, kll=\EF, knp=\EU, kpp=\EV, kri=\ET, 
+	krmir=\ER, ktbc=\E3, meml=\El, memu=\Em, 
+	pfkey=\E&f%p1%dk%p2%l%dL%p2%s, 
+	pfloc=\E&f1a%p1%dk%p2%l%dL%p2%s, 
+	pfx=\E&f2a%p1%dk%p2%l%dL%p2%s, 
+	pln=\E&f%p1%dk%p2%l%dd0L%p2%s, rmir=\ER, rmkx=\E&s0A, 
+	rmln=\E&j@, rmso=\E&d@, rmul=\E&d@, 
+	sgr=\E&d%?%p7%t%'s'%c%;%p1%p3%|%p6%|%{2}%*%p2%{4}%*%+%p4%+%p5%{8}%*%+%'@'%+%c%?%p9%t%'\016'%c%e%'\017'%c%;, 
+	sgr0=\E&d@, smir=\EQ, smkx=\E&s1A, smln=\E&jB, smso=\E&dB, 
+	smul=\E&dD, tbc=\E3, vpa=\E&a%p1%dY, 
+
 # HP 236 console
 # From: <ddavis@ic.berkeley.edu>
 hp236|hp236 internal terminal emulator, 
@@ -2741,6 +3020,15 @@ hp9837|hp98720|hp98721|HP 9000/300 workstations,
 	kpp=\EV, rmir=\ER, rmkx=\E&s0A, rmso=\E&v0S, rmul=\E&d@, 
 	sgr0=\E&d@, smir=\EQ, smkx=\E&s1A, smso=\E&v5S, smul=\E&dD, 
 	tbc=\E3, vpa=\E&a%p1%dY, 
+# HP 9845 desktop computer from BRL
+# (hp9845: removed unknown capability :gu: -- esr)
+hp9845|HP 9845, 
+	am, da, db, eo, mir, xhp, 
+	cols#80, lines#21, 
+	clear=\EH\EJ, cuf1=\EC, cup=\E&a%p2%2dc%p1%2dY, cuu1=\EA, 
+	dch1=\EP, dl1=\EM, ed=\EJ, el=\EK, 
+	if=/usr/share/tabset/std, il1=\EL, rmir=\ER, rmso=\E&d@, 
+	smir=\EQ, smso=\E&dB, 
 # From: Charles A. Finnell of MITRE <finnell@mitre.org>, developed 07SEP90
 # (hp98550: replaced /usr/share/tabset/9837 with std because <it#8>,<hts=\E1>;
 # added empty <acsc> to avoid warnings re <smacs>/<rmacs> --esr)
@@ -2777,7 +3065,7 @@ hp700-wy|HP700/41 emulating wyse30,
 	sgr0=\EG0$<10/>, smir=\Eq, smso=\EG4$<10/>, 
 	smul=\EG8$<10/>, tbc=\E0, vpa=\E[%p1%{32}%+%c, 
 # (hp70092: added empty <acsc> to avoid warnings re <smacs>/<rmacs> --esr)
-hp70092|70092a|70092A|hp70092a|hp70092A|HP 700/92, 
+hp70092|hp70092a|hp70092A|HP 700/92, 
 	am, da, db, xhp, 
 	cols#80, lh#2, lines#24, lm#0, lw#8, nlab#8, 
 	acsc=, bel=^G, blink=\E&dA, bold=\E&dB, cbt=\Ei, 
@@ -2889,22 +3177,22 @@ adm3|lsi adm3,
 # Open the case and look at the motherboard; if you see an open 24-pin DIP
 # socket, you may be out of luck.
 #
-# (adm3a: removed obsolete ":ma=^K^P:" -- esr)
+# (adm3a: some capabilities merged in from BRl entry -- esr)
 adm3a|lsi adm3a, 
 	am, 
 	cols#80, lines#24, 
-	bel=^G, clear=\032$<1>, cr=^M, cub1=^H, cud1=^J, cuf1=^L, 
+	bel=^G, clear=\032$<1/>, cr=^M, cub1=^H, cud1=^J, cuf1=^L, 
 	cup=\E=%p1%{32}%+%c%p2%{32}%+%c, cuu1=^K, home=^^, 
-	ind=^J, 
+	ind=^J, kcub1=^H, kcud1=^J, kcuf1=^L, kcuu1=^K, rs1=^N, 
 adm3a+|adm3a plus, 
-	kcub1=^H, kcud1=^J, kcuf1=^L, kcuu1=^K, use=adm3a, 
+	kbs=^H, use=adm3a, 
 # (adm5: removed obsolete ":ma=^Hh^Jj^Kk^Ll^^H:" & duplicate ":do=^J:" -- esr)
 adm5|lsi adm5, 
 	xmc#1, 
 	bel=^G, cr=^M, cud1=^J, ed=\EY, el=\ET, kbs=^H, khome=^^, 
 	rmso=\EG, smso=\EG, 
 	use=adm3a+, 
-# A lot of terminals other than adm12s use these.  Wherever you see
+# A lot of terminals other than adm11s use these.  Wherever you see
 # use=adm+sgr with some of its capabilities disabled, try the
 # disabled ones.  They may well work but not have been documented or
 # expressed in the using entry.  We'd like to cook up an <sgr> but the
@@ -2932,17 +3220,18 @@ adm11|LSI ADM-11,
 # Corrected by Olaf Siebert <rhialto@polder.ubc.kun.nl>, 11 May 1995
 # (adm12: removed obsolete ":kn:ma=j^Jk^P^K^Pl ^R^L^L :".  This formerly had
 # <is2>=\Eq but that looked wrong; this <is2> is from Dave Yost <esquire!yost>
-# -- esr)
+# via BRL.  That entry asserted <xmc#1>, but I've left that out because 
+# neither earlier nor later ADMSs have it -- esr)
 adm12|lsi adm12, 
 	am, mir, 
-	cols#80, lines#24, 
+	cols#80, it#8, lines#24, 
 	bel=^G, clear=^Z, cr=^M, cub1=^H, cud1=^J, cuf1=^L, 
 	cup=\E=%p1%{32}%+%c%p2%{32}%+%c, cuu1=^K, dch1=\EW, 
-	dl1=\ER, ed=\EY, el=\ET, home=^^, il1=\EE, 
+	dl1=\ER, ed=\EY, el=\ET, home=^^, hts=\E1, ich1=\EQ, il1=\EE, 
 	is2=\E0        \E1        \E1        \E1        \E1        \E1        \E1        \E1        \E1, 
 	kcub1=^H, kcud1=^J, kcuf1=^L, kcuu1=^K, kf0=^A0\r, kf1=^A1\r, 
 	kf2=^A2\r, kf3=^A3\r, kf4=^A4\r, kf5=^A5\r, kf6=^A6\r, 
-	kf7=^A7\r, kf8=^A8\r, kf9=^A9\r, rmir=\Er, smir=\Eq, 
+	kf7=^A7\r, kf8=^A8\r, kf9=^A9\r, rmir=\Er, smir=\Eq, tbc=\E0, 
 	use=adm+sgr, 
 # (adm20: removed obsolete ":kn#7:" -- esr)
 adm20|lear siegler adm20, 
@@ -3109,7 +3398,7 @@ adm22|lsi adm22,
 #       OFF disables Polling Option - Factory Setting
 #
 #
-# On some older ADM 31s, S4 does not exist, and S5-sw6 is not defined.
+# On some older adm31s, S4 does not exist, and S5-sw6 is not defined.
 #
 # This adm31 entry uses underline as the standout mode.
 # If the adm31 gives you trouble with standout mode, check the DIP switch in
@@ -3128,21 +3417,10 @@ adm31|lsi adm31 with sw6 set for underline mode,
 	rmul=\EG0, sgr0=\EG0, smir=\Eq, smso=\EG1, smul=\EG1, 
 adm31-old|o31|old adm31, 
 	rmul@, smso=\EG4, smul@, use=adm31, 
-# ADM36 in native mode (not VT52 emulation mode)
-# Hmmm...this looks a lot like an incomplete and slightly botched description
-# of a vt100 emulator.  Might be worth trying vt100 on this type and seeing
-# if it flies.  Assuming there are any of these left alive... 
-# (adm36: I added <rmam>/<smam> based on the initialization string;
-# also added <sgr0>=\E[m -- esr)
-adm36|lsi adm36, 
-	am, mir, 
-	cols#80, lines#24, 
-	clear=\E[H\E[2J, cub1=^H, cuf1=\E[D, 
-	cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dl1=\E[1M, ed=\E[0J, 
-	el=\E[0K, il1=\E[1L$<100>, 
-	is2=\E[6;?7h\E[4;20;?1;?3;?6;?4l\E(B\E)B\E>, 
-	kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\E[A, rmam=\E[?7l, 
-	rmir=\E[4l, sgr0=\E[m, smam=\E[?7h, smir=\E[4h, 
+# LSI ADM-36 from Col. George L. Sicherman <gloria!colonel> via BRL
+adm36|LSI ADM36, 
+	if=/usr/lib/tabset/vt100, 
+	is2=\E<\E>\E[6;?2;?7;?8h\E[4;20;?1;?3;?4;?5;?6;?18;?19l, use=vt100, 
 # (adm42: removed obsolete ":ma=^K^P:" -- esr)
 adm42|lsi adm42, 
 	am, 
@@ -3195,8 +3473,8 @@ pt100|pt200|wren|fenix|prime pt100/pt200,
 	dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, dl=\E[M, ed=\E[J\E[r, 
 	el=\E[K\E[t, flash=\E$$<200/>\E$P, home=\E$B, ht=^I, 
 	il1=\E[L\E[t, ind=^J, kbs=^H, kcub1=\E[D, kcud1=\E[B, 
-	kcuf1=\E[C, kcuu1=\E[A, khome=\E$A, nel=^M^J, rmir=\E[4l, 
-	rmkx=\E[>13l, rmso=\E[m, rmul=\E[m, sgr0=\E[m, 
+	kcuf1=\E[C, kcuu1=\E[A, khome=\E$A, nel=^M^J, rmcup=, 
+	rmir=\E[4l, rmkx=\E[>13l, rmso=\E[m, rmul=\E[m, sgr0=\E[m, 
 	smcup=\E[>1l\E[>2l\E[>16l\E[4l\E[>9l\E[20l\E[>3l\E[>7h\E[>12l\E[1Q, 
 	smir=\E[4h, smkx=\E[>13h, smso=\E[2;7m, smul=\E[4m, 
 pt100w|pt200w|wrenw|fenixw|prime pt100/pt200 in 132-column mode, 
@@ -3338,8 +3616,8 @@ qvt203-25-w|QVT 203 PLUS with 25 by 132 columns,
 #
 #
 # There are some tvi terminals that require incredible amounts of padding and
-# some that don't.  I'm assuming 912 and 920 are the old slow ones,
-# and 912b, 912c, 920b, 920c are the new ones that don't need padding.
+# some that don't.  I'm assuming tvi912 and tvi920 are the old slow ones, and
+# tvi912b, tvi912c, tvi920b, tvi920c are the new ones that don't need padding.
 #
 # All of these terminals (912 to 970 and the tvipt) are discontinued.  Newer
 # Televideo terminals are ANSI and PC-ANSI compatible.
@@ -3470,43 +3748,43 @@ tvi910|televideo model 910,
 # S2  9  DCD status (pin 8)  (U = disconnected, D = connected)
 # S2 10  DTR status (pin 20) (U = disconnected, D = connected)
 #
-tvi910+|910+|televideo 910+, 
+tvi910+|televideo 910+, 
 	dch1=\EW, dl1=\ER$<33*>, home=^^, ich1=\EQ, il1=\EE$<33*>, 
 	kf0=^A@\r, kf1=^AA\r, kf2=^AB\r, kf3=^AC\r, kf4=^AD\r, 
 	kf5=^AE\r, kf6=^AF\r, kf7=^AG\r, kf8=^AH\r, kf9=^AI\r, 
-	ll=\E=7 , 
+	ll=\E=7\s, 
 	use=tvi910, 
 
-# (tvi912: removed obsolete ":ma=^K^P^L :" -- esr)
+# (tvi912: removed obsolete ":ma=^K^P^L :", added  <flash> and
+# <khome> from BRL entry -- esr)
 tvi912|tvi914|tvi920|old televideo 912/914/920, 
-	am, 
+	am, msgr, 
 	cols#80, it#8, lines#24, xmc#1, 
 	bel=^G, clear=^Z, cr=^M, cub1=^H, cud1=^J, cuf1=^L, 
 	cup=\E=%p1%{32}%+%c%p2%{32}%+%c, cuu1=^K, dch1=\EW, 
-	dl1=\ER$<33*>, ed=\Ey, el=\ET, home=^^, ht=^I, hts=\E1, 
-	ich1=\EQ, if=/usr/share/tabset/stdcrt, il1=\EE$<33*>, 
-	ind=^J, kbs=^H, kcub1=^H, kcud1=^J, kcuf1=^L, kcuu1=^K, 
-	kf0=^AI\r, kf1=^A@\r, kf2=^AA\r, kf3=^AB\r, kf4=^AC\r, 
-	kf5=^AD\r, kf6=^AE\r, kf7=^AF\r, kf8=^AG\r, kf9=^AH\r, 
-	rmso=\Ek, rmul=\Em, smso=\Ej, smul=\El, tbc=\E3, 
+	dl1=\ER$<33*>, ed=\Ey, el=\ET, flash=\Eb$<50/>\Ed, home=^^, 
+	ht=^I, hts=\E1, ich1=\EQ, if=/usr/share/tabset/stdcrt, 
+	il1=\EE$<33*>, ind=^J, kbs=^H, kcub1=^H, kcud1=^J, kcuf1=^L, 
+	kcuu1=^K, kf0=^AI\r, kf1=^A@\r, kf2=^AA\r, kf3=^AB\r, 
+	kf4=^AC\r, kf5=^AD\r, kf6=^AE\r, kf7=^AF\r, kf8=^AG\r, 
+	kf9=^AH\r, khome=^^, rmso=\Ek, rmul=\Em, smso=\Ej, smul=\El, 
+	tbc=\E3, 
 # 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.
 # Terminfo makes you use the funct key on the 912 but the real keys on the 920.
-tvi912c|tvi912b|912c|912b|tvi|new televideo 912, 
-	dl1=\ER$<5*>, il1=\EE$<5*>, 
-	use=tvi912, 
+tvi912c|tvi912b|new televideo 912, 
+	dl1=\ER$<5*>, il1=\EE$<5*>, use=tvi912, 
 # set to page 1 when entering curses application (\E-17 )
 # reset to page 0 when exiting curses application (\E-07 )
-tvi912-2p|tvi920-2p|912-2p|920-2p|tvi-2p|televideo w/2 pages, 
-	rmcup=\E-07 , smcup=\E-17 , 
-	use=tvi912, 
+tvi912-2p|tvi920-2p|tvi-2p|televideo w/2 pages, 
+	rmcup=\E-07\s, smcup=\E-17\s, use=tvi912, 
 # We got some new tvi912c terminals that act really weird on the regular 
 # termcap, so one of our gurus worked this up. Seems that cursor 
 # addressing is broken.
 tvi912cc|tvi912 at cowell college, 
 	cup@, use=tvi912c, 
 
-# Here are the switch settings for the TVI 920c:
+# Here are the switch settings for the tvi920c:
 #
 # S1 (Line), and S3 (Printer) baud rates -- put one, and only one, switch down:
 # 2: 9600	3: 4800		4: 2400		5: 1200
@@ -3760,7 +4038,7 @@ tvi924|televideo tvi924,
 # --------------------------------------------
 #
 # (tvi925: BSD has <clear=\E*>.  I got <is2> and <ri> from there -- esr)
-tvi925|925|televideo 925, 
+tvi925|televideo 925, 
 	am, bw, hs, ul, 
 	cols#80, lines#24, xmc#1, 
 	bel=^G, cbt=\EI, clear=^Z, cnorm=\E.4, cr=^M, cub1=^H, cud1=^V, 
@@ -3774,6 +4052,11 @@ tvi925|925|televideo 925,
 	kf9=^AH\r, khome=^^, kich1=\EQ, kil1=\EE, ri=\Ej, tbc=\E3, 
 	tsl=\Eh\Ef, 
 	use=adm+sgr, 
+# TeleVideo 925 from Mitch Bradley <sun!wmb> via BRL
+# to avoid "magic cookie" standout glitch:
+tvi925-hi|TeleVideo Model 925 with half intensity standout mode, 
+	xmc@, 
+	kbs=^H, kcub1=^H, kcud1=^J, rmso=\E(, smso=\E), use=tvi925, 
 
 # From: Todd Litwin <litwin@litwin.jpl.nasa.gov> 28 May 1993
 # Originally Tim Curry, Univ. of Central Fla., <duke!ucf-cs!tim> 5/21/82
@@ -3872,7 +4155,7 @@ tvi925|925|televideo 925,
 # I also inserted <ich1> and <kich1>; the :ko: string indicated that <ich> 
 # should be present and all tvi native modes use the same string for this.
 # Finally, note that BSD has cud1=^V. -- esr) 
-tvi950|950|televideo 950, 
+tvi950|televideo 950, 
 	am, hs, mir, msgr, xenl, xon, 
 	cols#80, it#8, lines#24, xmc#1, 
 	acsc=d\rc\014e\nb\011i\013, bel=^G, cbt=\EI, clear=\E*, 
@@ -3902,9 +4185,10 @@ tvi950|950|televideo 950,
 #	set duplex (send) edit keys (\El) when entering vi
 #	set local (no send) edit keys (\Ek) when exiting vi
 #
-tvi950-2p|950-2p|televideo950 w/2 pages, 
+tvi950-2p|televideo950 w/2 pages, 
 	is2=\EDF\EC\Ed\EG0\Eg\Er\EO\E'\E(\E%\Ew\EX\Ee \017\011\Ek\E016\E004\Ex0\200\200\Ex1\200\200\Ex2\200\200\011\Ex3\200\200\Ex4\r\200\E\\2\E-07 \011, 
-	rmcup=\E\\2\E-07 , rmkx=\Ek, smcup=\E\\1\E-07 , smkx=\El, 
+	rmcup=\E\\2\E-07\s, rmkx=\Ek, smcup=\E\\1\E-07\s, 
+	smkx=\El, 
 	use=tvi950, 
 #
 # is for 950 with four pages adds the following:
@@ -3916,9 +4200,10 @@ tvi950-2p|950-2p|televideo950 w/2 pages,
 #	when exiting ex, reset 96 line page (\E\\3)
 #			 place cursor at 0,24,1 (\E-07 )
 #
-tvi950-4p|950-4p|televideo950 w/4 pages, 
+tvi950-4p|televideo950 w/4 pages, 
 	is2=\EDF\EC\Ed\EG0\Eg\Er\EO\E'\E(\E%\Ew\EX\Ee \017\011\Ek\E016\E004\Ex0\200\200\Ex1\200\200\Ex2\200\200\011\Ex3\200\200\Ex4\r\200\E\\3\E-07 \011, 
-	rmcup=\E\\3\E-07 , rmkx=\Ek, smcup=\E\\1\E-07 , smkx=\El, 
+	rmcup=\E\\3\E-07\s, rmkx=\Ek, smcup=\E\\1\E-07\s, 
+	smkx=\El, 
 	use=tvi950, 
 #
 # <is2> for reverse video 950 changes the following:
@@ -3926,22 +4211,24 @@ tvi950-4p|950-4p|televideo950 w/4 pages,
 #
 # set vb accordingly (\Ed ...delay... \Eb)
 #
-tvi950-rv|950-rv|televideo950 rev video, 
+tvi950-rv|televideo950 rev video, 
 	flash=\Ed$<200/>\Eb, 
 	is2=\EDF\EC\Eb\EG0\Eg\Er\EO\E'\E(\E%\Ew\EX\Ee \017\011\El\E016\E004\Ex0\200\200\Ex1\200\200\Ex2\200\200\011\Ex3\200\200\Ex4\r\200, use=tvi950, 
 
 # tvi950-rv-2p uses the appropriate entries from 950-2p and 950-rv
-tvi950-rv-2p|950-rv-2p|televideo950 rev video w/2 pages, 
+tvi950-rv-2p|televideo950 rev video w/2 pages, 
 	flash=\Ed$<200/>\Eb, 
-	is2=\EDF\EC\Eb\EG0\Eg\Er\EO\E'\E(\E%\Ew\EX\Ee \017\011\Ek\E016\E004\Ex0\200\200\Ex1\200\200\Ex2\200\200\011\Ex3\200\200\Ex4\r\200\E\\2\E-07 , 
-	rmcup=\E\\2\E-07 , rmkx=\Ek, smcup=\E\\1\E-07 , smkx=\El, 
+	is2=\EDF\EC\Eb\EG0\Eg\Er\EO\E'\E(\E%\Ew\EX\Ee \017\011\Ek\E016\E004\Ex0\200\200\Ex1\200\200\Ex2\200\200\011\Ex3\200\200\Ex4\r\200\E\\2\E-07\s, 
+	rmcup=\E\\2\E-07\s, rmkx=\Ek, smcup=\E\\1\E-07\s, 
+	smkx=\El, 
 	use=tvi950, 
 
 # tvi950-rv uses the appropriate entries from 950-4p and 950-rv
-tvi950-rv-4p|950-rv-4p|televideo950 rev video w/4 pages, 
+tvi950-rv-4p|televideo950 rev video w/4 pages, 
 	flash=\Ed$<200/>\Eb, 
-	is2=\EDF\EC\Eb\EG0\Er\EO\E'\E(\E%\Ew\EX\Ee \017\011\Ek\E016\E004\Ex0\200\200\Ex1\200\200\Ex2\200\200\011\Ex3\200\200\Ex4\r\200\E\\3\E-07 , 
-	rmcup=\E\\3\E-07 , rmkx=\Ek, smcup=\E\\1\E-07 , smkx=\El, 
+	is2=\EDF\EC\Eb\EG0\Er\EO\E'\E(\E%\Ew\EX\Ee \017\011\Ek\E016\E004\Ex0\200\200\Ex1\200\200\Ex2\200\200\011\Ex3\200\200\Ex4\r\200\E\\3\E-07\s, 
+	rmcup=\E\\3\E-07\s, rmkx=\Ek, smcup=\E\\1\E-07\s, 
+	smkx=\El, 
 	use=tvi950, 
 # From: Andreas Stolcke <stolcke@icsi.berkeley.edu>
 # (tvi955: removed obsolete ":ma:=^Vj^Kk^Hh^Ll^^H";
@@ -3975,35 +4262,87 @@ tvi955-hb|955-hb|televideo955 half-bright,
 	use=tvi955, 
 # From: Humberto Appleton <beto@cs.utexas.edu>, 880521 UT Austin
 # (tvi970: removed ":sg#0:"; removed <rmso>=\E[m, <rmul>=\E[m;
-# also added empty <acsc> to suppress tic warning -- esr)
+# added <am>/<csr>/<home>/<hpa>/<vpa>/<smcup>/<rmcup> from BRL.
+# According to BRL we could have <rmkx>=\E>, <smkx>=\E= but I'm not sure what
+# it does to the function keys.  I deduced <rmam>/<smam>.
+# also added empty <acsc> to suppress tic warning,  -- esr)
 tvi970|televideo 970, 
-	da, db, mir, msgr, 
+	am, da, db, mir, msgr, 
 	cols#80, it#8, lines#24, 
-	acsc=, cbt=\E[Z, clear=\E[H\E[2J, cub1=^H, cud1=\ED, 
-	cuf1=\E[C, cup=\E[%i%p1%d;%p2%df, cuu1=\EM, cvvis=\E[1Q, 
-	dch1=\E[P, dl1=\E[M, dsl=\Eg\Ef\r, ed=\E[0J, el=\E[0K, 
-	flash=\E[5;m$<200/>\E[0;m, ht=^I, il1=\E[L, 
+	acsc=, cbt=\E[Z, clear=\E[H\E[2J, csr=\E[%i%p1%d;%p2%dr, 
+	cub1=^H, cud1=\ED, cuf1=\E[C, cup=\E[%i%p1%d;%p2%df, 
+	cuu1=\EM, cvvis=\E[1Q, dch1=\E[P, dl1=\E[M, dsl=\Eg\Ef\r, 
+	ed=\E[J, el=\E[K, flash=\E[5m$<200/>\E[m, home=\E[H, 
+	hpa=\E[%i%p1%dG, ht=^I, il1=\E[L, 
 	is2=\E<\E[?21l\E[19h\E[1Q\E[10l\E[7l\E[H\E[2J, 
 	kbs=^H, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, 
 	kf1=\E?a, kf2=\E?b, kf3=\E?c, kf4=\E?d, kf5=\E?e, kf6=\E?f, 
 	kf7=\E?g, kf8=\E?h, kf9=\E?i, khome=\E[H, ri=\EM, rmacs=\E(B, 
-	rmir=\E[4l, rmso=\E[m, rmul=\E[m, sgr0=\E[m, smacs=\E(B, 
-	smir=\E[4h, smso=\E[7m, smul=\E[4m, 
+	rmam=\E[?7h, rmcup=, rmir=\E[4l, rmso=\E[m, rmul=\E[m, 
+	sgr0=\E[m, smacs=\E(B, smam=\E[?7l, 
+	smcup=\E[?20l\E[?7h\E[1Q, smir=\E[4h, smso=\E[7m, 
+	smul=\E[4m, vpa=\E[%i%p1%dd, 
+tvi970-vb|televideo 970 with visual bell, 
+	flash=\E[?5h\200\200\200\200\200\200\200\200\200\200\200\200\200\E[?5l, use=tvi970, 
+tvi970-2p|televideo 970 with using 2 pages of memory, 
+	rmcup=\E[H\E[J\E[V, smcup=\E[U\E[?20l\E[?7h\E[1Q, 
+	use=tvi970, 
 # Works with vi and rogue.  NOTE: Esc v sets autowrap on, Esc u sets 80 chars
 # per line (rather than 40), Esc K chooses the normal character set.  Not sure
 # padding is needed, but adapted from the tvi920c termcap.  The <smso> and 
 # <smul> strings are klutzy, but at least use no screen space.
-# (tvipt: removed obsolete ":ma=^Kk^Ll^R^L:".  I wish we knew <rmam>. -- esr)
+# (tvipt: removed obsolete ":ma=^Kk^Ll^R^L:".  I wish we knew <rmam>,
+# its absence means <smam>=\Ev isn't save to use. -- esr)
 # From: Gene Rochlin <armsis@amber.berkeley.edu> 9/19/84. 
+# The <ed>/<kf0>/<kf1>/<khome>/<mc4>, and <mc5> caps are from BRL, which says:
+# F1 and F2 should be programmed as ^A and ^B; required for UNIFY.
 tvipt|televideo personal terminal, 
 	am, 
 	cols#80, lines#24, 
 	cbt=\EI, clear=^Z, cub1=^H, cuf1=^L, 
 	cup=\E=%p1%{32}%+%c%p2%{32}%+%c, cuu1=^K, dl1=\ER$<5*>, 
-	el=\ET, home=^^, if=/usr/share/tabset/stdcrt, 
+	ed=\EY, el=\ET, home=^^, if=/usr/share/tabset/stdcrt, 
 	il1=\EE$<5*>, is2=\Ev\Eu\EK, kbs=^H, kcub1=^H, kcud1=^J, 
-	kcuf1=^L, kcuu1=^K, rmso=\EF, rmul=\EF, smam=\Ev, 
-	smso=\EG1@A\EH, smul=\EG1B@\EH, 
+	kcuf1=^L, kcuu1=^K, kf0=^A, kf1=^B, khome=^^, mc4=^T, mc5=^R, 
+	rmso=\EF, rmul=\EF, smso=\EG1@A\EH, smul=\EG1B@\EH, 
+# From: Nathan Peterson <nathan@sco.com>, 03 Sep 1996
+tvi9065|televideo 9065, 
+	am, bw, chts, hs, mc5i, mir, msgr, xenl, xon, 
+	cols#80, it#8, lh#1, lines#25, lm#0, lw#9, ma#4, nlab#8, vt#0, 
+	wnum#0, wsl#30, 
+	acsc=0_'rjhkglfmeniopxjqksqtmulvown, bel=^G, 
+	blink=\EG2, bold=\EG\,, cbt=\EI, civis=\E.0, clear=^Z, 
+	cnorm=\E.3, cr=^M, csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, 
+	cub1=^H, cud=\E[%p1%dB, cud1=^V, cuf=\E[%p1%dC, cuf1=^L, 
+	cup=\E=%p1%' '%+%c%p2%' '%+%c, cuu=\E[%p1%dA, cuu1=^K, 
+	cvvis=\E.2, dch=\E[%p1%dP, dch1=\EW, dim=\EGp, 
+	dl=\E[%p1%dM, dl1=\ER, dsl=\E_30\r, ech=\E[%p1%d@, ed=\EY, 
+	el=\ET, flash=\Eb$<15>\Ed, fsl=^M, home=^^, ht=^I, hts=\E1, 
+	ich=\E[%p1%d@, if=/usr/share/tabset/stdcrt, 
+	il=\E[%p1%dL, il1=\EE, ind=^J, indn=\E[%p1%dS, invis=\EG1, 
+	ip=$<3>, 
+	is1=\E"\E%\E'\E(\EG@\EO\EX\E[=5l\E[=6l\E[=7h\Ed\Er, 
+	is2=\EF2\EG0\E\\L, is3=\E<\E[=4l\E[=8h, kHOM=\E\s\s\s, 
+	kbs=^H, kcbt=\EI, kcub1=^H, kcud1=^V, kcuf1=^L, kcuu1=^K, 
+	kdch1=\EW, kf1=^A@\r, kf10=^AI\r, kf11=^AJ\r, kf12=^AK\r, 
+	kf2=^AA\r, kf3=^AB\r, kf4=^AC\r, kf5=^AD\r, kf6=^AE\r, 
+	kf7=^AF\r, kf8=^AG\r, kf9=^AH\r, khome=^^, ll=\E[25;1H, 
+	mc0=\E[0;0i, mc4=\Ea, mc5=\E`, nel=^M^J, 
+	pfkey=\E|%p1%'0'%+%c3%p2%s\031, 
+	pfloc=\E|%p1%'0'%+%c2%p2%s\031, 
+	pfx=\E|%p1%'0'%+%c1%p2%s\031, 
+	pln=\E_%p1%'?'%+%c%p2%s\r, prot=\E&, 
+	rep=\E[%p2%db%p1%c, rev=\EG4, 
+	rf=/usr/share/tabset/stdcrt, ri=\Ej, rin=\E[%p1%dT, 
+	rmacs=\E%, rmam=\E[=7l, rmcup=\E.3\Er\E[1;25r\E[25;0H, 
+	rmdc=\200, rmir=\Er, rmln=\E[4;1v, rmso=\EG0, rmul=\EG0, 
+	rmxon=^N, rs1=\EC\EDF\E[0;0v\E[8;1v\E[=65l, 
+	rs2=\E.b\E[10;20v\E[14;1v\E[3;0v\E[7;0v\E[=11.h\E[=12.h\E[=13.h\E[=14.h\E[=15l\E[=20h\E[=60l\E[=61h\E[=9l\E[=10l\E[=21l\E[=23l\E[=3l\E_40\E_50\En\Ew\Ee \Ex0\200\200\Ex1\200\200\Ex2\200\200\Ex3\200\200\Ex4\200\200\E1, 
+	rs3=\E[=19h\E.3\E9\E0O\200\200\200\200\200\E0o\200\200\200\200\200\E0J\177\200\200\200\200, 
+	sgr=\EG0%?%p1%t\EGt%;%?%p2%t\EG8%;%?%p3%t\EG4%;%?%p4%t\EG2%;%?%p5%t\EGp%;%?%p6%t\EG\,%;%?%p7%t\EG1%;%?%p9%t\E$%e\E%%%;, 
+	sgr0=\EG0, smacs=\E$, smam=\E=7h, smcup=\E.2, smdc=\Er, 
+	smir=\Eq, smln=\E[4;2v, smso=\EGt, smul=\EG8, smxon=^O, 
+	tbc=\E3, tsl=\E[4;1v\E_30, uc=\EG8\EG0, 
 
 #### Visual (vi)
 #
@@ -4014,19 +4353,30 @@ tvipt|televideo personal terminal,
 # Or visit White Pine on the World Wide Web at URL http://www.wpine.com.
 #
 
-# vi50 is from University of Wisconsin
-# This is a provisional vi50 termcap entry.  It was copied from vi500
-# entry.  Note especially the <il1> function.  <kf4>-<kf6> are really l4-l6 in
-# disguise; <kf7>-<kf9> are really l1-l3.  No highlighting enabled at present.
+# Visual 50 from Beau Shekita, BTL-Whippany <whuxlb!ejs>
+# Recently I hacked together the following termcap for Visual
+# Technology's Visual 50 terminal. It's a slight modification of
+# the vt52 termcap. 
+# It's intended to run when the Visual 50 is in vt52 emulation mode
+# (I know what you're thinking; if it's emulating a vt52, then why
+# another termcap? Well, it turns out that the Visual 50 can handle
+# <dl1> and db(?) among other things, which the vt52 can't)
+# The termcap works OK for the most part. The only problem is on
+# character inserts. The whole line gets painfully redrawn for each
+# character typed. Any suggestions?
+# Beau's entry is combined with the vi50 entry from University of Wisconsin.
+# Note especially the <il1> function.  <kf4>-<kf6> are really l4-l6 in
+# disguise; <kf7>-<kf9> are really l1-l3.
 vi50|visual 50, 
-	am, msgr, 
+	am, da, db, msgr, 
 	cols#80, it#8, lines#24, 
-	cbt=\Ez$<4/>, clear=\Ev, cr=^M, cub1=^H, cud1=\EB, cuf1=\EC, 
-	cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, 
-	dl1=\EM$<3*/>, ed=\Ek, el=\EK$<16/>, home=\EH, ht=^I, 
+	bel=^G, cbt=\Ez$<4/>, clear=\EH\EJ, cr=^M, cub1=^H, cud1=\EB, 
+	cuf1=\EC, cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, 
+	dl1=\EM$<3*/>, ed=\EJ, el=\EK$<16/>, home=\EH, ht=^I, 
 	il1=\EL, ind=^J, kbs=^H, kcub1=\ED, kcud1=\EB, kcuf1=\EC, 
 	kcuu1=\EA, kf1=\EP, kf2=\EQ, kf3=\ER, kf4=\EV, kf5=\EE, 
 	kf6=\E], kf7=\EL, kf8=\Ev, kf9=\EM, khome=\EH, nel=^M^J, 
+	ri=\EI, rmso=\ET, rmul=\EW, smso=\EU, smul=\ES, 
 # this one was BSD & SCO's vi50
 vi50adm|visual 50 in adm3a mode, 
 	am, msgr, 
@@ -4047,30 +4397,36 @@ vi55|Visual 55,
 	kcud1=\EB, kcuf1=\EC, kcuu1=\EA, ri=\EI, rmir=\Eb, rmso=\ET, 
 	smir=\Ea, smso=\EU, 
 
-# The Visual 200 beeps when you type a character in insert mode.
-# This is a horribly obnoxious misfeature, and some of the entries
-# below try to get around the problem by ignoring the feature or
-# turning it off when inputting a character.  They are said not to
-# work well at 300 baud.  (You could always cut the wire to the bell!)
-# (vi200: this used to use ich1=\Ei\s\010\Ej but it's more effective to
-# use <smir>/<rmir> directly -- esr)
-# From: <mike@brl-vgr> Mon Nov 14 08:34:29 1983
-vi200|vis200|visual 200 with function keys, 
-	am, 
+# Visual 200 from BRL
+# The following switch settings are assumed for normal operation:
+#	FULL_DUPLEX		SCROLL			CR
+#	AUTO_NEW_LINE_ON	VISUAL_200_EMULATION_MODE
+# Other switches may be set for operator convenience or communication
+# requirements.
+# Character insertion is kludged in order to get around the "beep" misfeature.
+# (This cap is commented out because <smir>/<rmir> is more efficient -- esr)
+# Supposedly "4*" delays should be used for <il1>, <ed>, <clear>, <dch1>,
+# and <dl1> strings, but we seem to get along fine without them.
+vi200|visual 200, 
+	am, mir, msgr, 
 	cols#80, it#8, lines#24, 
-	bel=^G, clear=\Ev, cnorm=\Ec, cr=^M, cub1=^H, cud1=^J, 
-	cuf1=\EC, cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, 
-	cvvis=\Ed, dch1=\EO$<4*>, dl1=\EM$<4*>, ed=\Ey, 
-	el=\Ex$<4*>, home=\EH, ht=^I, il1=\EL, ind=^J, 
-	is2=\E3\Eb\Ej\E\\\El\EG\Ec\Ek, kcub1=\ED, kcud1=\EB, 
-	kcuf1=\EC, kcuu1=\EA, kf0=\EP, kf1=\EQ, kf2=\ER, kf3=\E , 
-	kf4=\E!, kf5=\E", kf6=\E#, kf7=\E$, kf8=\E%, kf9=\E&, 
-	khome=\EH, ri=\EI, rmir=\Ej, rmso=\E3, smir=\Ei, smso=\E4, 
+	acsc=, bel=^G, cbt=\Ez, clear=\Ev, cnorm=\Ec, cr=^M, cub1=^H, 
+	cud1=^J, cuf1=\EC, cup=\EY%p1%{32}%+%c%p2%{32}%+%c, 
+	cuu1=\EA, cvvis=\Ed, dch1=\EO, dim=\E4, dl1=\EM, ed=\Ey, 
+	el=\Ex, home=\EH, ht=^I, hts=\E1, il1=\EL, ind=^J, invis=\Ea, 
+	kbs=^H, kclr=\Ev, kctab=\E2, kcub1=\ED, kcud1=\EB, kcuf1=\EC, 
+	kcuu1=\EA, kdch1=\EO, kdl1=\EM, ked=\EJ, kel=\Et, kf0=\E?p, 
+	kf1=\E?q, kf2=\E?r, kf3=\E?s, kf4=\E?t, kf5=\E?u, kf6=\E?v, 
+	kf7=\E?w, kf8=\E?x, kf9=\E?y, khome=\EH, khts=\E1, kich1=\Ei, 
+	kil1=\EL, krmir=\Ej, mc0=\EH\E], mc4=\EX, mc5=\EW, ri=\EI, 
+	rmacs=\EG, rmkx=\E>, rmso=\E3, 
+	rs1=\E3\Eb\Ej\E\\\El\EG\Ec\Ek\EX, sgr0=\E3\Eb, 
+	smacs=\EF, smkx=\E=, smso=\E4, tbc=\Eg, 
 # The older Visuals didn't come with function keys. This entry uses
 # <smkx> and <rmkx> so that the keypad keys can be used as function keys.
 # If your version of vi doesn't support function keys you may want
 # to use vi200-f.
-vi200-f|visual|visual 200 no function keys, 
+vi200-f|visual 200 no function keys, 
 	is2=\E3\Eb\Ej\E\\\El\EG\Ed\Ek, kf0=\E?p, kf1=\E?q, 
 	kf2=\E?r, kf3=\E?s, kf4=\E?t, kf5=\E?u, kf6=\E?v, kf7=\E?w, 
 	kf8=\E?x, kf9=\E?y, rmkx=\E>, rmso@, smkx=\E=, smso@, 
@@ -4242,14 +4598,14 @@ wy50|wyse50|Wyse 50,
 	cuu1=^K, dch1=\EW$<1>, dim=\E`7\E), dl1=\ER, dsl=\EF\r, 
 	ed=\EY$<20>, el=\ET, flash=\E`8$<100/>\E`9, fsl=^M, 
 	home=^^, ht=^I, hts=\E1, il1=\EE, ind=\n$<2>, ip=$<1>, 
-	is1=\E`\072\E`9$<30>, is2=\016\024\E'\E(, kHOM=\E{, 
-	kbs=^H, kcbt=\EI, kcub1=^H, kcud1=^J, kcuf1=^L, kcuu1=^K, 
-	kdch1=\EW, kdl1=\ER, ked=\EY, kel=\ET, kent=\E7, kf1=^A@\r, 
-	kf10=^AI\r, kf11=^AJ\r, kf12=^AK\r, kf13=^AL\r, kf14=^AM\r, 
-	kf15=^AN\r, kf16=^AO\r, kf2=^AA\r, kf3=^AB\r, kf4=^AC\r, 
-	kf5=^AD\r, kf6=^AE\r, kf7=^AF\r, kf8=^AG\r, kf9=^AH\r, 
-	khome=^^, kich1=\EQ, kil1=\EE, knp=\EK, kpp=\EJ, kprt=\EP, 
-	krpl=\Er, ll=^^^K, mc0=\EP, mc4=^T, mc5=^X, nel=^M^J, 
+	is1=\E`\:\E`9$<30>, is2=\016\024\E'\E(, kHOM=\E{, kbs=^H, 
+	kcbt=\EI, kcub1=^H, kcud1=^J, kcuf1=^L, kcuu1=^K, kdch1=\EW, 
+	kdl1=\ER, ked=\EY, kel=\ET, kent=\E7, kf1=^A@\r, kf10=^AI\r, 
+	kf11=^AJ\r, kf12=^AK\r, kf13=^AL\r, kf14=^AM\r, kf15=^AN\r, 
+	kf16=^AO\r, kf2=^AA\r, kf3=^AB\r, kf4=^AC\r, kf5=^AD\r, 
+	kf6=^AE\r, kf7=^AF\r, kf8=^AG\r, kf9=^AH\r, khome=^^, 
+	kich1=\EQ, kil1=\EE, knp=\EK, kpp=\EJ, kprt=\EP, krpl=\Er, 
+	ll=^^^K, mc0=\EP, mc4=^T, mc5=^X, nel=^M^J, 
 	pfx=\Ez%p1%'?'%+%c%p2%s\177, 
 	pln=\Ez%p1%'/'%+%c%p2%s\r, prot=\E`7\E), rev=\E`6\E), 
 	ri=\Ej, rmacs=\EH^C, rmir=\Er, rmln=\EA11, rmso=\E(, 
@@ -4315,7 +4671,7 @@ wy350|wyse350|Wyse 350,
 	cup=\E=%p1%{32}%+%c%p2%{32}%+%c, cuu1=^K, dch1=\EW$<1>, 
 	dim=\EGp, dl1=\ER, dsl=\EF\r, ed=\EY$<20>, el=\ET, 
 	flash=\E`8$<100/>\E`9, fsl=^M, home=^^, ht=^I, hts=\E1, 
-	il1=\EE, ind=\n$<2>, ip=$<1>, is1=\E`\072\E`9$<30>, 
+	il1=\EE, ind=\n$<2>, ip=$<1>, is1=\E`\:\E`9$<30>, 
 	is2=\016\024\E'\E(, is3=\E%?, kHOM=\E{, kbs=^H, kcbt=\EI, 
 	kcub1=^H, kcud1=^J, kcuf1=^L, kcuu1=^K, kdch1=\EW, kdl1=\ER, 
 	ked=\EY, kel=\ET, kent=\E7, kf1=^A@\r, kf10=^AI\r, 
@@ -4342,6 +4698,7 @@ wy350-wvb|wyse350-wvb|wyse 350 132-column visible bell,
 	use=wy350-w, 
 #
 #	This terminfo description is untested.
+#	The wyse100 emulates an adm31, so the adm31 entry should work.
 #
 wy100|wyse 100, 
 	hs, mir, 
@@ -4364,7 +4721,7 @@ wy100|wyse 100,
 wy120|wyse120|wy150|wyse150|Wyse 120/150, 
 	am, bw, hs, km, mc5i, mir, msgr, xon, 
 	cols#80, it#8, lh#1, lines#24, lw#8, nlab#8, pb#9601, wsl#45, 
-	acsc=+/\\\054.0[Iha2fxgqh1jYk?lZm@nEqDtCu4vAwBx3yszr{c~~, 
+	acsc=+/\\\,.0[Iha2fxgqh1jYk?lZm@nEqDtCu4vAwBx3yszr{c~~, 
 	bel=^G, blink=\EG2, cbt=\EI, civis=\E`0, clear=\E+$<50>, 
 	cnorm=\E`1, cr=^M, cub1=^H, cud1=^J, cuf1=^L, 
 	cup=\E=%p1%{32}%+%c%p2%{32}%+%c, cuu1=^K, dch1=\EW$<7>, 
@@ -4384,7 +4741,7 @@ wy120|wyse120|wy150|wyse150|Wyse 120/150,
 	pfx=\EZ1%p1%'?'%+%c%p2%s\177, 
 	pln=\Ez%p1%'/'%+%c%p2%s\r, prot=\E), ri=\Ej$<2>, 
 	rmacs=\EcD, rmam=\Ed., rmcup=\Ew1, rmir=\Er, rmln=\EA11, 
-	rmxon=\Ec20, rs1=\E~!\E~4$<30>, rs2=\EeF\E`\072$<70>, 
+	rmxon=\Ec20, rs1=\E~!\E~4$<30>, rs2=\EeF\E`\:$<70>, 
 	rs3=\EwG\Ee($<100>, 
 	sgr=%?%p8%t\E)%e\E(%;%?%p9%t\EcE%e\EcD%;\EG%'0'%?%p2%t%{8}%|%;%?%p1%p3%|%p6%|%t%{4}%|%;%?%p4%t%{2}%|%;%?%p1%p5%|%t%{64}%|%;%?%p7%t%{1}%|%;%c, 
 	sgr0=\E(\EH\003\EG0\EcD, smacs=\EcE, smam=\Ed/, 
@@ -4445,7 +4802,7 @@ wy120-w-vb|wy120-wvb|wyse120-wvb|wy150-w-vb|wyse150-w-vb|Wyse 120/150 132-column
 wy60|wyse60|Wyse 60, 
 	am, bw, hs, km, mc5i, mir, msgr, 
 	cols#80, lh#1, lines#24, lw#8, nlab#8, wsl#45, 
-	acsc=+/\\\054.0[Iha2fxgqh1jYk?lZm@nEqDtCu4vAwBx3yszr{c~~, 
+	acsc=+/\\\,.0[Iha2fxgqh1jYk?lZm@nEqDtCu4vAwBx3yszr{c~~, 
 	bel=^G, blink=\EG2, cbt=\EI, civis=\E`0, clear=\E+$<100>, 
 	cnorm=\E`1, cr=^M, cub1=^H, cud1=^J, cuf1=^L, 
 	cup=\E=%p1%{32}%+%c%p2%{32}%+%c, cuu1=^K, 
@@ -4533,7 +4890,7 @@ wy99gt|wyse99gt|Wyse 99gt,
 	clear=\E+$<130>, dch1=\EW$<7>, dl1=\ER$<4>, ed=\Ey$<130>, 
 	el=\Et$<5>, flash=\E`8$<100/>\E`9, ht=\011$<1>, 
 	il1=\EE$<4>, ind=\n$<4>, ip=$<2>, is3=\Ew0$<20>, nel@, 
-	ri=\Ej$<3>, rmcup=\Ew0, rs2=\E`\072$<150>, smcup=\Ew1, 
+	ri=\Ej$<3>, rmcup=\Ew0, rs2=\E`\:$<150>, smcup=\Ew1, 
 	u0=\E~>\E8, u1=\E[42h, 
 	use=wy60, 
 #
@@ -4544,7 +4901,7 @@ wy99gt-w|wyse99gt-w|wyse 99gt 132-column,
 #
 wy99gt-25|wyse99gt-25|wyse 99gt 80-column 25-lines, 
 	lh@, lines#25, lw@, nlab@, 
-	pln@, rs2=\E`\072$<150>, rs3=\EwG\Ee)$<200>, use=wy99gt, 
+	pln@, rs2=\E`\:$<150>, rs3=\EwG\Ee)$<200>, use=wy99gt, 
 #
 wy99gt-25-w|wyse99gt-25-w|wyse 99gt 132-column 25-lines, 
 	lh@, lines#25, lw@, nlab@, 
@@ -4580,7 +4937,7 @@ wy99gt-w-vb|wy99gt-wvb|wyse99gt-wvb|Wyse 99gt 132-column visible bell,
 wy160|wyse160|Wyse 160, 
 	am, bw, hs, km, mc5i, mir, msgr, 
 	cols#80, lh#1, lines#24, lw#8, nlab#8, wsl#38, 
-	acsc=+/\\\054.0[Iha2fxgqh1jYk?lZm@nEqDtCu4vAwBx3yszr{c~~, 
+	acsc=+/\\\,.0[Iha2fxgqh1jYk?lZm@nEqDtCu4vAwBx3yszr{c~~, 
 	bel=^G, blink=\EG2, cbt=\EI, civis=\E`0, clear=\E+$<30>, 
 	cnorm=\E`1, cr=^M, cub1=^H, cud1=^J, cuf1=^L, 
 	cup=\E=%p1%{32}%+%c%p2%{32}%+%c, cuu1=^K, dch1=\EW$<5>, 
@@ -4601,7 +4958,7 @@ wy160|wyse160|Wyse 160,
 	pln=\Ez%p1%'/'%+%c%p2%s\r, prot=\E), ri=\Ej$<1>, 
 	rmacs=\EcD, rmam=\Ed., rmclk=\E`c, rmcup=\Ew0, rmir=\Er, 
 	rmln=\EA11, rmxon=\Ec20, rs1=\E~!\E~4$<70>, 
-	rs2=\E`\072$<100>, rs3=\EwG\Ee($<140>, 
+	rs2=\E`\:$<100>, rs3=\EwG\Ee($<140>, 
 	sgr=%?%p8%t\E)%e\E(%;%?%p9%t\EcE%e\EcD%;\EG%'0'%?%p2%t%{8}%|%;%?%p1%p3%|%p6%|%t%{4}%|%;%?%p4%t%{2}%|%;%?%p1%p5%|%t%{64}%|%;%?%p7%t%{1}%|%;%c, 
 	sgr0=\E(\EH\003\EG0\EcD, smacs=\EcE, smam=\Ed/, 
 	smcup=\Ew1, smir=\Eq, smln=\EA10, smso=\EGt, smxon=\Ec21, 
@@ -4666,9 +5023,9 @@ wy75|wyse75|wyse 75,
 	cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, 
 	cuu=\E[%p1%dA, cuu1=\E[A, dch=\E[%p1%dP$<3*>, 
 	dch1=\E[P$<3>, dim=\E[0t\E[2m, dl=\E[%p1%dM$<1*>, 
-	dl1=\E[M, dsl=\E[>\\\054\001\001\E[>-\001\001, 
+	dl1=\E[M, dsl=\E[>\\\,\001\001\E[>-\001\001, 
 	ech=\E[%p1%dX, ed=\E[J$<30>, el=\E[K$<3>, el1=\E[1K$<3>, 
-	enacs=\E)0, flash=\E[30h\E\\\054\E[30l$<250>, fsl=^A, 
+	enacs=\E)0, flash=\E[30h\E\\\,\E[30l$<250>, fsl=^A, 
 	home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, 
 	ich=\E[%p1%d@$<1*>, il=\E[%p1%dL$<2*>, il1=\E[L$<2>, 
 	ind=\n$<2>, ip=$<1>, 
@@ -4690,7 +5047,7 @@ wy75|wyse75|wyse 75,
 	sgr=%?%p5%t\E[0t%;%?%p3%p1%|%t\E[1t%;%?%p2%t\E[2t%;%?%p4%t\E[3t%;%?%p1%p2%p3%p4%p5%|%|%|%|%t\E[7m%e\E[m%;%?%p9%t\016%e\017%;, 
 	sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smir=\E[4h, 
 	smkx=\E[?1l\E[?7h\E=, smso=\E[1t\E[7m, smul=\E[2t\E[4m, 
-	tbc=\E[3g, tsl=\E[>\\\054\001, 
+	tbc=\E[3g, tsl=\E[>\\\,\001, 
 #
 #	This terminal description uses the non-hidden attribute mode
 #	(with magic cookie).
@@ -4737,7 +5094,7 @@ wy85|wyse85|wyse 85,
 	dch=\E[%p1%dP$<3*>, dch1=\E[P$<3>, dim=\E[2m, 
 	dl=\E[%p1%dM$<3*>, dl1=\E[M$<3>, dsl=\E[40l, 
 	ech=\E[%p1%dX, ed=\E[J$<110>, el=\E[K$<1>, el1=\E[1K, 
-	enacs=\E)0, flash=\E[30h\E\\\054\E[30l$<300>, 
+	enacs=\E)0, flash=\E[30h\E\\\,\E[30l$<300>, 
 	fsl=\E[1;24r\E8, home=\E[H, ht=\011$<1>, hts=\EH, 
 	ich=\E[%p1%d@$<4*>, il=\E[%p1%dL$<5*>, il1=\E[L$<5>, 
 	ind=\n$<3>, invis=\E[8m, ip=$<3>, is1=\E[62;1"p\E[?5W, 
@@ -4762,7 +5119,7 @@ wy85|wyse85|wyse 85,
 #
 #	Wyse 85 with visual bell.
 wy85-vb|wyse85-vb|wyse 85 with visible bell, 
-	bel@, flash=\E[30h\E\\\054\E[30l$<300>, use=wy85, 
+	bel@, flash=\E[30h\E\\\,\E[30l$<300>, use=wy85, 
 #
 #	Wyse 85 in 132-column mode.
 wy85-w|wyse85-w|wyse 85 in 132-column mode, 
@@ -4797,7 +5154,7 @@ wy185|wyse185|wyse 185,
 	dim=\E[2m, dl=\E[%p1%dM$<2*>, dl1=\E[M$<2>, 
 	dsl=\E7\E[99;0H\E[K\E8, ech=\E[%p1%dX, ed=\E[J$<40>, 
 	el=\E[K, el1=\E[1K, enacs=\E)0, 
-	flash=\E[30h\E\\\054\E[30l$<100>, fsl=\E[1;24r\E8, 
+	flash=\E[30h\E\\\,\E[30l$<100>, fsl=\E[1;24r\E8, 
 	home=\E[H, hpa=\E[%i%p1%d`, ht=^I, hts=\EH, 
 	ich=\E[%p1%d@$<2>, il=\E[%p1%dL$<3*>, il1=\E[L$<3>, 
 	ind=\n$<2>, invis=\E[8m, ip=$<4>, is1=\E[?5W, 
@@ -4850,7 +5207,7 @@ wy185-wvb|wyse185-wvb|wyse 185+flash+132 cols,
 wy325|wyse325|Wyse epc, 
 	am, bw, hs, mc5i, mir, 
 	cols#80, lh#1, lines#24, lw#8, nlab#8, pb#9601, wsl#45, 
-	acsc=+/\\\054.0[Iha2fxgqh1jYk?lZm@nEqDtCu4vAwBx3yszr{c~~, 
+	acsc=+/\\\,.0[Iha2fxgqh1jYk?lZm@nEqDtCu4vAwBx3yszr{c~~, 
 	bel=^G, blink=\EG2, cbt=\EI, civis=\E`0, clear=\E+$<50>, 
 	cnorm=\E`1, cr=^M, cub1=^H, cud1=^J, cuf1=^L, 
 	cup=\E=%p1%{32}%+%c%p2%{32}%+%c, cuu1=^K, dch1=\EW$<7>, 
@@ -4870,7 +5227,7 @@ wy325|wyse325|Wyse epc,
 	pfx=\EZ1%p1%'?'%+%c%p2%s\177, 
 	pln=\Ez%p1%'/'%+%c%p2%s\r, prot=\E), ri=\Ej$<2>, 
 	rmacs=\EcD, rmam=\Ed., rmcup=\Ew0, rmir=\Er, rmln=\EA11, 
-	rs1=\E~!\E~4$<30>, rs2=\EeF\E`\072$<70>, 
+	rs1=\E~!\E~4$<30>, rs2=\EeF\E`\:$<70>, 
 	rs3=\EwG\Ee($<100>, 
 	sgr=%?%p8%t\E)%e\E(%;%?%p9%t\EcE%e\EcD%;\EG%'0'%?%p2%t%{8}%|%;%?%p1%p3%|%p6%|%t%{4}%|%;%?%p4%t%{2}%|%;%?%p1%p5%|%t%{64}%|%;%?%p7%t%{1}%|%;%c, 
 	sgr0=\E(\EH\003\EG0\EcD, smacs=\EcE, smam=\Ed/, 
@@ -4978,7 +5335,7 @@ wy370-nk|wyse 370 without function keys,
 	dclk=\E[31h, dim=\E[2m, dl=\E[%p1%dM$<2*>, dl1=\E[M$<2>, 
 	dsl=\E[40l, ech=\E[%p1%dX$<.1*>, ed=\E[J$<40>, 
 	el=\E[K$<10>, el1=\E[1K$<12>, enacs=\E)0, 
-	flash=\E[30h\E\\\054\E[30l$<300>, fsl=\E[1;24r\E8, 
+	flash=\E[30h\E\\\,\E[30l$<300>, fsl=\E[1;24r\E8, 
 	home=\E[H, hpa=\E[%i%p1%d`, ht=\011$<1>, hts=\EH, 
 	ich=\E[%p1%d@$<1*>, il=\E[%p1%dL$<2*>, il1=\E[L$<2>, 
 	ind=\n$<2>, 
@@ -5048,7 +5405,7 @@ wy370-w|Wyse 370 in 132-column mode,
 #
 #	Wyse 370 in 132-column mode with visual bell.
 wy370-wvb|Wyse 370 with visible bell 132-columns, 
-	flash=\E[30h\E\\\054\E[30l$<300>, 
+	flash=\E[30h\E\\\,\E[30l$<300>, 
 	use=wy370-w, 
 wy370-rv|Wyse 370 reverse video, 
 	rs3=\E[32h\E[?5h, use=wy370, 
@@ -5058,7 +5415,7 @@ wy370-rv|Wyse 370 reverse video,
 wy99gt-tek|Wyse 99gt Tektronix 4010/4014 emulator, 
 	am, os, 
 	cols#74, lines#35, 
-	bel=^G, clear=\E^L, cr=^M, cub1=^H, cud1=^J, cuf1= , 
+	bel=^G, clear=\E^L, cr=^M, cub1=^H, cud1=^J, cuf1=\s, 
 	cup=\035%{3040}%{89}%p1%*%-%Py\n%p2%{55}%*%Px\n%gy%{128}%/%{31}%&%{32}%+%c\n%gy%{3}%&%{4}%*%gx%{3}%&%+%{96}%+%c\n%gy%{004}%/%{31}%&%{96}%+%c\n%gx%{128}%/%{31}%&%{32}%+%c\n%gx%{004}%/%{31}%&%{64}%+%c\037, 
 	cuu1=^K, ff=^L, 
 	hd=\036HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH\037, 
@@ -5078,7 +5435,7 @@ wy160-tek|Wyse 160 Tektronix 4010/4014 emulator,
 wy370-tek|Wyse 370 Tektronix 4010/4014 emulator, 
 	am, os, 
 	cols#80, lines#36, 
-	bel=^G, clear=\E^L, cr=^M, cub1=^H, cud1=^J, cuf1= , 
+	bel=^G, clear=\E^L, cr=^M, cub1=^H, cud1=^J, cuf1=\s, 
 	cup=\035%{775}%{108}%p1%*%{5}%/%-%Py\n%p2%{64}%*%{4}%+%{5}%/%Px\n%gy%{32}%/%{31}%&%{32}%+%c\n%gy%{31}%&%{96}%+%c\n%gx%{32}%/%{31}%&%{32}%+%c\n%gx%{31}%&%{64}%+%c\037, 
 	cuu1=^K, ff=^L, 
 	hd=\036HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH\037, 
@@ -5160,7 +5517,7 @@ wy520-24|wyse520-24|wyse 520 with 24 data lines,
 #
 #       Wyse 520 with visual bell.
 wy520-vb|wyse520-vb|wyse 520 with visible bell, 
-	flash=\E[30h\E\\\054\E[30l$<100>, use=wy520, 
+	flash=\E[30h\E\\\,\E[30l$<100>, use=wy520, 
 #
 #       Wyse 520 in 132-column mode.
 wy520-w|wyse520-w|wyse 520 in 132-column mode, 
@@ -5171,7 +5528,7 @@ wy520-w|wyse520-w|wyse 520 in 132-column mode,
 #
 #       Wyse 520 in 132-column mode with visual bell.
 wy520-wvb|wyse520-wvb|wyse 520 with visible bell 132-columns, 
-	flash=\E[30h\E\\\054\E[30l$<100>, 
+	flash=\E[30h\E\\\,\E[30l$<100>, 
 	use=wy520-w, 
 #
 #
@@ -5197,7 +5554,7 @@ wy520-epc-24|wyse520-pc-24|wyse 520 with 24 data lines,
 #
 #       Wyse 520 with visual bell.
 wy520-epc-vb|wyse520-pc-vb|wyse 520 with visible bell, 
-	flash=\E[30h\E\\\054\E[30l$<100>, 
+	flash=\E[30h\E\\\,\E[30l$<100>, 
 	use=wy520-epc, 
 #
 #       Wyse 520 in 132-column mode.
@@ -5209,7 +5566,7 @@ wy520-epc-w|wyse520-epc-w|wyse 520 in 132-column mode,
 #
 #       Wyse 520 in 132-column mode with visual bell.
 wy520-epc-wvb|wyse520-p-wvb|wyse 520 with visible bell 132-columns, 
-	flash=\E[30h\E\\\054\E[30l$<100>, 
+	flash=\E[30h\E\\\,\E[30l$<100>, 
 	use=wy520-epc-w, 
 #
 #       Wyse 520 in 80-column, 36 lines
@@ -5270,10 +5627,10 @@ wyse-vp|wyse|Wyse 50 in ADDS Viewpoint emulation mode with "enhance" on,
 	bel=^G, clear=^L, cr=^M, cub1=^H, cud1=^J, cuf1=^F, 
 	cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=^Z, dch1=\EW, 
 	dl1=\El, ed=\Ek, el=\EK, home=^A, ht=^I, il1=\EM, ind=^J, 
-	is2=\E`\072\E`9\017\Er, kbs=^H, kcub1=^U, kcud1=^J, 
-	kcuf1=^F, kcuu1=^Z, khome=^A, ll=^A^Z, nel=^M^J, rmir=\Er, 
-	rmso=^O, rmul=^O, rs1=\E`\072\E`9\017\Er, sgr0=^O, 
-	smir=\Eq, smso=^N, smul=^N, 
+	is2=\E`\:\E`9\017\Er, kbs=^H, kcub1=^U, kcud1=^J, kcuf1=^F, 
+	kcuu1=^Z, khome=^A, ll=^A^Z, nel=^M^J, rmir=\Er, rmso=^O, 
+	rmul=^O, rs1=\E`\:\E`9\017\Er, sgr0=^O, smir=\Eq, smso=^N, 
+	smul=^N, 
 
 wy75ap|wyse75ap|wy-75ap|wyse-75ap|Wyse WY-75 Applications and Cursor keypad, 
 	is2=\E[1;24r\E[?10;3l\E[?1;25h\E[4l\E[m\E(B\E=, 
@@ -5287,8 +5644,8 @@ wy100q|Wyse 100 for Quotron,
 	cbt=\EI, clear=^Z, cub1=^H, cud1=^J, cuf1=^L, 
 	cup=\E=%p1%{32}%+%c%p2%{32}%+%c, cuu1=^K, dch1=\EW, 
 	dl1=\ER, ed=\EY, el=\ET, home=^^, il1=\EE, invis@, 
-	is2=\E`\072\200\EC\EDF\E0\E'\E(\EA21, kcub1=^H, 
-	kcud1=^J, kcuf1=^L, kcuu1=^K, ri=\Ej, rmir=\Er, smir=\Eq, 
+	is2=\E`\:\200\EC\EDF\E0\E'\E(\EA21, kcub1=^H, kcud1=^J, 
+	kcuf1=^L, kcuu1=^K, ri=\Ej, rmir=\Er, smir=\Eq, 
 	use=adm+sgr, 
 
 #### Kermit terminal emulations
@@ -5477,8 +5834,9 @@ avatar|avatar1|avatar terminal emulator level 1,
 #
 # This section also includes Teletype-branded VDTs.
 #
-# The AT&T/Teletype terminals group was sold to SunRiver Data Systems; for
-# details, see the header comment on the ADDS section.
+# The AT&T/Teletype terminals group was sold to SunRiver Data Systems (now
+# Boundless Technologies); for details, see the header comment on the ADDS
+# section.
 #
 # These are AT&T's official terminfo entries.  All-caps aliases have been
 # removed.
@@ -5518,7 +5876,7 @@ att2350|AT&T 2350 Video Information Terminal 80 column mode,
 att5410v1|att4410v1|tty5410v1|AT&T 4410/5410 80 columns - version 1, 
 	am, hs, mir, msgr, xon, 
 	cols#80, it#8, lh#2, lines#24, lw#8, nlab#8, wsl#80, 
-	acsc=``aaffhhggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~00++--\\\054\\\054.., 
+	acsc=``aaffhhggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~00++--\,\,.., 
 	bel=^G, blink=\E[5m, bold=\E[2;7m, clear=\E[H\E[J, cr=^M, 
 	csr=\E[%i%p1%d;%p2%dr, cub1=^H, cud1=\E[B, cuf1=\E[C, 
 	cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dch1=\E[P, dim=\E[2m, 
@@ -5530,7 +5888,7 @@ att5410v1|att4410v1|tty5410v1|AT&T 4410/5410 80 columns - version 1,
 	kf6=\EOU, kf7=\EOV, kf8=\EOW, khome=\E[H, kll=\E[24;1H, 
 	ll=\E[24H, nel=^M^J, 
 	pfx=\E[%p1%1d;%p2%l%2.2dq   f%p1%1d           %p2%s, 
-	pln=\E[%p1%d;00q%p2%\072-16s, rc=\E8, rev=\E[7m, ri=\EM, 
+	pln=\E[%p1%d;00q%p2%:-16s, rc=\E8, rev=\E[7m, ri=\EM, 
 	rmacs=^O, rmso=\E[m, rmul=\E[m, rs2=\Ec\E[?3l\E[2;0y, 
 	sc=\E7, 
 	sgr=\E[0%?%p1%p5%|%t;2%;%?%p2%p6%|%t;4%;%?%p4%t;5%;%?%p3%p1%|%p6%|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;, 
@@ -5551,7 +5909,7 @@ att5410-w|att4410-w|4410-w|tty5410-w|5410-w|AT&T 4410/5410 in 132 column mode,
 
 # 5410 in terms of a vt100
 # (v5410: added <rmam>/<smam> based on init string -- esr)
-v5410|5410 in terms of a vt100, 
+v5410|att5410 in terms of a vt100, 
 	am, mir, msgr, xon, 
 	cols#80, it#8, lines#24, vt#3, 
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, 
@@ -5629,7 +5987,7 @@ att4415|tty5420|att5420|AT&T 4415/5420 80 cols,
 	lf6=F6, lf7=F7, lf8=F8, ll=\Ew, mc0=\E[?2i, mc4=\E[?9i, 
 	mc5=\E[?4i, mrcup=\E[%i%p1%d;%p2%dt, 
 	pfx=\E[%p1%d;%p2%l%02dq   F%p1%d           %p2%s, 
-	pln=\E[%p1%d;0;0;0q%p2%\072-16.16s, prot=\EV, 
+	pln=\E[%p1%d;0;0;0q%p2%:-16.16s, prot=\EV, 
 	rin=\E[%p1%dF, rmam=\E[?7l, rmir=\E[4l, 
 	rmkx=\E[19;0j\E[21;1j\212, rmln=\E|, 
 	sgr=\E[0%?%p1%p5%|%t;2%;%?%p2%p6%|%t;4%;%?%p4%t;5%;%?%p3%p1%|%p6%|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;, 
@@ -5653,12 +6011,12 @@ att4415-w-rv|tty5420-w-rv|att5420-w-rv|AT&T 4415/5420 132 cols/rv,
 # Note that this mode permits programming USER PF KEYS and labels
 # However, when you program user pf labels you have to reselect
 # user pf keys to make them appear! 
-att4415+nl|4415+nl|tty5420+nl|att5420+nl|generic AT&T 4415/5420 changes for not changing labels, 
+att4415+nl|tty5420+nl|att5420+nl|generic AT&T 4415/5420 changes for not changing labels, 
 	kf1@, kf2@, kf3@, kf4@, kf5@, kf6@, kf7@, kf8@, 
 	pfx=\E[%p1%d;%p2%l%02d;0;1q   F%p1%d           %p2%s, 
-	pln=\E[%p1%d;0;0;1q%p2%\072-16.16s, 
+	pln=\E[%p1%d;0;0;1q%p2%:-16.16s, 
 
-att4415-nl|4415-nl|tty5420-nl|att5420-nl|AT&T 4415/5420 without changing labels, 
+att4415-nl|tty5420-nl|att5420-nl|AT&T 4415/5420 without changing labels, 
 	kf1@, kf2@, kf3@, kf4@, kf5@, kf6@, kf7@, kf8@, 
 	use=att4415+nl, use=att4415, 
 
@@ -5698,10 +6056,10 @@ att5420_2|AT&T 5420 model 2 80 cols,
 	lf6=F6, lf7=F7, lf8=F8, ll=\Ew, mc0=\E[?;2i, mc4=\E[4i, 
 	mc5=\E[5i, mrcup=\E[%i%p1%d;%p2%dt, nel=^M^J, 
 	pfx=\E[%p1%d;%p2%l%02dq   F%p1%d           %p2%s\E~, 
-	pln=\E[%p1%d;0;0;0q%p2%\072-16.16s\E~, prot=\EV, 
-	rc=\E8, rev=\E[7m, ri=\EM, rin=\E[%p1%dF, rmacs=^O, 
-	rmkx=\E[19;0j, rmln=\E|, rmso=\E[m, rmul=\E[m, 
-	rs2=\Ec\E[?3l\E[2;0y, sc=\E7, 
+	pln=\E[%p1%d;0;0;0q%p2%:-16.16s\E~, prot=\EV, rc=\E8, 
+	rev=\E[7m, ri=\EM, rin=\E[%p1%dF, rmacs=^O, rmkx=\E[19;0j, 
+	rmln=\E|, rmso=\E[m, rmul=\E[m, rs2=\Ec\E[?3l\E[2;0y, 
+	sc=\E7, 
 	sgr=\E[0%?%p1%p5%|%t;2%;%?%p2%p6%|%t;4%;%?%p4%t;5%;%?%p3%p1%|%p6%|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;, 
 	sgr0=\E[m\017, smacs=^N, smkx=\E[19;1j, smln=\E~, 
 	smso=\E[7m, smul=\E[4m, tbc=\E[3g, 
@@ -5737,16 +6095,16 @@ att4420|tty4420|teletype 4420,
 	cols#80, lines#24, lm#72, 
 	bel=^G, clear=\EH\EJ, cr=\EG, cub1=\ED, cud1=\EB, cuf1=\EC, 
 	cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, dch1=\EP, 
-	dl1=\EM, ed=\EJ, el=\Ez, home=\EH, il1=\EL, ind=\EH\EM\EY7 , 
+	dl1=\EM, ed=\EJ, el=\Ez, home=\EH, il1=\EL, ind=\EH\EM\EY7\s, 
 	kcbt=\EO, kclr=\EJ, kcub1=^H, kcud1=\EB, kcuf1=\EC, 
 	kcuu1=\EA, kdch1=\EP, kdl1=\EM, kf0=\EU, kf3=\E@, khome=\EH, 
 	kich1=\E\^, kil1=\EL, kind=\ES, kri=\ET, 
 	lf0=segment advance, lf3=cursor tab, rmdc@, rmso=\E~, 
 	rmul=\EZ, smdc@, smso=\E}, smul=\E\\, 
 
-#  The following is a termcap entry for the Teletype 4424
+#  The following is a terminfo entry for the Teletype 4424
 #  asynchronous keyboard-display terminal.  It supports
-#  the vi editor.  The terminal must be "set up" as follows,
+#  the vi editor.  The terminal must be set up as follows,
 # 	
 # 	HIGHLIGHT DEFINITION	3-TONE
 # 	DISPLAY FUNCTION	GROUP III
@@ -5758,6 +6116,7 @@ att4420|tty4420|teletype 4420,
 # 	and HIGHLIGHT DEFINITION 3-TONE
 # The terminal has either bold or blink, depending on options
 #
+# (att4424: commented out <smcup>=\E[1m, we don't need bright locked on -- esr)
 att4424|tty4424|teletype 4424, 
 	am, xon, 
 	cols#80, lines#24, 
@@ -5774,8 +6133,8 @@ att4424|tty4424|teletype 4424,
 	khome=\E[H, nel=\EE, rev=\E}, ri=\ET, rmacs=\E(B, rmso=\E~, 
 	rmul=\EZ, 
 	sgr=\E[%?%p1%t7%;%?%p2%t;4%;%?%p3%t;7%;%?%p6%t;1%;%?%p6%p4%|%t;5%;%?%p5%t;0%;m, 
-	sgr0=\EX\E~\EZ\E4\E(B, smacs=\E(0, smcup=\E[1m, smso=\E}, 
-	smul=\E\\, tbc=\EF, 
+	sgr0=\EX\E~\EZ\E4\E(B, smacs=\E(0, smso=\E}, smul=\E\\, 
+	tbc=\EF, 
 
 att4424-1|tty4424-1|teletype 4424 in display function group I, 
 	kclr@, kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA, khome@, 
@@ -5832,7 +6191,7 @@ att5425|tty5425|att4425|AT&T 4425/5425,
 	kri=\E[S, ll=\E[24H, mc0=\E[?2i, mc4=\E[?9i, mc5=\E[?4i, 
 	nel=^M^J, 
 	pfx=\E[%p1%d;%p2%l%02dq   F%p1%1d           %p2%s, 
-	pln=\E[%p1%d;0;0;0q%p2%\072-16.16s, prot=\EV, rc=\E8, 
+	pln=\E[%p1%d;0;0;0q%p2%:-16.16s, prot=\EV, rc=\E8, 
 	rev=\E[7m, ri=\EM, rin=\E[%p1%dF, rmacs=^O, rmam=\E[?7l, 
 	rmir=\E[4l, rmkx=\E[21;0j\E[25;1j\212, rmln=\E|, 
 	rmso=\E[m, rmul=\E[m, rs2=\Ec\E[?3l\E[2;0y, sc=\E7, 
@@ -5881,10 +6240,10 @@ att4426|tty4426|teletype 4426S,
 #
 # This entry is based on one done by Ernie Rice at Summit, NJ and
 # changed by Anne Gallup, Skokie, IL, ttrdc!anne
-att510a|510a|bct510a|510A|AT&T 510A Personal Terminal, 
+att510a|bct510a|AT&T 510A Personal Terminal, 
 	am, mir, msgr, xenl, xon, 
 	cols#80, lh#2, lines#24, lw#7, nlab#8, 
-	acsc=hrisjjkkllmmnnqqttuuvvwwxx{{||}}~~-f\\\054h.e+g`b, 
+	acsc=hrisjjkkllmmnnqqttuuvvwwxx{{||}}~~-f\,h.e+g`b, 
 	bel=^G, blink=\E[5m, bold=\E[2;7m, cbt=\E[Z, 
 	civis=\E[11;0|, clear=\E[H\E[J, cnorm=\E[11;3|, cr=^M, 
 	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\E[1B, 
@@ -5899,7 +6258,7 @@ att510a|510a|bct510a|510A|AT&T 510A Personal Terminal,
 	kf15=\EOi, kf16=\EOj, kf2=\EOV, kf3=\EOu, kf4=\ENj, kf5=\ENe, 
 	kf6=\ENf, kf7=\ENh, kf8=\E[H, kf9=\EOc, kind=\E[S, kri=\E[T, 
 	mc0=\E[0i, mc4=\E[?8i, mc5=\E[?4i, nel=\EE, 
-	pln=\E[%p1%dp%p2%\072-16s, rc=\E8, rev=\E[7m, ri=\EM, 
+	pln=\E[%p1%dp%p2%:-16s, rc=\E8, rev=\E[7m, ri=\EM, 
 	rmacs=^O, rmkx=\E[19;0|, rmso=\E[m, rmul=\E[m, sc=\E7, 
 	sgr=\E[0%?%p5%p6%|%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1%|%p6%|%t;7%;m%?%p9%t\016%e\017%;, 
 	sgr0=\E[m\017, smacs=^N, smkx=\E[19;1|, smso=\E[7m, 
@@ -5914,10 +6273,10 @@ att510a|510a|bct510a|510A|AT&T 510A Personal Terminal,
 # There are problems with soft key labeling.  These are due to 
 # strangenesses in the native terminal that are impossible to
 # describe in a terminfo.  
-att510d|510d|bct510d|510D|AT&T 510D Personal Terminal, 
+att510d|bct510d|AT&T 510D Personal Terminal, 
 	am, da, db, mir, msgr, xenl, xon, 
 	cols#80, lh#2, lines#24, lm#48, lw#7, nlab#8, 
-	acsc=hrisjjkkllmmnnqqttuuvvwwxx{{||}}~~-f\\\054h.e+g`b, 
+	acsc=hrisjjkkllmmnnqqttuuvvwwxx{{||}}~~-f\,h.e+g`b, 
 	bel=^G, blink=\E[5m, bold=\E[2;7m, cbt=\E[Z, 
 	clear=\E[H\E[J, cnorm=\E[11;3|, cr=^M, cub=\E[%p1%dD, 
 	cub1=^H, cud=\E[%p1%dB, cud1=\E[1B, cuf=\E[%p1%dC, 
@@ -5933,8 +6292,8 @@ att510d|510d|bct510d|510D|AT&T 510D Personal Terminal,
 	kf11=\EOe, kf12=\EOf, kf13=\EOg, kf14=\EOh, kf15=\EOi, 
 	kf16=\EOj, kf2=\EOV, kf3=\EOu, kf4=\ENj, kf5=\ENe, kf6=\ENf, 
 	kf7=\ENh, kf8=\E[H, kf9=\EOc, kind=\E[S, kri=\E[T, ll=\E#2, 
-	mc0=\E[0i, mc4=\E[?8i, mc5=\E[?4i, mgc=\E\072, nel=\EE, 
-	pln=\E[%p1%dp%p2%\072-16s, rc=\E8, 
+	mc0=\E[0i, mc4=\E[?8i, mc5=\E[?4i, mgc=\E\:, nel=\EE, 
+	pln=\E[%p1%dp%p2%:-16s, rc=\E8, 
 	rep=%p1%c\E[%p2%{1}%-%db, rev=\E[7m, ri=\EM, 
 	rin=\E[%p1%dT, rmacs=^O, rmir=\E[4l, rmkx=\E[19;0|, 
 	rmln=\E<, rmso=\E[m, rmul=\E[m, rmxon=\E[29;1|, 
@@ -5945,10 +6304,10 @@ att510d|510d|bct510d|510D|AT&T 510D Personal Terminal,
 	smxon=\E[29;0|, tbc=\E[3g, vpa=\E[%p1%{1}%+%dd, 
 
 # (att500: I merged this with the att513 entry, att500 just used att513 -- esr)
-att500|att513|500bct|513bct|AT&T 513 using page mode, 
+att500|att513|AT&T 513 using page mode, 
 	am, chts, mir, msgr, xenl, xon, 
 	cols#80, lh#2, lines#24, lw#8, nlab#8, 
-	acsc=hrisjjkkllmmnnqqttuuvvwwxx{{||}}~~-f\\\054h.e+g`b, 
+	acsc=hrisjjkkllmmnnqqttuuvvwwxx{{||}}~~-f\,h.e+g`b, 
 	bel=^G, blink=\E[5m, bold=\E[2;7m, cbt=\E[Z, 
 	clear=\E[H\E[J, cnorm=\E[11;0|, cr=^M, 
 	csr=%i\E[%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, 
@@ -5981,7 +6340,7 @@ att500|att513|500bct|513bct|AT&T 513 using page mode,
 	pfkey=\E[%p1%d;%p2%l%d;3;0p   F%p1%d           %p2%s, 
 	pfloc=\E[%p1%d;%p2%l%d;2;0p   F%p1%d           %p2%s, 
 	pfx=\E[%p1%d;%p2%l%d;1;0p   F%p1%d           %p2%s, 
-	pln=\E[%p1%dp%p2%\072-16s, rc=\E8, 
+	pln=\E[%p1%dp%p2%:-16s, rc=\E8, 
 	rep=%p1%c\E[%p2%{1}%-%db, rev=\E[7m, ri=\EM, 
 	rin=\E[%p1%dF, rmacs=^O, rmir=\E[4l, 
 	rmkx=\E[19;0|\E[21;1|\212, rmln=\E<, rmso=\E[m, 
@@ -6007,7 +6366,7 @@ att5310|att5320|AT&T Model 53210 or 5320 matrix printer,
 	cpi=%?%p1%{10}%=%t\E[w%e%p1%{12}%=%t\E[2w%e%p1%{5}%=%t\E[5w%e%p1%{13}%=%p1%{14}%=%O%t\E[3w%e%p1%{16}%=%p1%{17}%=%O%t\E[4w%e%p1%{6}%=%t\E[6w%e%p1%{7}%=%t\E[7w%e%p1%{8}%=%t\E[8w%;, 
 	cr=^M, 
 	csnm=%?%p1%{0}%=%tusascii%e%p1%{1}%=%tenglish%e%p1%{2}%=%tfinnish%e%p1%{3}%=%tjapanese%e%p1%{4}%=%tnorwegian%e%p1%{5}%=%tswedish%e%p1%{6}%=%tgermanic%e%p1%{7}%=%tfrench%e%p1%{8}%=%tcanadian_french%e%p1%{9}%=%titalian%e%p1%{10}%=%tspanish%e%p1%{11}%=%tline%e%p1%{12}%=%tsecurity%e%p1%{13}%=%tebcdic%e%p1%{14}%=%tapl%e%p1%{15}%=%tmosaic%;, 
-	cud=\E[%p1%de, cud1=^J, cuf=\E[%p1%da, cuf1= , cuu1=\EM, 
+	cud=\E[%p1%de, cud1=^J, cuf=\E[%p1%da, cuf1=\s, cuu1=\EM, 
 	ff=^L, hpa=\E[%p1%d`, ht=^I, is1=\Ec, is2=\E[20l\r, 
 	lpi=%?%p1%{2}%=%t\E[4z%e%p1%{3}%=%t\E[5z%e%p1%{4}%=%t\E[6z%e%p1%{6}%=%t\E[z%e%p1%{8}%=%t\E[2z%e%p1%{12}%=%t\E[3z%;, 
 	rshm=\E[m, 
@@ -6016,13 +6375,39 @@ att5310|att5320|AT&T Model 53210 or 5320 matrix printer,
 	smgrp=\E[;%{1}%p1%+%ds, smgtp=\E[%p1%dr, sshm=\E[5m, 
 	u0=\E[%p1%dt, vpa=\E[%p1%dd, 
 
+# Teletype 5620, firmware version 1.1 (8;7;3) or earlier from BRL
+# The following SET-UP modes are assumed for normal operation:
+#	CR_DEF=CR	NL_DEF=INDEX	DUPLEX=FULL
+# Other SET-UP modes may be set for operator convenience or communication
+# requirements.  This termcap description is for the Resident Terminal Mode.
+# No delays specified; use "stty ixon -ixany" to enable DC3/DC1 flow control!
+# The BRL entry also said: UNSAFE :ll=\E[70H:
+att5620-1|tty5620-1|dmd1|Teletype 5620 with old ROMs, 
+	am, xon, 
+	cols#88, it#8, lines#70, vt#3, 
+	bel=^G, clear=\E[H\E[J, cr=^M, cub1=^H, cud1=^J, cuf1=\E[C, 
+	cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dch=\E[%p1%dP, 
+	dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, 
+	home=\E[H, ht=^I, ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, 
+	il1=\E[L, ind=^J, indn=\E[%p1%dS, kbs=^H, kclr=\E[2J, 
+	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, khome=\E[H, 
+	kll=\E[70;1H, nel=^M^J, rc=\E8, ri=\E[T, rin=\E[%p1%dT, 
+	rs1=\Ec, sc=\E7, 
+
 # 5620 terminfo  (2.0 or later ROMS with char attributes)
+# The following SET-UP modes are assumed for normal operation:
+#	DUPLEX=FULL	GEN_FLOW=ON	NEWLINE=INDEX	RETURN=CR
+# Other SET-UP modes may be set for operator convenience or communication
+# requirements.  This termcap description is for Resident Terminal Mode.  No
+# delays are specified; use "stty ixon -ixany" to enable DC3/DC1 flow control!
 # assumptions: <ind> (scroll forward one line) is only done at screen bottom
 # Be aware that older versions of the dmd have a firmware bug that affects
 # parameter defaulting; for this terminal, the 0 in \E[0m is not optional.
+# <msgr> is from an otherwise inferior BRL for this terminal.  That entry
+# also has <ll>=\E[70H commented out and marked unsafe.
 # For more, see the 5620 FAQ maintained by David Breneman <daveb@dgtl.com>.
 att5620|dmd|tty5620|ttydmd|5620|5620 terminal 88 columns, 
-	am, npc, xon, 
+	am, msgr, npc, xon, 
 	cols#88, it#8, lines#70, 
 	bel=^G, bold=\E[2m, clear=\E[H\E[J, cr=^M, cub1=^H, 
 	cud1=\E[B, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, 
@@ -6034,16 +6419,25 @@ att5620|dmd|tty5620|ttydmd|5620|5620 terminal 88 columns,
 	pfx=\E[%p1%d;%p2%l%dq%p2%s, rc=\E8, rev=\E[7m, ri=\E[T, 
 	rin=\E[%p1%dT, rmso=\E[0m, rmul=\E[0m, rs1=\Ec, sc=\E7, 
 	sgr0=\E[0m, smso=\E[7m, smul=\E[4m, 
-att5620-24|dmd-24|teletype dmd 5620 in a 24x80 layer, 
+att5620-24|tty5620-24|dmd-24|teletype dmd 5620 in a 24x80 layer, 
 	lines#24, use=att5620, 
-att5620-34|dmd-34|teletype dmd 5620 in a 34x80 layer, 
+att5620-34|tty5620-34|dmd-34|teletype dmd 5620 in a 34x80 layer, 
 	lines#34, use=att5620, 
+# 5620 layer running the "S" system's downloaded graphics handler:
+att5620-s|tty5620-s|layer|vitty|5620 S layer, 
+	am, 
+	cols#80, it#8, lines#72, 
+	bel=^G, clear=^L, cr=^M, cub1=^H, cud1=^J, 
+	cup=\EY%p2%{32}%+%c%p1%{32}%+%c, cuu1=^K, dl1=\ED, 
+	el=\EK, flash=\E^G, ht=^I, il1=\EI, ind=^J, kbs=^H, kclr=\E[2J, 
+	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, khome=\E[H, 
+	kll=\E[70;1H, 
 
 # Entries for <kf15> thru <kf28> refer to the shifted system pf keys.
 #
 # Entries for <kf29> thru <kf46> refer to the alternate keypad mode
 # keys:  = * / + 7 8 9 - 4 5 6 , 1 2 3 0 . ENTER
-att605|605bct|AT&T 605  80 column  102key keyboard, 
+att605|AT&T 605 80 column 102key keyboard, 
 	am, eo, xon, 
 	cols#80, lines#24, lw#8, nlab#8, wsl#80, 
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, 
@@ -6069,12 +6463,12 @@ att605|605bct|AT&T 605  80 column  102key keyboard,
 	kil1=\E[L, kind=\E[S, knp=\E[U, kpp=\E[V, ll=\E[24H, 
 	mc4=\E[?4i, mc5=\E[?5i, nel=\EE, 
 	pfx=\E[%p1%d;%p2%l%02dq   F%p1%1d           %p2%s, 
-	pln=\E[%p1%d;0;0;0q%p2%\072-16.16s, rc=\E8, rev=\E[7m, 
+	pln=\E[%p1%d;0;0;0q%p2%:-16.16s, rc=\E8, rev=\E[7m, 
 	rmacs=^O, rmir=\E[4l, rmln=\E[2p, rmso=\E[m, rmul=\E[m, 
 	rs2=\Ec\E[?3l, sc=\E7, sgr0=\E[m\017, smacs=\E)0\016, 
 	smir=\E[4h, smln=\E[p, smso=\E[7m, smul=\E[4m, 
 	tsl=\E7\E[25;%i%p1%dx, 
-att605-pc|605bct-pc|ATT 605 in pc term mode, 
+att605-pc|ATT 605 in pc term mode, 
 	acsc=k\277l\332m\300j\331n\305w\302q\304u\264t\303v\301x\263, 
 	cbt=\E[Z, cub1=\E[D, cud1=\E[B, cuf1=\E[C, cuu1=\E[A, 
 	dch1=\E[P, dl1=\E[M, ich1=\E[@, il=\E[L, il1=\E[L, kcbt=\E[Z, 
@@ -6085,14 +6479,14 @@ att605-pc|605bct-pc|ATT 605 in pc term mode,
 	rmsc=400\E[50;0|, smsc=250\E[?11l\E[50;1|, xoffc=g, 
 	xonc=e, 
 	use=att605, 
-att605-w|605bct-w|AT&T 605-w 132 column 102 key keyboard, 
+att605-w|AT&T 605-w 132 column 102 key keyboard, 
 	cols#132, wsl#132, 
 	is1=\E[8;0|\E[?4;5;13;15l\E[13;20l\E[?3;7h\E[12h\E(B\E)0, use=att605, 
 # (att610: I added <rmam>/<smam> based on the init string.  I also
-# added <indn> and <rin> because the BSD file says the 615s have them,
+# added <indn> and <rin> because the BSD file says the att615s have them,
 # and the 615 is like a 610 with a big keyboard, and most of their other
 # smart terminals support the same sequence -- esr)
-att610|610bct|AT&T 610; 80 column; 98key keyboard, 
+att610|AT&T 610; 80 column; 98key keyboard, 
 	am, eslok, hs, mir, msgr, xenl, xon, 
 	cols#80, it#8, lh#2, lines#24, lw#8, nlab#8, wsl#80, 
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, 
@@ -6115,17 +6509,17 @@ att610|610bct|AT&T 610; 80 column; 98key keyboard,
 	kind=\E[S, kri=\E[T, ll=\E[24H, mc4=\E[?4i, mc5=\E[?5i, 
 	nel=\EE, 
 	pfx=\E[%p1%d;%p2%l%02dq   F%p1%1d           %p2%s, 
-	pln=\E[%p1%d;0;0;0q%p2%\072-16.16s, rc=\E8, rev=\E[7m, 
+	pln=\E[%p1%d;0;0;0q%p2%:-16.16s, rc=\E8, rev=\E[7m, 
 	ri=\EM, rin=\E[%p1%dT, rmacs=^O, rmam=\E[?7l, rmir=\E[4l, 
 	rmln=\E[2p, rmso=\E[m, rmul=\E[m, rs2=\Ec\E[?3l, sc=\E7, 
 	sgr=\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1%|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;, 
 	sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smir=\E[4h, 
 	smln=\E[p, smso=\E[7m, smul=\E[4m, tsl=\E7\E[25;%i%p1%dx, 
-att610-w|610bct-w|AT&T 610; 132 column; 98key keyboard, 
+att610-w|AT&T 610; 132 column; 98key keyboard, 
 	cols#132, wsl#132, 
 	is1=\E[8;0|\E[?4;5;13;15l\E[13;20l\E[?3;7h\E[12h, use=att610, 
 
-att610-103k|610-103k|610bct-103k|AT&T 610; 80 column; 103key keyboard, 
+att610-103k|AT&T 610; 80 column; 103key keyboard, 
 	kBEG=\ENB, kCAN=\EOW, kCMD=\EOU, kCPY=\END, kCRT=\EON, 
 	kDC=\ENF, kDL=\ENE, kEND=\ENN, kEOL=\EOA, kEXT=\EOK, 
 	kFND=\EOX, kHLP=\EOM, kMOV=\ENC, kMSG=\EOL, kNXT=\ENH, 
@@ -6140,10 +6534,10 @@ att610-103k|610-103k|610bct-103k|AT&T 610; 80 column; 103key keyboard,
 	krfr=\ENa, krmir=\ENj, krpl=\EOy, krst=\EOB, ksav=\EOo, 
 	kslt=\ENI, kspd=\EOp, kund=\EOs, 
 	use=att610, 
-att610-103k-w|610-103k-w|610bct-103k-w|AT&T 610; 132 column; 103key keyboard, 
+att610-103k-w|AT&T 610; 132 column; 103key keyboard, 
 	cols#132, wsl#132, 
 	is1=\E[8;0|\E[?4;5;13;15l\E[13;20l\E[?3;7h\E[12h, use=att610-103k, 
-att615|615mt|AT&T 615; 80 column; 98key keyboard, 
+att615|AT&T 615; 80 column; 98key keyboard, 
 	kLFT=\E[ A, kRIT=\E[ @, kf15=\EOC, kf16=\EOD, kf17=\EOE, 
 	kf18=\EOF, kf19=\EOG, kf20=\EOH, kf21=\EOI, kf22=\EOJ, 
 	kf23=\ENO, kf24=\ENP, kf25=\ENQ, kf26=\ENR, kf27=\ENS, 
@@ -6152,7 +6546,7 @@ att615|615mt|AT&T 615; 80 column; 98key keyboard,
 	kf38=\EOu, kf39=\EOv, kf40=\EOl, kf41=\EOq, kf42=\EOr, 
 	kf43=\EOs, kf44=\EOp, kf45=\EOn, kf46=\EOM, 
 	use=att610, 
-att615-w|615-w|615mt-w|AT&T 615; 132 column; 98key keyboard, 
+att615-w|AT&T 615; 132 column; 98key keyboard, 
 	kLFT=\E[ A, kRIT=\E[ @, kf15=\EOC, kf16=\EOD, kf17=\EOE, 
 	kf18=\EOF, kf19=\EOG, kf20=\EOH, kf21=\EOI, kf22=\EOJ, 
 	kf23=\ENO, kf24=\ENP, kf25=\ENQ, kf26=\ENR, kf27=\ENS, 
@@ -6161,15 +6555,15 @@ att615-w|615-w|615mt-w|AT&T 615; 132 column; 98key keyboard,
 	kf38=\EOu, kf39=\EOv, kf40=\EOl, kf41=\EOq, kf42=\EOr, 
 	kf43=\EOs, kf44=\EOp, kf45=\EOn, kf46=\EOM, 
 	use=att610-w, 
-att615-103k|615-103k|615mt-103k|AT&T 615; 80 column; 103key keyboard, 
+att615-103k|AT&T 615; 80 column; 103key keyboard, 
 	kLFT=\E[ A, kRIT=\E[ @, 
 	use=att610-103k, 
-att615-103k-w|615-103k-w|615mt-103k-w|AT&T 615; 132 column; 103key keyboard, 
+att615-103k-w|AT&T 615; 132 column; 103key keyboard, 
 	kLFT=\E[ A, kRIT=\E[ @, 
 	use=att610-103k-w, 
 # (att620: I added <rmam>/<smam> based on the init string and
 # <rin>/<indn> from a BSD termcap -- esr)
-att620|620mtg|AT&T 620; 80 column; 98key keyboard, 
+att620|AT&T 620; 80 column; 98key keyboard, 
 	am, eslok, hs, mir, msgr, xenl, xon, 
 	cols#80, it#8, lh#2, lines#24, lw#8, nlab#8, wsl#80, 
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, 
@@ -6198,7 +6592,7 @@ att620|620mtg|AT&T 620; 80 column; 98key keyboard,
 	kf9=\ENo, khome=\E[H, kind=\E[S, kri=\E[T, ll=\E[24H, 
 	mc4=\E[?4i, mc5=\E[?5i, nel=\EE, 
 	pfx=\E[%p1%d;%p2%l%02dq   F%p1%1d           %p2%s, 
-	pln=\E[%p1%d;0;0;0q%p2%\072-16.16s, rc=\E8, rev=\E[7m, 
+	pln=\E[%p1%d;0;0;0q%p2%:-16.16s, rc=\E8, rev=\E[7m, 
 	ri=\EM, rin=\E[%p1%dT, rmacs=\E(B\017, rmam=\E[?7l, 
 	rmir=\E[4l, rmln=\E[2p, rmso=\E[m, rmul=\E[m, 
 	rs2=\Ec\E[?3l, sc=\E7, 
@@ -6206,10 +6600,10 @@ att620|620mtg|AT&T 620; 80 column; 98key keyboard,
 	sgr0=\E[m\E(B\017, smacs=\E)0\016, smam=\E[?7h, 
 	smir=\E[4h, smln=\E[p, smso=\E[7m, smul=\E[4m, 
 	tsl=\E7\E[25;%i%p1%dx, 
-att620-w|620-w|620mtg-w|AT&T 620; 132 column; 98key keyboard, 
+att620-w|AT&T 620; 132 column; 98key keyboard, 
 	cols#132, wsl#132, 
 	is1=\E[8;0|\E[?4;5;13;15l\E[13;20l\E[?3;7h\E[12h, use=att620, 
-att620-103k|620-103k|620mtg-103k|AT&T 620; 80 column; 103key keyboard, 
+att620-103k|AT&T 620; 80 column; 103key keyboard, 
 	kBEG=\ENB, kCAN=\EOW, kCMD=\EOU, kCPY=\END, kCRT=\EON, 
 	kDC=\ENF, kDL=\ENE, kEND=\ENN, kEOL=\EOA, kEXT=\EOK, 
 	kFND=\EOX, kHLP=\EOM, kMOV=\ENC, kMSG=\EOL, kNXT=\ENH, 
@@ -6228,12 +6622,21 @@ att620-103k|620-103k|620mtg-103k|AT&T 620; 80 column; 103key keyboard,
 	ksav=\EOo, kslt=\ENI, kspd=\EOp, kund=\EOs, 
 	use=att620, 
 
-att620-103k-w|620-103k-w|620mtg-103k-w|AT&T 620; 132 column; 103key keyboard, 
+att620-103k-w|AT&T 620; 132 column; 103key keyboard, 
 	cols#132, wsl#132, 
 	is1=\E[8;0|\E[?4;5;13;15l\E[13;20l\E[?3;7h\E[12h, use=att620-103k, 
 
+# AT&T (formerly Teletype) 630 Multi-Tasking Graphics terminal
+# The following SETUP modes are assumed for normal operation:
+#	Local_Echo=Off	Gen_Flow=On	Return=CR	Received_Newline=LF
+#	Font_Size=Large		Non-Layers_Window_Cols=80
+#				Non-Layers_Window_Rows=60
+# Other SETUP modes may be set for operator convenience or communication
+# requirements.  Some capabilities assume a printer attached to the Aux EIA
+# port.  This termcap description is for the Fixed Non-Layers Window.  No
+# delays are specified; use "stty ixon -ixany" to enable DC3/DC1 flow control!
 # (att630: added <ich1>, <blink> and <dim> from a BSD termcap file -- esr)
-att630|5630|5630DMD|630MTG|AT&T 630 windowing terminal, 
+att630|AT&T 630 windowing terminal, 
 	am, da, db, mir, msgr, npc, xon, 
 	cols#80, it#8, lines#60, lm#0, 
 	bel=^G, blink=\E[5m, cbt=\E[Z, clear=\E[H\E[J, cr=^M, 
@@ -6270,7 +6673,7 @@ att630-24|5630-24|5630DMD-24|630MTG-24|AT&T 630 windowing terminal 24 lines,
 # 102, 102+1, or 122 key keyboards
 #       kHOM=\E[2J,
 # (att730: I added <rmam>/<smam> based on the init string -- esr)
-att730|730MTG|AT&T 730 windowing terminal, 
+att730|AT&T 730 windowing terminal, 
 	am, da, db, eslok, hs, mir, msgr, npc, xenl, xon, 
 	cols#80, it#8, lh#2, lines#60, lm#0, lw#8, nlab#24, wsl#80, 
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, 
@@ -6295,13 +6698,13 @@ att730|730MTG|AT&T 730 windowing terminal,
 	kf31=\EOI, kf32=\EOJ, kf33=\ENO, kf34=\ENP, kf35=\ENQ, 
 	kf36=\ENR, kf37=\ENS, kf38=\ENT, kf39=\EOU, kf4=\EOf, 
 	kf40=\EOV, kf41=\EOW, kf42=\EOX, kf43=\EOY, kf44=\EOZ, 
-	kf45=\EO[, kf46=\EO , kf47=\EO], kf48=\EO\^, kf5=\EOg, 
+	kf45=\EO[, kf46=\EO\s, kf47=\EO], kf48=\EO\^, kf5=\EOg, 
 	kf6=\EOh, kf7=\EOi, kf8=\EOj, kf9=\ENo, khome=\E[H, 
 	kich1=\E[@, kil1=\E[L, kind=\E[S, kri=\E[T, 
 	mc0=\E[?19h\E[0i, mc4=\E[?4i, mc5=\E[?5i, nel=\EE, 
-	pfx=\E[%?%p1%{25}%<%t%p1%e%p1%{24}%-%;%d;%p2%l%02d%?%p1%{25}%<%tq   SYS     F%p1%\072-2d  %e;0;3q%;%p2%s, 
-	pfxl=\E[%p1%d;%p2%l%02d;0;0q%p3%\072-16.16s%p2%s, 
-	pln=\E[%p1%d;0;0;0q%p2%\072-16.16s, rc=\E8, 
+	pfx=\E[%?%p1%{25}%<%t%p1%e%p1%{24}%-%;%d;%p2%l%02d%?%p1%{25}%<%tq   SYS     F%p1%:-2d  %e;0;3q%;%p2%s, 
+	pfxl=\E[%p1%d;%p2%l%02d;0;0q%p3%:-16.16s%p2%s, 
+	pln=\E[%p1%d;0;0;0q%p2%:-16.16s, rc=\E8, 
 	rep=%p1%c\E[%p2%{1}%-%db, rev=\E[7m, ri=\EM, rmacs=^O, 
 	rmam=\E[?7l, rmir=\E[4l, rmln=\E[?13h, rmso=\E[27m, 
 	rmul=\E[24m, rmxon=\E[?21l, rs2=\Ec\E[?3l, sc=\E7, 
@@ -6570,16 +6973,18 @@ ampex210|a210|ampex a210,
 	kf2=^A2\r, kf3=^A3\r, kf4=^A4\r, kf5=^A5\r, kf6=^A6\r, 
 	kf7=^A7\r, kf8=^A8\r, kf9=^A9\r, khome=^^, 
 	tsl=\E.0\Eg\E}\Ef, use=adm+sgr, 
-# (ampex219: I added <rmam>/<smam> based on the init string,
+# (ampex219: I added <rmam>/<smam> based on the init string, added <cvvis>
+# from ampex219w, added <cnorm>=\E[?3l, irresistibly suggested by <cvvis>,
 # and moved the padding to be *after* the caps -- esr)
 ampex219|ampex-219|amp219|Ampex with Automargins, 
 	hs, xenl, 
 	cols#80, it#8, lines#24, 
 	bel=^G, blink=\E[5m$<2>, bold=\E[1m$<2>, cbt=\E[Z, 
-	clear=\E[H\E[2J$<50>, cr=^M, csr=%i\E[%p1%2d;%p2%2dr, 
-	cub1=^H, cud1=\E[B, cuf1=\E[C$<2>, 
-	cup=\E[%i%p1%d;%p2%dH$<5>, cuu1=\E[A$<2>, dim=\E[1m, 
-	ed=\E[J$<50>, el=\E[K$<3>, home=\E[H, ht=^I, ind=^J, 
+	clear=\E[H\E[2J$<50>, cnorm=\E[?3l, cr=^M, 
+	csr=%i\E[%p1%2d;%p2%2dr, cub1=^H, cud1=\E[B, 
+	cuf1=\E[C$<2>, cup=\E[%i%p1%d;%p2%dH$<5>, 
+	cuu1=\E[A$<2>, cvvis=\E[?3h, dim=\E[1m, ed=\E[J$<50>, 
+	el=\E[K$<3>, home=\E[H, ht=^I, ind=^J, 
 	is2=\E>\E[?1l\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, 
 	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf0=\E[21~, 
 	kf1=\E[7~, kf2=\E[8~, kf3=\E[9~, kf4=\E[10~, kf5=\E[11~, 
@@ -6589,7 +6994,7 @@ ampex219|ampex-219|amp219|Ampex with Automargins,
 	smkx=\E=, smso=\E[7m$<2>, smul=\E[4m$<2>, 
 ampex219w|ampex-219w|amp219w|Ampex 132 cols, 
 	cols#132, lines#24, 
-	bel=^G, cr=^M, cud1=^J, cvvis=\E[?3h, ind=^J, 
+	bel=^G, cr=^M, cud1=^J, ind=^J, 
 	is2=\E>\E[?3h\E[?4l\E[?5l\E[?7h\E[?8h, use=ampex219, 
 # (ampex232: removed <if=/usr/share/tabset/ampex>, no file and no <hts> --esr) 
 ampex232|ampex-232|Ampex Model 232, 
@@ -6613,8 +7018,15 @@ ampex232w|Ampex Model 232 / 132 columns,
 #
 # Ann Arbor made dream terminals for hackers -- large screen sizes and huge
 # numbers of function keys.  At least some used monitors in portrait mode,
-# allowing up to 76-character screen heights!  They can't be found on the Web;
-# I fear they're long dead.  R.I.P.
+# allowing up to 76-character screen heights!  They were reachable at:
+#
+#	Ann Arbor Terminals
+#	6175 Jackson Road
+#	Ann Arbor, MI 48103
+#	(313)-663-8000
+#
+# But in 1996 the phone number reaches some kitschy retail shop, and Ann Arbor
+# can't be found on the Web; I fear they're long dead.  R.I.P.
 #
 
 
@@ -6738,6 +7150,14 @@ annarbor4080|aa4080|ann arbor 4080,
 	cuu1=^N, home=^K, ht=^I, hts=^]^P1, ind=^J, kbs=^^, kcub1=^H, 
 	kcud1=^J, kcuf1=^_, kcuu1=^N, khome=^K, tbc=^\^P^P, 
 
+# Strange Ann Arbor terminal from BRL
+aas1901|Ann Arbor K4080 w/S1901 mod, 
+	am, 
+	cols#80, lines#40, 
+	bel=^G, clear=^L, cr=^M, cub1=^H, cud1=^J, cuf1=^_, cuu1=^N, 
+	home=^K, ht=^I, ind=^J, kbs=^H, kcub1=^H, kcud1=^J, ll=^O\200c, 
+	nel=^M^J, 
+
 # If you're using the GNU termcap library, add
 #	:cS=\E[%p1%d;%p2%d;%p3%d;%p4%dp:
 # to these capabilities.  This is the nonstandard GNU termcap scrolling
@@ -6902,7 +7322,7 @@ guru-rv|guru-33-rv|ann arbor guru/33 lines+reverse video,
 guru+s|guru status line, 
 	eslok, hs, 
 	dsl=\E7\E[;0p\E[1;1H\E[K\E[H\E8\r\n\E[K, fsl=\E[>51l, 
-	rmcup=\E[255;1p\E[255;1H\E[K, 
+	rmcup=\E[255;1p\E[255;1H\E[K, smcup=, 
 	tsl=\E[>51h\E[1;%p1%dH\E[2K, 
 guru-nctxt|guru with no saved context, 
 	smcup=\E[H\E[J$<156>\E[33p\E[255;1H\E[K, use=guru, 
@@ -6957,17 +7377,18 @@ aaa-rv-unk|ann arbor unknown type,
 # ADDS itself is long gone.  ADDS was bought by NCR, and the same group made
 # ADDS and NCR terminals.  When AT&T and NCR merged, the engineering for
 # terminals was merged again.  Then AT&T sold the terminal business to
-# SunRiver.  The engineers from Teletype, AT&T terminals, ADDS,
-# and NCR (who are still there as of early 1995) are at:
+# SunRiver, which later changed its  name to Boundless Technologies.  The
+# engineers from Teletype, AT&T terminals, ADDS, and NCR (who are still there
+# as of early 1995) are at:
 #
-#	SunRiver Data Systems
+#	Boundless Technologies
 #	100 Marcus Boulevard
 #	Hauppauge, NY 11788-3762
 #	Vox: (800)-231-5445
 #	Fax: (516)-342-7378
 #
 # Their voice mail used to describe the place as "SunRiver (formerly ADDS)". 
-# In 1995 SunRiver acquired DEC's terminals business.
+# In 1995 Boundless acquired DEC's terminals business.  
 #
 
 # Regent: lowest common denominator, works on all regents.
@@ -6976,7 +7397,7 @@ regent|Adds Regent Series,
 	am, 
 	cols#80, lines#24, 
 	bel=^G, clear=^L, cr=^M, cub1=^U, cud1=^J, cuf1=^F, cuu1=^Z, 
-	home=\EY  , ind=^J, ll=^A, 
+	home=\EY\s\s, ind=^J, ll=^A, 
 # Regent 100 has a bug where if computer sends escape when user is holding
 # down shift key it gets confused, so we avoid escape.
 regent100|Adds Regent 100, 
@@ -7022,7 +7443,7 @@ screwpoint|adds viewpoint with ^O bug,
 
 # From: Jay S. Rouman <jsr@dexter.mi.org> 5 Jul 92
 # The <civis>/<cnorm>/<sgr>/<sgr0> strings were added by ESR from specs.  
-# Theory; the 3a+ wants \E0%c to set highlights, where normal=01000000,
+# Theory; the vp3a+ wants \E0%c to set highlights, where normal=01000000,
 # underline=01100000, rev=01010000, blink=01000010,dim=01000001,
 # invis=01000100 and %c is the logical or of desired attributes.
 # There is also a `tag bit' enabling attributes, set by \E) and unset by \E(.
@@ -7053,14 +7474,14 @@ vp90|viewpoint90|adds viewpoint 90,
 	cols#80, lines#24, 
 	clear=\EG\Ek, cub1=^H, cud1=^J, cuf1=^F, 
 	cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=^Z, dch1=\EE, 
-	dl1=\El, ed=\Ek, el=\EK, home=\EY  , ht=^I, ich1=\EF \EF\025, 
-	ind=^J, kbs=^H, kcub1=^U, kcud1=^J, kcuf1=^F, kcuu1=^Z, 
-	kf0=^B1\r, kf1=^B2\r, kf10=^B;\r, kf2=^B3\r, kf3=^B4\r, 
-	kf4=^B5\r, kf5=^B6\r, kf6=^B7\r, kf7=^B8\r, kf8=^B9\r, 
-	kf9=^B\072\r, khome=^A, lf0=F1, lf1=F2, lf10=F11, lf2=F3, 
-	lf3=F4, lf4=F5, lf5=F6, lf6=F7, lf7=F8, lf8=F9, lf9=F10, ll=^A, 
-	rmso=\ER\E0@\EV, rmul=\ER\E0@\EV, sgr0=\ER\E0@\EV, 
-	smso=\ER\E0Q\EV, smul=\ER\E0`\EV, 
+	dl1=\El, ed=\Ek, el=\EK, home=\EY\s\s, ht=^I, 
+	ich1=\EF \EF\025, ind=^J, kbs=^H, kcub1=^U, kcud1=^J, 
+	kcuf1=^F, kcuu1=^Z, kf0=^B1\r, kf1=^B2\r, kf10=^B;\r, 
+	kf2=^B3\r, kf3=^B4\r, kf4=^B5\r, kf5=^B6\r, kf6=^B7\r, 
+	kf7=^B8\r, kf8=^B9\r, kf9=^B\:\r, khome=^A, lf0=F1, lf1=F2, 
+	lf10=F11, lf2=F3, lf3=F4, lf4=F5, lf5=F6, lf6=F7, lf7=F8, lf8=F9, 
+	lf9=F10, ll=^A, rmso=\ER\E0@\EV, rmul=\ER\E0@\EV, 
+	sgr0=\ER\E0@\EV, smso=\ER\E0Q\EV, smul=\ER\E0`\EV, 
 # Note: if return acts weird on a980, check internal switch #2
 # on the top chip on the CONTROL pc board.
 adds980|a980|adds consul 980, 
@@ -7103,6 +7524,35 @@ cit101|citc|C.itoh fast vt100,
 	rmam=\E[?7l, rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m, 
 	sgr0=\E[m, smam=\E[?7h, smkx=\E[?1h\E=, smso=\E[7m, 
 	smul=\E[4m, 
+# CIE Terminals CIT-101e from Geoff Kuenning <callan!geoff> via BRL
+# The following termcap entry was created from the Callan cd100 entry.  The
+# last two lines (with the capabilities in caps) are used by RM-cobol to allow
+# full selection of combinations of reverse video, underline, and blink.
+# (cit101e: emoved unknown :f0=\EOp:f1=\EOq:f2=\EOr:f3=\EOs:f4=\EOt:f5=\EOu:\
+# f6=\EOv:f7=\EOw:f8=\EOx:f9=\EOy:AB=\E[0;5m:AL=\E[m:AR=\E[0;7m:AS=\E[0;5;7m:\
+# :NB=\E[0;1;5m:NM=\E[0;1m:NR=\E[0;1;7m:NS=\E[0;1;5;7m: -- esr)
+cit101e|C. Itoh CIT-101e, 
+	am, mir, msgr, 
+	cols#80, it#8, lines#24, 
+	acsc=, clear=\E[H\E[J, cnorm=, csr=\E[%i%p1%2d;%p2%2dr, 
+	cud1=\E[B, cuf1=\E[C, cup=\E[%i%p1%2d;%p2%2dH, cuu1=\E[A, 
+	cvvis=\E[?1l\E[?4l\E[?7h, dch1=\E[P, dl1=\E[M, ed=\E[J, 
+	el=\E[K, if=/usr/share/tabset/vt100, il1=\E[L, 
+	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf0=\EOT, 
+	kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\EOm, kf6=\EOl, 
+	kf7=\EOM, kf8=\EOn, rc=\E8, ri=\EM, rmacs=^O, rmir=\E[4l, 
+	rmkx=\E>, rmso=\E[m, rmul=\E[m, sc=\E7, smacs=^N, smir=\E[4h, 
+	smkx=\E=, smso=\E[7m, smul=\E[4m, 
+cit101e-n|CIT-101e w/o am, 
+	am@, 
+	cvvis=\E[?1l\E[?4l\E[?7l, kbs=^H, kcub1=^H, kcud1=^J, use=cit101e, 
+cit101e-132|CIT-101e, 132 cols, 
+	cols#132, 
+	kbs=^H, kcub1=^H, kcud1=^J, use=cit101e, 
+cit101e-n132|CIT-101e, 132 cols w/o am, 
+	am@, 
+	cols#132, 
+	cvvis=\E[?1l\E[?4l\E[?7l, kbs=^H, kcub1=^H, kcud1=^J, use=cit101e, 
 # CIE Terminals CIT-500 from BRL
 # The following SET-UP modes are assumed for normal operation:
 #	GENERATE_XON/XOFF:YES	DUPLEX:FULL		NEWLINE:OFF
@@ -7123,15 +7573,15 @@ cit500|CIE Terminals CIT-500,
 	cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, 
 	cuu=\E[%p1%dA, cuu1=\EM, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, 
 	ed=\EJ, el=\EK, home=\E[H, ht=^I, hts=\EH, il=\E[%p1%dL, 
-	il1=\E[L, ind=^J, is2=\E<\E)0, kIC=\E[4h, kbs=^H, kcbt=\E[Z, 
-	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kdch1=\E[P, 
-	kdl1=\E[M, ked=\EJ, kel=\EK, kf0=\EOP, kf1=\EOQ, kf2=\EOR, 
-	kf3=\EOS, kf4=\EOU, kf5=\EOV, kf6=\EOW, kf7=\EOX, kf8=\EOY, 
-	kf9=\EOZ, khome=\E[H, kich1=\E[4h, kil1=\E[L, krmir=\E[4l, 
-	lf0=PF1, lf1=PF2, lf2=PF3, lf3=PF4, lf4=F15, lf5=F16, lf6=F17, 
-	lf7=F18, lf8=F19, lf9=F20, ll=\E[64H, nel=\EE, rc=\E8, 
-	rev=\E[7m, ri=\EM, rmacs=^O, rmam=\E[?7l, rmir=\E[4l, 
-	rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m, 
+	il1=\E[L, ind=^J, is2=\E<\E)0, kbs=^H, kcbt=\E[Z, kcub1=\EOD, 
+	kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kdch1=\E[P, kdl1=\E[M, 
+	ked=\EJ, kel=\EK, kf0=\EOP, kf1=\EOQ, kf2=\EOR, kf3=\EOS, 
+	kf4=\EOU, kf5=\EOV, kf6=\EOW, kf7=\EOX, kf8=\EOY, kf9=\EOZ, 
+	khome=\E[H, kich1=\E[4h, kil1=\E[L, krmir=\E[4l, lf0=PF1, 
+	lf1=PF2, lf2=PF3, lf3=PF4, lf4=F15, lf5=F16, lf6=F17, lf7=F18, 
+	lf8=F19, lf9=F20, ll=\E[64H, nel=\EE, rc=\E8, rev=\E[7m, 
+	ri=\EM, rmacs=^O, rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>, 
+	rmso=\E[m, rmul=\E[m, 
 	rs1=\E<\E2\E[20l\E[?6l\E[r\E[m\E[q\E(B\017\E)0\E>, 
 	sc=\E7, sgr0=\E[m, smacs=^N, smam=\E[?7h, smir=\E[4h, 
 	smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g, 
@@ -7140,7 +7590,7 @@ cit500|CIE Terminals CIT-500,
 citoh|ci8510|8510|c.itoh 8510a, 
 	cols#80, it#8, 
 	bold=\E!, cub1@, 
-	is2=\E(009\054017\054025\054033\054041\054049\054057\054065\054073., 
+	is2=\E(009\,017\,025\,033\,041\,049\,057\,065\,073., 
 	rep=\ER%p2%03d%p1%c, ri=\Er, rmul=\EY, sgr0=\E"\EY, 
 	smul=\EX, 
 	use=lpr, 
@@ -7149,11 +7599,11 @@ citoh-pica|citoh in pica,
 citoh-elite|citoh in elite, 
 	cols#96, 
 	is1=\EE, 
-	is2=\E(009\054017\054025\054033\054041\054049\054057\054065\054073\054081\054089., use=citoh, 
+	is2=\E(009\,017\,025\,033\,041\,049\,057\,065\,073\,081\,089., use=citoh, 
 citoh-comp|citoh in compressed, 
 	cols#136, 
 	is1=\EQ, 
-	is2=\E(009\054017\054025\054033\054041\054049\054057\054065\054073\054081\054089\054097\054105\054113\054121\054129., use=citoh, 
+	is2=\E(009\,017\,025\,033\,041\,049\,057\,065\,073\,081\,089\,097\,105\,113\,121\,129., use=citoh, 
 # citoh has infinite cols because we don't want lp ever inserting \n\t**.
 citoh-prop|citoh-ps|ips|citoh in proportional spacing mode, 
 	cols#32767, 
@@ -7173,35 +7623,71 @@ cdc456|cdc 456 terminal,
 	bel=^G, clear=^Y^X, cr=^M, cub1=^H, cud1=^J, cuf1=^L, 
 	cup=\E1%p1%{32}%+%c%p2%{32}%+%c, cuu1=^Z, dl1=\EJ, ed=^X, 
 	el=^V, home=^Y, il1=\EL, ind=^J, 
+
+# Assorted CDC terminals from BRL (improvements by DAG & Ferd Brundick)
+cdc721|CDC Viking, 
+	am, 
+	cols#80, lines#24, 
+	clear=^L, cuf1=^X, cup=\002%p2%{32}%+%c%p1%{32}%+%c, 
+	cuu1=^W, el=^K, home=^Y, kcub1=^H, kcud1=^J, kcuf1=^I, 
+	kcuu1=^W, khome=^Y, 
+cdc721ll|CDC Vikingll, 
+	am, 
+	cols#132, lines#24, 
+	clear=^L, cuf1=^X, cup=\002%p2%{32}%+%c%p1%{32}%+%c, 
+	cuu1=^W, el=^K, home=^Y, kcub1=^H, kcud1=^J, kcuf1=^I, 
+	kcuu1=^W, khome=^Y, 
+# (cdc752: the BRL entry had :ll=\E1  ^Z: commented out
+cdc752|CDC 752, 
+	am, bw, xhp, 
+	cols#80, lines#24, 
+	bel=^G, clear=\030\E1\s\s, cr=^M, cub1=^H, cud1=^J, cuf1=^U, 
+	cup=\E1%p2%{32}%+%c%p1%{32}%+%c, cuu1=^Z, el=^V, 
+	home=\E1\s\s, ind=^J, ll=^Y, rs1=\E1  \030\002\003\017, 
+# CDC 756
+# The following switch/key settings are assumed for normal operation:
+#	96 chars	SCROLL		FULL duplex	not BLOCK
+# Other switches may be set according to communication requirements.
+# Insert/delete-character cannot be used, as the whole display is affected.
+# "so" & "se" are commented out until jove handles "sg" correctly.
+cdc756|CDC 756, 
+	am, bw, 
+	cols#80, lines#24, 
+	bel=^G, clear=^Y^X, cr=^M, cub1=^H, cud1=^J, cuf1=^U, 
+	cup=\E1%p2%{32}%+%c%p1%{32}%+%c, cuu1=^Z, 
+	dl1=\EJ$<6*/>, ed=^X, el=^V, home=^Y, il1=\EL$<6*/>, ind=^J, 
+	kbs=^H, kcub1=^H, kcud1=^J, kcuf1=^U, kcuu1=^Z, kdch1=\EI, 
+	kdl1=\EL, ked=^X, kel=^V, kf0=\EA, kf1=\EB, kf2=\EC, kf3=\ED, 
+	kf4=\EE, kf5=\EF, kf6=\EG, kf7=\EH, kf8=\Ea, kf9=\Eb, khome=^Y, 
+	khts=^O, kich1=\EK, kil1=\EL, lf0=F1, lf1=F2, lf2=F3, lf3=F4, 
+	lf4=F5, lf5=F6, lf6=F7, lf7=F8, lf8=F9, lf9=F10, ll=^Y^Z, 
+	rs1=\031\030\002\003\017, 
 #
 # CDC 721 from Robert Viduya, Ga. Tech. <ihnp4!gatech!gitpyr!robert> via BRL.
 #
 # Part of the long initialization string defines the "DOWN" key to the left
-# of the tab key to send an ESC.  The real ESC key is position way out in right
-# field.
+# of the tab key to send an ESC.  The real ESC key is positioned way out 
+# in right field.
 #
 # The termcap won't work in 132 column mode due to the way it it moves the
 # cursor.  Termcap doesn't have the capability (as far as I could tell) to
 # handle the 721 in 132 column mode.
 #
-# Personal preference: the key definitions have been commented out by a
-# period before the name.  Remove them if you want.
-#
 # (cdc721: changed :ri: to :sr: -- esr)
 cdc721-esc|Control Data 721, 
 	am, bw, msgr, xon, 
 	cols#80, it#8, lines#30, 
-	bel=^G, blink=^N, cbt=^^^K, clear=^L, cr=^M, cub1=^H, cud1=^Z, 
+	bel=^G, blink=^N, cbt=^^^K, clear=^L, cub1=^H, cud1=^Z, 
 	cuf1=^X, cup=\002%p2%{32}%+%c%p1%{32}%+%c, cuu1=^W, 
-	dch1=^^N, dim=^\, dl1=^^Q, ed=^^P, el=^K, home=^Y, ht=^I, 
-	hts=^^^RW, ich1=^^O, il1=^^R, ind=\036W =\036U, 
-	invis=^^^R[, 
+	dch1=^^N, dim=^\, dl1=^^Q, ed=^^P, el=^K, home=^Y, hts=^^^RW, 
+	ich1=^^O, il1=^^R, ind=\036W =\036U, invis=^^^R[, 
 	is2=\036\022B\003\036\035\017\022\025\035\036E\036\022H\036\022J\036\022L\036\022N\036\022P\036\022Q\036\022\\\036\022\^\036\022b\036\022i\036W =\036\022Z\036\011C1-` `!k/o, 
-	kbs=^H, kcub1=^H, kcud1=^J, kf0=^^q, kf1=^^r, kf2=^^s, kf3=^^t, 
-	kf4=^^u, kf5=^^v, kf6=^^w, kf7=^^x, kf8=^^y, kf9=^^z, ll=^B =, 
-	nel=\r\036W =\036U, rev=^^D, ri=\036W =\036V, rmir=, 
-	rmso=^^E, rmul=^], sgr0=\017\025\035\036E\036\022\\, 
-	smir=, smso=^^D, smul=^\, tbc=^^^RY, 
+	kbs=^H, kcub1=^H, kcud1=^Z, kcuf1=^X, kcuu1=^W, kf0=^^q, 
+	kf1=^^r, kf2=^^s, kf3=^^t, kf4=^^u, kf5=^^v, kf6=^^w, kf7=^^x, 
+	kf8=^^y, kf9=^^z, khome=^Y, ll=^B =, rev=^^D, 
+	ri=\036W =\036V, rmir=, rmkx=^^^Rl, rmso=^^E, rmul=^], 
+	sgr0=\017\025\035\036E\036\022\\, smir=, smkx=^^^Rk, 
+	smso=^^D, smul=^\, tbc=^^^RY, 
 
 #### Getronics
 #
@@ -7308,12 +7794,12 @@ c108-4p|concept108-4p|concept 108 w/4 pages,
 	pb@, 
 	acsc=l\\qLkTxUmMjE, cnorm=\Ew, cr=^M, 
 	cup=\Ea%p1%?%p1%{95}%>%t\001%{96}%-%;%{32}%+%c%p2%?%p2%{95}%>%t\001%{96}%-%;%{32}%+%c, 
-	cvvis=\EW, dch1=\E 1$<16*>, dsl=\E ;\177, fsl=\Ee\E z , 
+	cvvis=\EW, dch1=\E 1$<16*>, dsl=\E ;\177, fsl=\Ee\E z\s, 
 	ind=^J, is1=\EK\E!\E F, 
 	is3=\EU\E z"\Ev\177 !p\E ;"\E z \Ev  \001 p\Ep\n, 
-	rmacs=\Ej , rmcup=\Ev  \001 p\Ep\r\n, smacs=\Ej!, 
+	rmacs=\Ej\s, rmcup=\Ev  \001 p\Ep\r\n, smacs=\Ej!, 
 	smcup=\EU\Ev  8p\Ep\r\E\025, 
-	tsl=\E z"\E?\E\005\EE\Ea %+ , use=c100, 
+	tsl=\E z"\E?\E\005\EE\Ea %+\s, use=c100, 
 c108-rv|c108-rv-8p|concept 108 w/8 pages in reverse video, 
 	rmcup=\Ev  \002 p\Ep\r\n, smcup=\EU\Ev  8p\Ep\r, 
 	use=c108-rv-4p, 
@@ -7373,19 +7859,19 @@ c100|concept100|concept|c104|c100-4p|hds concept 100,
 	ed=\E\005$<16*>, el=\E\025$<16>, flash=\Ek$<200>\EK, 
 	ht=\011$<8>, il1=\E\022$<3*>, ind=^J, invis=\EH, ip=$<16*>, 
 	is1=\EK, 
-	is2=\EU\Ef\E7\E5\E8\El\ENH\E\200\Eo&\200\Eo'\E\Eo!\200\E\007!\E\010A@ \E4#\072"\E\072a\E4#;"\E\072b\E4#<"\E\072c, 
+	is2=\EU\Ef\E7\E5\E8\El\ENH\E\200\Eo&\200\Eo'\E\Eo!\200\E\007!\E\010A@ \E4#\:"\E\:a\E4#;"\E\:b\E4#<"\E\:c, 
 	is3=\Ev    $<6>\Ep\n, kbs=^H, kcbt=\E', kctab=\E_, 
 	kcub1=\E>, kcud1=\E<, kcuf1=\E=, kcuu1=\E;, kdch1=\E^Q, 
 	kdl1=\E^B, ked=\E^C, kel=\E^S, kf1=\E5, kf2=\E6, kf3=\E7, 
-	kf4=\E8, kf5=\E9, kf6=\E\072a, kf7=\E\072b, kf8=\E\072c, 
-	khome=\E?, khts=\E], kich1=\E^P, kil1=\E^R, kind=\E[, 
-	knp=\E-, kpp=\E., kri=\E\\, krmir=\E\200, 
-	mc4=\036o \E\EQ!\EYP\027, 
+	kf4=\E8, kf5=\E9, kf6=\E\:a, kf7=\E\:b, kf8=\E\:c, khome=\E?, 
+	khts=\E], kich1=\E^P, kil1=\E^R, kind=\E[, knp=\E-, kpp=\E., 
+	kri=\E\\, krmir=\E\200, mc4=\036o \E\EQ!\EYP\027, 
 	mc5=\EQ"\EY(\027\EYD\Eo \036, prot=\EI, 
 	rep=\Er%p1%c%p2%{32}%+%c$<.2*>, rev=\ED, 
-	rmcup=\Ev    $<6>\Ep\r\n, rmir=\E  , rmkx=\Ex, rmso=\Ed, 
-	rmul=\Eg, sgr0=\EN@, smcup=\EU\Ev  8p\Ep\r\E\025$<16>, 
-	smir=\E^P, smkx=\EX, smso=\ED, smul=\EG, 
+	rmcup=\Ev    $<6>\Ep\r\n, rmir=\E\s\s, rmkx=\Ex, 
+	rmso=\Ed, rmul=\Eg, sgr0=\EN@, 
+	smcup=\EU\Ev  8p\Ep\r\E\025$<16>, smir=\E^P, smkx=\EX, 
+	smso=\ED, smul=\EG, 
 c100-rv|c100-rv-4p|concept100-rv|c100 rev video, 
 	cnorm@, cvvis@, flash=\EK$<200>\Ek, is1=\Ek, rmso=\Ee, 
 	smso=\EE, 
@@ -7409,7 +7895,7 @@ avt-ns|concept avt no status line,
 	hpa=\E[%p1%{1}%+%dG, ht=\011$<4>, hts=\EH, ich=\E[%p1%d@, 
 	ich1=\E[@, il=\E[%p1%dL$<4*>, il1=\E[L$<4>, ind=\n$<8>, 
 	invis=\E8m, ip=$<4>, is1=\E[=103l\E[=205l, 
-	is2=\E[1*q\E[2!t\E[7!t\E[=4;101;119;122l\E[=107;118;207h\E)1\E[1Q\EW\E[!y\E[!z\E>\E[0\0720\07232!r\E[0*w\E[w\E2\r\n\E[2;27!t, 
+	is2=\E[1*q\E[2!t\E[7!t\E[=4;101;119;122l\E[=107;118;207h\E)1\E[1Q\EW\E[!y\E[!z\E>\E[0\:0\:32!r\E[0*w\E[w\E2\r\n\E[2;27!t, 
 	kbs=^H, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, 
 	kdch1=\E^B\r, ked=\E^D\r, kf1=\EOP, kf2=\EOQ, kf3=\EOR, 
 	kf4=\EOS, khome=\E[H, kich1=\E^A\r, kil1=\E^C\r, ll=\E[24H, 
@@ -7501,6 +7987,14 @@ dg200|data general dasher 200,
 	kf2=^^r, kf3=^^s, kf4=^^t, kf5=^^u, kf6=^^v, kf7=^^w, kf8=^^x, 
 	kf9=^^y, khome=^H, lf0=f10, nel=^J, rmso=^^E, rmul=^U, 
 	smso=^^D, smul=^T, 
+# Data General 210/211 (and 410?)	from Lee Pearson (umich!lp) via BRL
+dg210|dg-ansi|Data General 210/211, 
+	am, 
+	cols#80, lines#24, 
+	clear=\E[2J, cud1=\E[B, cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, 
+	ed=\E[J, el=\E[K, home=\E[H, kcub1=\E[D, kcud1=\E[B, 
+	kcuf1=\E[C, kcuu1=\E[A, khome=\E[H, nel=\r\E[H\E[A\n, 
+	rmso=\E[0;m, rmul=\E[0;m, smso=\E[7;m, smul=\E[4;m, 
 # From: Peter N. Wan <ihnp4!gatech!gacsr!wan>
 # courtesy of Carlos Rucalde of Vantage Software, Inc.
 # (dg211: this had <cup=\020%r%.%>., which was an ancient termcap hangover.
@@ -7510,11 +8004,9 @@ dg211|Data General d211,
 	kf4@, kf5@, kf6@, kf7@, kf8@, kf9@, lf0@, nel=^M^Z, rmcup=^L, 
 	rmso=\036E$<\200/>, smcup=^L^R, smso=\036D$<5/>, 
 	use=dg200, 
-
 # dg450 from cornell
 dg450|dg6134|data general 6134, 
 	cub1@, cuf1=^X, use=dg200, 
-
 # Note: lesser Dasher terminals will not work with vi because vi insists upon
 # having a command to move straight down from any position on the bottom line
 # and scroll the screen up, or a direct vertical scroll command.  The 460 and
@@ -7541,7 +8033,7 @@ dg460-ansi|Data General Dasher 460 in ANSI-mode,
 # Data General 605x     
 # Ought to work for a Model 6242, Type D210 as well as a 605x.
 # Note that the cursor-down key transmits ^Z.  Job control users, beware!
-# This also matches a posted description of something called A `Dasher 100'
+# This also matches a posted description of something called a `Dasher 100'
 # so there's a dg100 alias here. 
 # (dg6053: the 4.4BSD file had <cub1=^H>, <cud1=^J>, <cuf1=^S>. -- esr) 
 dg6053|dg100|data general 6053, 
@@ -7551,12 +8043,31 @@ dg6053|dg100|data general 6053,
 	cup=\020%p2%c%p1%c, cuu1=^W, cvvis=^L^R, el=^K, home=^H, 
 	ht=^I, is2=^R, kbs=^Y, kcub1=^Y, kcud1=^Z, kcuf1=^X, kcuu1=^W, 
 	kf0=^^q, kf1=^^r, kf2=^^s, kf3=^^t, kf4=^^u, kf5=^^v, kf6=^^w, 
-	kf7=^^x, kf8=^^y, khome=^H, nel=^M^Z, rmcup=^L, rmso=\200^^E, 
+	kf7=^^x, kf8=^^y, kf9=^^z, khome=^H, rmcup=^L, rmso=\200^^E, 
 	rmul=^U, smcup=^L^R, smso=\200\200\200\200\200\036D, 
 	smul=^T, 
 
 #### Datamedia (dm)
 #
+# Datamedia was headquartered in Nashua, New Hampshire in 1993.
+# As of early 1996, at least one company called `Datamedia' has been taken
+# over by:
+#
+#    Axent Technologies, Inc.
+#    2400 Research Boulevard
+#    Rockville, Maryland 20850
+#    voice: +1 301/258-5043
+#      fax: +1 301/330-5756
+#    email: <info@axent.com>
+#
+# makers of OmniGuard client/server security software.  They are a software
+# only company and no longer make terminals.  However, the operator there
+# told me that she had once spoken to a customer looking for Datamedia
+# terminals who'd mentioned a Datamedia in New Jersey.  This is backed up
+# by comp.terminals poosting describing the ID plate on the back of a
+# "Datamedia 3000" terminal.  Was this an earlier incarnation of Axent?
+# Inquiring minds want to know...
+#
 
 cs10|colorscan|Datamedia Color Scan 10, 
 	msgr, 
@@ -7707,6 +8218,7 @@ excel62-rv|excel64-rv|datamedia Excel 62 in reverse video mode,
 #
 # Current Falco models as of 1995 are generally ANSI-compatible and support
 # emulations of DEC VT-series, Wyse, and Televideo types.
+#
 
 # Test version for Falco ts-1. See <arpavax.hickman@ucb> for info
 # This terminal was released around 1983 and was discontinued long ago.
@@ -7769,22 +8281,22 @@ beacon|FCG Beacon System,
 	am, da, db, 
 	cols#80, lines#32, 
 	bel=\ESTART\r\E37\r\EEND\r$<1>, 
-	blink=\ESTART\r\E61\0541\r\EEND\r, clear=\EZ$<10>, 
-	cr=^M, cub1=^H, cud1=^J, cuf1=\EV, 
+	blink=\ESTART\r\E61\,1\r\EEND\r, clear=\EZ$<10>, cr=^M, 
+	cub1=^H, cud1=^J, cuf1=\EV, 
 	cup=\E=%p1%{32}%+%c%p2%{32}%+%c$<20>, cuu1=\EU, 
 	dch1=\EW, dl1=\ER, el=\ET, home=\EH$<10>, ich1=\EQ, il1=\EE, 
-	ind=^J, rev=\ESTART\r\E59\0541\r\EEND\r, 
-	rmso=\ESTART\r\E70\0540\r\EEND\r$<20>, 
-	rmul=\ESTART\r\E60\0540\r\EEND\r, 
-	sgr0=\ESTART\r\E78\r\E70\0540\r\EEND\r$<20>, 
-	smcup=\ESTART\r\E2\0540\r\E12\r\EEND\r$<10>, 
-	smso=\ESTART\r\E70\0546\r\EEND\r$<20>, 
-	smul=\ESTART\r\E60\0541\r\EEND\r, 
+	ind=^J, rev=\ESTART\r\E59\,1\r\EEND\r, rmcup=, 
+	rmso=\ESTART\r\E70\,0\r\EEND\r$<20>, 
+	rmul=\ESTART\r\E60\,0\r\EEND\r, 
+	sgr0=\ESTART\r\E78\r\E70\,0\r\EEND\r$<20>, 
+	smcup=\ESTART\r\E2\,0\r\E12\r\EEND\r$<10>, 
+	smso=\ESTART\r\E70\,6\r\EEND\r$<20>, 
+	smul=\ESTART\r\E60\,1\r\EEND\r, 
 
 #### Fluke
 #
 
-# The 1720a differences from ANSI: no auto margin, destructive 
+# The f1720a differences from ANSI: no auto margin, destructive 
 # tabs, # of lines, funny highlighting and underlining
 f1720|f1720a|fluke 1720A, 
 	xt, 
@@ -8006,9 +8518,9 @@ sb1|beehive superbee,
 	kcud1=\EB, kcuf1=\EC, kcuu1=\EA, kdl1=\EM, ked=\EJ, kel=\EK, 
 	kf0=\E2, kf1=\Ep, kf2=\Eq, kf3=\Er, kf4=\Es, kf5=\Et, kf6=\Eu, 
 	kf7=\Ev, kf8=\Ew, kf9=\E1, khome=\EH, kich1=\EQ\EO, 
-	krmir=\ER, lf0=TAB CLEAR, lf9=TAB SET, rmir=\ER, rmso=\E_3, 
-	rmul=\E_3, sgr0=\E_3, smcup=\EO, smir=\EQ\EO, smso=\E_1, 
-	smul=\E_0, tbc=\E3, 
+	krmir=\ER, lf0=TAB CLEAR, lf9=TAB SET, rmcup=, rmir=\ER, 
+	rmso=\E_3, rmul=\E_3, sgr0=\E_3, smcup=\EO, smir=\EQ\EO, 
+	smso=\E_1, smul=\E_0, tbc=\E3, 
 sbi|superbee|beehive superbee at Indiana U., 
 	xsb, 
 	cr=\r$<1>, il1=1\EN\EL$<9>\EQ \EP$<9> \EO\ER\EA, use=sb1, 
@@ -8063,7 +8575,7 @@ beehive3|bh3m|beehiveIIIm|harris beehive 3m,
 	cols#80, it#8, lines#20, 
 	bel=^G, clear=^E^R, cr=^M, cub1=^H, cud1=^J, cuf1=^L, cuu1=^K, 
 	dl1=\021$<350>, ed=^R, el=^P, home=^E, ht=^I, hts=^F, 
-	il1=\023$<160>, ind=^J, ll=^E^K, rmso= ^_, smso=^] , 
+	il1=\023$<160>, ind=^J, ll=^E^K, rmso=\s^_, smso=^]\s, 
 beehive4|bh4|beehive 4, 
 	am, 
 	cols#80, lines#24, 
@@ -8077,7 +8589,7 @@ microb|microbee|micro bee series,
 	el=\EK, ht=^I, ind=^J, kcub1=\ED, kcud1=\EB, kcuf1=\EC, 
 	kcuu1=\EA, kf1=\Ep, kf2=\Eq, kf3=\Er, kf4=\Es, kf5=\Et, 
 	kf6=\Eu, kf7=\Ev, kf8=\Ew, kf9=\Ex, khome=\EH, rmso=\Ed@, 
-	rmul=\Ed@, sgr0=\Ed@, smso= \EdP, smul=\Ed`, 
+	rmul=\Ed@, sgr0=\Ed@, smso=\s\EdP, smul=\Ed`, 
 
 # 8675, 8686, and bee from Cyrus Rahman
 # (8675: changed k10, k11...k16 to k;, F1...F6 -- esr)
@@ -8123,7 +8635,7 @@ ha8686|harris 8686,
 # there but it isn't debugged for this case.)
 hz1000|hazeltine 1000, 
 	cols#80, lines#12, 
-	bel=^G, clear=^L, cr=^M, cub1=^H, cud1=^J, cuf1= , home=^K, 
+	bel=^G, clear=^L, cr=^M, cub1=^H, cud1=^J, cuf1=\s, home=^K, 
 	ind=^J, 
 # From: <cbosg!ucbvax!pur-ee!cincy!chris> Thu Aug 20 09:09:18 1981
 hz1420|hazeltine 1420, 
@@ -8154,8 +8666,24 @@ hz1510|hazeltine 1510,
 	bel=^G, clear=\E^\, cr=^M, cub1=^H, cud1=\E^K, cuf1=^P, 
 	cup=\E\021%p2%c%p1%c, cuu1=\E^L, dl1=\E^S, ed=\E^X, 
 	el=\E^O, il1=\E^Z, ind=^J, 
+# Hazeltine 1520
+# The following switch settings are assumed for normal operation:
+#	FULL		CR		U/L_CASE	ESCAPE
+#	FORMAT_OFF	EOM_A_OFF	EOM_B_OFF	WRAPAROUND_ON
+# Other switches may be set for operator convenience or communication
+# requirements.
+hz1520|Hazeltine 1520, 
+	am, bw, msgr, 
+	cols#80, lines#24, 
+	bel=^G, bold=\E^_, clear=\E^\, cr=^M, cub1=^H, cud1=^J, 
+	cuf1=^P, cup=\E\021%p2%c%p1%c, cuu1=\E^L, dl1=\E^S, 
+	ed=\E^X, el=\E^O, home=\E^R, il1=\E^Z, ind=^J, kbs=^H, 
+	kclr=\E^\, kcub1=^H, kcud1=\E^K, kcuf1=^P, kcuu1=\E^L, 
+	kdl1=\E^S, ked=\E^X, kel=\E^O, khome=\E^R, kil1=\E^Z, 
+	rmso=\E^Y, rs1=\E$\E\005\E?\E\031, sgr0=\E^Y, smso=\E^_, 
+# This version works with the escape switch off
 # (h1520: removed incorrect and overridden ":do=^J:" -- esr)
-hz1520|hazeltine 1520, 
+hz1520-noesc|hazeltine 1520, 
 	am, hz, 
 	cols#80, lines#24, 
 	bel=^G, clear=~^\, cr=^M, cub1=^H, cud1=~^K, cuf1=^P, 
@@ -8198,6 +8726,37 @@ esprit|Hazeltine Esprit I,
 	rmkx=\E>, rmso=\E^Y, smkx=\E<, smso=\E^_, 
 esprit-am|hazeltine esprit auto-margin, 
 	am, use=esprit, 
+# Hazeltine Modular-1 from Cliff Shackelton <ittvax!ittral!shackelt> via BRL
+# Vi it seems always wants to send a control J for "do" and it turned out
+# that the terminal would work somewhat if the auto LF/CR was turned off.
+# (hmod1: removed :dn=~^K: -- esr)
+hmod1|Hazeltine Modular 1, 
+	am, hz, 
+	cols#80, lines#24, 
+	bel=^G, cbt=~^T, clear=~^\, cr=^M, cub1=^H, cud1=~^K, cuf1=^P, 
+	cup=~\021%p2%c%p1%c, cuu1=~^L, dl1=~^S, home=~^R, il1=~^Z, 
+	ind=^J, kcub1=^H, kcud1=~^K, kcuf1=^P, kcuu1=~^L, khome=~^R, 
+	rc=~^Q, rmso=~^Y, sc=~^E, sgr0=~^Y, smso=~^_, 
+#
+# Hazeltine Executive 80 Model 30 (1554?)
+#	from  Will Martin <control@ALMSA-1.ARPA> via BRL
+# Like VT100, except for different "am" behavior.
+hazel|exec80|h80|he80|Hazeltine Executive 80, 
+	am, 
+	cols#80, it#8, lines#24, vt#3, 
+	bel=^G, blink=\E[5m$<2/>, bold=\E[1m$<2/>, 
+	clear=\E[;H\E[2J$<50/>, cr=^M, csr=\E[%i%p1%d;%p2%dr, 
+	cub1=^H, cud1=^J, cuf1=\E[C$<2/>, 
+	cup=\E[%i%p1%d;%p2%dH$<5/>, cuu1=\E[A$<2/>, 
+	ed=\E[J$<50/>, el=\E[K$<3/>, home=\E[H, ht=^I, 
+	is2=\E[1;24r\E[24;1H, kbs=^H, kcub1=\EOD, kcud1=\EOB, 
+	kcuf1=\EOC, kcuu1=\EOA, kf1=\EOP, kf2=\EOQ, kf3=\EOR, 
+	kf4=\EOS, rc=\E8, rev=\E[7m$<2/>, 
+	rf=/usr/share/tabset/vt100, ri=\EM$<5/>, 
+	rmkx=\E[?1l\E>, rmso=\E[m$<2/>, rmul=\E[m$<2/>, 
+	rs1=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sc=\E7, 
+	sgr0=\E[m$<2/>, smkx=\E[?1h\E=, smso=\E[7m$<2/>, 
+	smul=\E[4m$<2/>, 
 
 #### IBM
 #
@@ -8446,8 +9005,8 @@ intext|Interactive Systems Corporation modified owl 1200,
 	kcub1=^_, kcud1=^J, kcuf1=^^, kcuu1=^\, kf0=^VJ\r, kf1=^VA\r, 
 	kf2=^VB\r, kf3=^VC\r, kf4=^VD\r, kf5=^VE\r, kf6=^VF\r, 
 	kf7=^VG\r, kf8=^VH\r, kf9=^VI\r, khome=^Z, rmir=^V<, 
-	rmkx=^V9, rmso=^V# , smir=^V;, smkx=\036\072\264\026%, 
-	smso=^V$\054, 
+	rmkx=^V9, rmso=^V#\s, smir=^V;, smkx=\036\:\264\026%, 
+	smso=^V$\,, 
 intext2|intextii|INTERACTIVE modified owl 1251, 
 	am, bw, ul, 
 	cols#80, lines#24, xmc#0, 
@@ -8483,12 +9042,12 @@ abm85|Kimtron ABM 85,
 	kcud1=^J, kcuf1=^L, kcuu1=^K, khome=^^, rmir=\Er, rmso=\Ek, 
 	rmul=\Em, smir=\EQ, smso=\Ej, smul=\El, 
 # Kimtron ABM 85H added by Dual Systems.
-# Some notes about the 85h entries:
+# Some notes about the abm85h entries:
 # 1) there are several firmware revs of 85H in the world. Use abm85h-old for
 #    firmware revs prior to SP51
-# 2) Make sure to use 85h entry if the terminal is in 85H mode and the
-#    85e entry if it is in 920 emulation mode. They are incompatible in
-#    some places and NOT software settable i.e., <is2> can't fix it)
+# 2) Make sure to use abm85h entry if the terminal is in 85h mode and the
+#    abm85e entry if it is in tvi920 emulation mode. They are incompatible
+#    in some places and NOT software settable i.e., <is2> can't fix it)
 # 3) In 85h mode, the arrow keys and special functions transmit when
 #    the terminal is in dup-edit, and work only locally in local-edit.
 #    Vi won't swallow `del char' for instance, but <smcup> turns on
@@ -8539,6 +9098,337 @@ kt7|kimtron model kt-7,
 	kf6=^AE\r, kf7=^AF\r, kf8=^AG\r, kf9=^AH\r, khome=^^, 
 	kich1=\EQ, kil1=\EE, tsl=\Ef, 
 	use=adm+sgr, 
+# Renamed TB=^I to :ta:, BE=^G to :bl:, BS=^H to :kb:, N to :kS: (based on the
+# other kt7 entry and the adjacent key capabilities).  Removed EE which is
+# identical to :mh:.  Removed :ES=\EGD: which is some kind of highlight
+# but we can't figure out what.
+kt7ix|kimtron model kt-7 or 70 in IX mode, 
+	am, bw, 
+	cols#80, it#8, lines#25, 
+	acsc=lZm@k?jYt4uCvAwBqDx3nE, bel=^G, blink=\EG2, cbt=\EI, 
+	civis=\E.0, clear=\E*, cnorm=\E.3, cr=^M, cub1=^H, cud1=^V, 
+	cuf1=^L, cup=\E=%p1%{32}%+%c%p2%{32}%+%c, cuu1=^K, 
+	dch1=\EW, dim=\EG@, dl1=\ER, dsl=\Ef\r, ed=\EY, el=\ET, fsl=^M, 
+	home=^^, ht=^I, ich1=\EQ, il1=\EE, ind=^J, 
+	is2=\EG0\E s\017\E~, kbs=^H, kcbt=\EI, kclr=\E*, 
+	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdl1=\ER, 
+	ked=\EY, kel=\ET, kend=\EY, kf0=^AI\r, kf1=^A@\r, kf2=^AA\r, 
+	kf3=^AB\r, kf4=^AC\r, kf5=^AD\r, kf6=^AE\r, kf7=^AF\r, 
+	kf8=^AG\r, kf9=^AH\r, khome=^^, kich1=\EQ, kil1=\EE, knp=\EJ, 
+	nel=^M^J, pulse=\EK, rmacs=\E%, rmir=, rmso=\EG0, rmul=\EG0, 
+	sgr0=\EG0, smacs=\E$, smir=, smso=\EG4, smul=\EG8, tsl=\Ef, 
+
+#### Microdata/MDIS
+#
+# This was a line of terminals made by McDonnell-Douglas Information Systems.
+# These entries come direct from MDIS documentation.  I have edited them only
+# to move primary names of the form p[0-9] * to aliases, and to comment out
+# <rmacs>/<smacs> in a couple of entries without <acsc> strings.  I have 
+# also removed the change history; the last version indicates this is
+# version 4.3 by A.Barkus, September 1990 (earliest entry is October 1989).
+#
+
+# McDonnell Information Systems Terminal Family History
+# =========================================
+#
+# Prism-1, Prism-2 and P99:
+#       Ancient Microdata and CMC terminals, vaguely like Adds Regent 25.
+#
+# Prism-4 and Prism-5:
+#       Slightly less ancient range of Microdata terminals. Follow-on from
+#       Prism-2, but with many enhancements. P5 has eight display pages.
+#
+# Prism-6:
+#       A special terminal for use with library systems, primarily in Germany.
+#       Limited numbers. Similar functionality to P5 (except attributes?).
+#
+# Prism-7, Prism-8 and Prism-9:
+#       More recent range of MDIS terminals, in which P7 and P8
+#       replace the P4 & P5, with added functionality, and P9 is the flagship.
+#       The P9 has two emulation modes - P8 and ANSI - and includes a
+#       large number of the DEC VT220 control sequences. Both
+#       P8 and P9 support 80c/24ln/8pg and 132cl/24li/4pg formats.
+#
+# Prism-12 and Prism-14:
+#       Latest range, functionally very similar to the P9.  The P14 has a
+#       black-on-white overscanning screen.
+#
+# The terminfo definitions given here are:
+#
+# p2      - Prism-2 (or Prism-1 or P99).
+#
+# p4      - Prism-4 (and older P7s & P8s).
+# p5      - Prism-5 (or Prism-6).
+#
+# p7      - Prism-7.
+# p8      - Prism-8 (in national or multinational mode).
+# p8-w    - 132 column version of p8.
+# p9      - Prism-9 in ANSI mode.
+# p9-w    - 132 column version of p9.
+# p9-8    - Prism-9 in Prism-8 emulation mode.
+# p9-8-w  - As p9-8, but with 132 columns.
+#
+# p12     - Prism-12 in ANSI mode.
+# p12-w   - 132 column version of p12.
+# p12-m   - Prism-12 in MDC emulation mode.
+# p12-m-w - As p12-m, but with 132 columns.
+# p14     - Prism-14 in ANSI mode.
+# p14-w   - 132 column version of p14.
+# p14-m   - Prism-14 in MDC emulation mode.
+# p14-m-w - As p14-m, but with 132 columns.
+#
+# p2: Prism-2
+# -----------
+#
+# Includes Prism-1 and basic P99 without SP or MP loaded.
+# The simplest form of Prism-type terminal.
+# Basic cursor movement and clearing operations only.
+# No video attributes.
+# Notes:
+#  Horizontal cursor qualifiers of NUL, XON and XOFF are mapped to the next
+#  value up, followed by backspace.
+#
+P2|prism2|MDC Prism-2, 
+	am, bw, msgr, 
+	cols#80, lines#24, 
+	bel=^G, clear=\014$<20>, cr=^M, cub1=^H, cud1=^J, cuf1=^F, 
+	cup=\013%p1%' '%+%c\020%p2%{10}%/%{16}%*%p2%{10}%m%+%Pc%?%{17}%gc%=%{19}%gc%=%|%gc%!%|%t%{1}%gc%+%c%{8}%e%gc%;%c, 
+	cuu1=^Z, ed=\EJ, el=\EK, home=^A, 
+	hpa=\020%p1%{10}%/%{16}%*%p1%{10}%m%+%Pc%?%{17}%gc%=%{19}%gc%=%|%gc%!%|%t%{1}%gc%+%c%{8}%e%gc%;%c, 
+	ind=^J, kbs=^H, khome=^A, vpa=\013%p1%' '%+%c, 
+
+# p4: Prism-4
+# -----------
+#
+# Includes early versions of P7 & P8.
+# Basic family definition for most Prisms (except P2 and P9 ANSI).
+# Notes:
+#  Horizontal cursor qualifiers of NUL, XON and XOFF are mapped to the next
+#  value up, followed by backspace.
+#  Cursor key definitions removed because they interfere with vi and csh keys.
+#
+prism4|p4|P4|MDC Prism-4, 
+	am, bw, hs, mc5i, msgr, 
+	cols#80, lines#24, wsl#72, xmc#1, 
+	bel=^G, blink=^CB, civis=^]\344, clear=\014$<20>, 
+	cnorm=^]\342, cr=^M, cub1=^H, cud1=^J, cuf1=^F, 
+	cup=\013%p1%' '%+%c\020%p2%{10}%/%{16}%*%p2%{10}%m%+%Pc%?%{17}%gc%=%{19}%gc%=%|%gc%!%|%t%{1}%gc%+%c%{8}%e%gc%;%c, 
+	cuu1=^Z, dim=^CA, dsl=\035\343\035\345, ed=\EJ, el=\EK, 
+	fsl=^]\345, home=^A^J, 
+	hpa=\020%p1%{10}%/%{16}%*%p1%{10}%m%+%Pc%?%{17}%gc%=%{19}%gc%=%|%gc%!%|%t%{1}%gc%+%c%{8}%e%gc%;%c, 
+	ind=^J, invis=^CH, kbs=^H, khome=^A, mc0=\EU, mc4=\ET, mc5=\ER, 
+	rev=^CD, rmso=^C\s, rmul=^C\s, 
+	sgr=\003%'@'%?%p1%p3%|%t%{4}%+%;%?%p2%t%{16}%+%;%?%p4%t%{2}%+%;%?%p5%t%{1}%+%;%?%p7%t%{8}%+%;%c%?%p9%t\016%e\017%;, 
+	sgr0=^C\s, smso=^CD, smul=^CP, tsl=^]\343, 
+	vpa=\013%p1%' '%+%c, 
+
+# p5: Prism-5
+# -----------
+#
+# Same definition as p4. Includes Prism-6 (not tested!).
+# Does not use any multi-page features.
+#
+prism5|p5|P5|MDC Prism-5, 
+	use=p4, 
+
+# p7: Prism-7
+# -----------
+#
+# Similar definition to p4. Uses ANSI cursor motion to avoid network problems.
+# Notes:
+#  Use p4 for very early models of P7.
+#  Rev-index removed; can't send nulls to terminal in 8-bit modes.
+#
+prism7|p7|P7|MDC Prism-7, 
+	cup=\E[%i%p1%d;%p2%dH, hpa@, vpa@, use=p4, 
+
+# p8: Prism-8
+# -----------
+#
+# Similar definition to p7. Uses ANSI cursor motion to avoid network problems.
+# Supports national and multinational character sets.
+# Notes:
+#  Alternate char set operations only work in multinational mode.
+#  Use p4 for very early models of P8.
+#  Rev-index removed; can't send nulls to terminal in 8-bit modes.
+# (esr: commented out <smacs>/<rmacs> because there's no <acsc>)
+#
+prism8|p8|P8|MDC Prism-8, 
+	cup=\E[%i%p1%d;%p2%dH, hpa=\E[%i%p1%d`, is2=\E[<12h, 
+	vpa=\E[%i%p1%dd, 
+	use=p4, 
+
+# p8-w: Prism-8 in 132 column mode
+# --------------------------------
+#
+# 'Wide' version of p8.
+# Notes:
+#  Rev-index removed; can't send nulls to terminal in 8-bit modes.
+#
+prism8-w|p8-w|P8-W|MDC Prism-8 in 132 column mode, 
+	cols#132, 
+	is2=\E[<12h\E[<14h, use=p8, 
+
+# p9: Prism-9 in ANSI mode
+# -------------------------
+#
+# The "flagship" model of this generation of terminals.
+# ANSI X3.64 (ISO 6429) standard sequences, plus many DEC VT220 ones.
+# Notes:
+#  Tabs only reset by "reset". Otherwise assumes default (8 cols).
+#  Fixes to deal with terminal firmware bugs:
+#  . 'ri' uses insert-line since rev index doesn't always
+#  . 'sgr0' has extra '0' since esc[m fails
+#  . 'fsl' & 'dsl' use illegal char since cr is actioned wrong on line 25
+#  Not covered in the current definition:
+#  . Labels
+#  . Programming Fn keys
+#  . Graphic characters (defaults correctly to vt100)
+#  . Padding values (sets xon)
+# (esr: commented out <smacs>/<rmacs> because there's no <acsc>)
+#
+prism9|p9|P9|MDC Prism-9 in ANSII mode, 
+	am, bw, hs, mc5i, msgr, xenl, xon, 
+	cols#80, it#8, lines#24, vt#3, wsl#72, 
+	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, civis=\E[<4l, 
+	clear=^L, cnorm=\E[<4h, cr=^M, csr=\E[%i%p1%d;%p2%d%%v, 
+	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=^J, 
+	cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, 
+	cuu=\E[%p1%dA, cuu1=\E[A, dch=\E[%p1%dP, dch1=\E[P, 
+	dl=\E[%p1%dM, dl1=\E[M, dsl=\E[%}\024, ech=\E[%p1%dX, 
+	ed=\E[J$<10>, el=\E[K, fsl=^T, home=\E[H, hpa=\E[%i%p1%d`, 
+	ht=^I, hts=\EH, il=\E[%p1%dL, il1=\E[L, ind=^J, 
+	is2=\E[&p\E[<12l\E F, kbs=^H, kclr=^L, kcub1=\E[D, 
+	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\E[11~, 
+	kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, 
+	kf14=\E[26~, kf15=\E[28~, kf16=\E[29~, kf17=\E[31~, 
+	kf18=\E[32~, kf2=\E[12~, kf3=\E[13~, kf4=\E[14~, 
+	kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, 
+	khome=\E[H, mc0=\E[i, mc4=\E[4i, mc5=\E[5i, nel=^M^J, 
+	prot=\E[32%{, rc=\E[%z, rep=\E[%p2%db%p1%c, rev=\E[7m, 
+	ri=\E[L, rmir=\E[4l, rmso=\E[27m, rmul=\E[24m, 
+	rs2=\E[&p\E[<12l\E F\E[3g\E[9;17;25;33;41;49;57;65;73 N, 
+	sc=\E[%y, 
+	sgr=\E[%{0}%?%p1%p3%|%t%{4}%+%;%?%p2%t%{2}%+%;%?%p4%t%{1}%+%;%?%p6%t%{8}%+%;%?%p8%t%{32}%+%;%d%%{%?%p9%t\016%e\017%;, 
+	sgr0=\E[0m, smir=\E[4h, smso=\E[7m, smul=\E[4m, tbc=\E[2g, 
+	tsl=\E[%i%p1%d%%}, vpa=\E[%i%p1%dd, 
+
+# p9-w: Prism-9 in 132 column mode
+# --------------------------------
+#
+# 'Wide' version of p9.
+#
+prism9-w|p9-w|P9-W|MDC Prism-9 in 132 column mode, 
+	cols#132, 
+	is2=\E[&p\E[<12l\E F\E[<14h, 
+	rs2=\E[&p\E[<12l\E F\E[<14h, use=p9, 
+
+# p9-8: Prism-9 in P8 mode
+# ------------------------
+#
+# P9 terminal in P8 emulation mode.
+# Similar to p8 definition.
+# Insertion and deletion operations possible.
+#
+prism9-8|p9-8|P9-8|MDC Prism-9 in P8 mode, 
+	dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, 
+	ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, il1=\E[L, use=p8, 
+
+# p9-8-w: Prism-9 in P8 and 132 column modes
+# ------------------------------------------
+#
+# P9 terminal in P8 emulation mode and 132 column mode.
+#
+prism9-8-w|p9-8-w|P9-8-W|MDC Prism-9 in Prism 8 emulation and 132 column mode, 
+	dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, 
+	ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, il1=\E[L, use=p8-w, 
+
+# p12: Prism-12 in ANSI mode
+# ---------------------------
+#
+# See p9 definition.
+#
+prism12|p12|P12|MDC Prism-12 in ANSI mode, 
+	use=p9, 
+
+# p12-w: Prism-12 in 132 column mode
+# ----------------------------------
+#
+# 'Wide' version of p12.
+#
+prism12-w|p12-w|P12-W|MDC Prism-12 in 132 column mode, 
+	use=p9-w, 
+
+# p12-m: Prism-12 in MDC emulation mode
+# -------------------------------------
+#
+# P12 terminal in MDC emulation mode.
+# Similar to p8 definition.
+# Insertion and deletion operations possible.
+#
+prism12-m|p12-m|P12-M|MDC Prism-12 in MDC emulation mode, 
+	use=p9-8, 
+
+# p12-m-w: Prism-12 in MDC emulation and 132 column modes
+# -------------------------------------------------------
+#
+# P12 terminal in MDC emulation mode and 132 column mode.
+#
+prism12-m-w|p12-m-w|P12-M-W|MDC Prism-12 in MDC emulation and 132 column mode, 
+	use=p9-8-w, 
+
+# p14: Prism-14 in ANSII mode
+# ---------------------------
+#
+# See p9 definition.
+#
+prism14|p14|P14|MDC Prism-14 in ANSII mode, 
+	use=p9, 
+
+# p14-w: Prism-14 in 132 column mode
+# ----------------------------------
+#
+# 'Wide' version of p14.
+#
+prism14-w|p14-w|P14-W|MDC Prism-14 in 132 column mode, 
+	use=p9-w, 
+
+# p14-m: Prism-14 in MDC emulation mode
+# -------------------------------------
+#
+# P14 terminal in MDC emulation mode.
+# Similar to p8 definition.
+# Insertion and deletion operations possible.
+#
+prism14-m|p14-m|P14-M|MDC Prism-14 in MDC emulation mode, 
+	use=p9-8, 
+
+# p14-m-w: Prism-14 in MDC emulation and 132 column modes
+# -------------------------------------------------------
+#
+# P14 terminal in MDC emulation mode and 132 column mode.
+#
+prism14-m-w|p14-m-w|P14-M-W|MDC Prism-14 in MDC emulation and 132 column mode, 
+	use=p9-8-w, 
+
+# End of McDonnell Information Systems Prism definitions
+
+# These things were popular in the Pick database community at one time
+# From: George Land <georgeland@aol.com> 24 Sep 1996
+p8gl|prism8gl|McDonnell-Douglas Prism-8 alternate definition, 
+	am, bw, hs, mir, 
+	cols#80, lines#24, ma#1, wsl#78, xmc#1, 
+	bel=^G, blink=^CB, clear=^L, cr=^M, cub1=^U, cud1=^J, cuf1=^F, 
+	cup=\E[%i%p1%d;%p2%dH, cuu1=^Z, dch1=\s^H, dim=^CA, dl1=^P, 
+	ed=\EJ, el=\EK, home=^A, ind=^J, invis=^CH, kbs=^H, kcub1=^U, 
+	kcud1=^J, kcuf1=^F, kcuu1=^Z, kdch1=\s^H, kdl1=^P, ked=\EJ, 
+	kel=\EK, kf1=^A@\r, kf10=^AI\r, kf12=^AJ\r, kf13=^AK\r, 
+	kf14=^AL\r, kf15=^AM\r, kf16=^AN\r, kf17=^AO\r, kf2=^AA\r, 
+	kf3=^AB\r, kf4=^AC\r, kf5=^AD\r, kf6=^AE\r, kf7=^AF\r, 
+	kf8=^AG\r, kf9=^AH\r, khome=^A, lf1=F1, lf10=F10, lf2=F2, 
+	lf3=F3, lf4=F4, lf5=F5, lf6=F6, lf7=F7, lf8=F8, lf9=F9, nel=^J^M, 
+	pad=\200, rev=^CD, rmso=^C\s, rmul=^C\s, sgr0=^C\s, smso=^CE, 
+	smul=^C0, 
 
 #### Microterm (act, mime)
 #
@@ -8582,7 +9472,7 @@ mime|mime1|mime2|mimei|mimeii|microterm mime1,
 	cuu1=^Z, dl1=\027$<80>, ed=^_, el=^^, home=^], ht=\011$<2>, 
 	il1=\001$<80>, ind=^J, is2=^S\E^Q, kcub1=^H, kcud1=^K, 
 	kcuf1=^X, kcuu1=^Z, ri=\022$<3>, uc=^U, 
-# These termcaps (for mime 2a) put the terminal in low intensity mode
+# These termcaps (for mime2a) put the terminal in low intensity mode
 # since high intensity mode is so obnoxious.
 mime2a-s|microterm mime2a (emulating an enhanced soroc iq120), 
 	am, 
@@ -8592,7 +9482,7 @@ mime2a-s|microterm mime2a (emulating an enhanced soroc iq120),
 	dl1=\027$<20*>, ed=\EJ$<20*>, el=\EK, home=^^, 
 	il1=\001$<20*>, ind=^J, ip=$<2>, is2=\E), kcub1=^H, kcud1=^J, 
 	kcuf1=^L, kcuu1=^K, ri=\EI, rmir=^Z, rmso=\E;, rmul=\E7, 
-	smir=\EE, smso=\E\072, smul=\E6, 
+	smir=\EE, smso=\E\:, smul=\E6, 
 # This is the preferred mode (but ^X can't be used as a kill character)
 mime2a|mime2a-v|microterm mime2a (emulating an enhanced vt52), 
 	cols#80, it#8, lines#24, 
@@ -8629,7 +9519,7 @@ mm340|mime340|mime 340,
 	clear=\032$<12/>, cr=^M, cub1=^H, cud1=^J, cuf1=^L, 
 	cup=\E=%p1%{32}%+%c%p2%{32}%+%c, cuu1=^K, 
 	dch1=\E#$<2.1*/>, dl1=\EV$<49.6/>, ed=\037$<2*/>, 
-	el=\EL$<2.1/>, ht=^I, il1=\EU$<46/>, ind=^J, is2=\E\054, 
+	el=\EL$<2.1/>, ht=^I, il1=\EU$<46/>, ind=^J, is2=\E\,, 
 	kbs=^H, kcub1=^H, kcud1=^J, kcuu1=^K, nel=^M^J, 
 # This came from University of Wisconsin marked "astro termcap for jooss".
 # (mt4520-rv: removed obsolete ":kn#4:" and incorrect ":ri=\E[C:";
@@ -8724,7 +9614,7 @@ ergo4000|microterm ergo 4000,
 # 8   - Enable / Disable backspace
 #
 # From <root@goliath.un.atlantaga.NCR.COM>, init string hacked by SCO.
-ncr7900i|7900i|ncr7900|7900|ncr 7900 model 1, 
+ncr7900i|ncr7900|ncr 7900 model 1, 
 	am, bw, ul, 
 	cols#80, lines#24, xmc#1, 
 	bel=^G, blink=\E0B, clear=^L, cr=^M, cub1=^H, cud1=^J, cuf1=^F, 
@@ -8744,7 +9634,7 @@ ncr7900iv|ncr 7900 model 4,
 	kf3=\EU, kf4=\EV, kf5=\EW, kf6=\EP, kf7=\EQ, kf8=\ER, 
 	khome=\EH, lf6=blue, lf7=red, lf8=white, nel=^M^J, 
 	tsl=\Ej\Ex5\Ex1\EY8%p1%{32}%+%c\Eo, 
-ncr7901|7901|ncr 7901 model, 
+ncr7901|ncr 7901 model, 
 	am, bw, ul, 
 	cols#80, lines#24, 
 	bel=^G, blink=\E0B, civis=^W, clear=^L, cnorm=^X, cr=^M, 
@@ -8803,14 +9693,14 @@ pe7000m|perkin elmer 7000 series monochrome monitor,
 	bel=^G, cbt=\E!Y, clear=\EK, cr=^M, cub1=\ED, cud1=\EB, 
 	cuf1=\EC, cup=\ES%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, 
 	ed=\EJ, el=\EI, home=\EH, ind=^J, 
-	is1=\E!\200\EW  7o\Egf\ES7 , kbs=^H, kcub1=\E!V, 
+	is1=\E!\200\EW  7o\Egf\ES7\s, kbs=^H, kcub1=\E!V, 
 	kcud1=\E!U, kcuf1=\E!W, kcuu1=\E!T, kf0=\E!\200, kf1=\E!^A, 
 	kf10=\E!^J, kf2=\E!^B, kf3=\E!^C, kf4=\E!^D, kf5=\E!^E, 
 	kf6=\E!^F, kf7=\E!^G, kf8=\E!^H, kf9=\E!^I, khome=\E!S, 
-	ll=\ES7 , ri=\ER, 
+	ll=\ES7\s, ri=\ER, 
 pe7000c|perkin elmer 7000 series colour monitor, 
-	is1=\E!\200\EW  7o\Egf\Eb0\Ec7\ES7 , rmso=\Eb0, 
-	rmul=\E!\200, smso=\Eb2, smul=\E! , 
+	is1=\E!\200\EW  7o\Egf\Eb0\Ec7\ES7\s, rmso=\Eb0, 
+	rmul=\E!\200, smso=\Eb2, smul=\E!\s, 
 	use=pe7000m, 
 
 #### Sperry Univac
@@ -8862,8 +9752,8 @@ tandem653|t653x|Tandem 653x multipage terminal,
 	cols#80, lines#24, wsl#64, xmc#1, 
 	clear=\EI, cub1=^H, cud1=^J, cuf1=\EC, 
 	cup=\023%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, dsl=\Eo\r, 
-	ed=\EJ, el=\EK, fsl=^M, home=\EH, ind=\ES, ri=\ET, rmso=\E6 , 
-	rmul=\E6 , sgr0=\E6 , smso=\E6$, smul=\E60, tsl=\Eo, 
+	ed=\EJ, el=\EK, fsl=^M, home=\EH, ind=\ES, ri=\ET, rmso=\E6\s, 
+	rmul=\E6\s, sgr0=\E6\s, smso=\E6$, smul=\E60, tsl=\Eo, 
 
 #### Tandy/Radio Shack
 #
@@ -8928,32 +9818,40 @@ pt210|TRS-80 PT-210 printing terminal,
 # area" for interactive text.
 #
 
-tek|tek4012|4012|tektronix 4012, 
+tek|tek4012|tektronix 4012, 
 	os, 
 	cols#75, lines#35, 
 	bel=^G, clear=\E\014$<1000>, cr=^M, cub1=^H, cud1=^J, 
 	ff=\014$<1000>, is2=\E^O, 
 # (tek4013: added <acsc> to suppress tic warnings re <smacs>/<rmacs> --esr)
-tek4013|4013|tektronix 4013, 
+tek4013|tektronix 4013, 
 	acsc=, rmacs=\E^O, smacs=\E^N, use=tek4012, 
-tek4014|4014|tektronix 4014, 
+tek4014|tektronix 4014, 
 	cols#81, lines#38, 
 	is2=\E\017\E9, use=tek4012, 
 # (tek4015: added <acsc> to suppress tic warnings re <smacs>/<rmacs> --esr)
-tek4015|4015|tektronix 4015, 
+tek4015|tektronix 4015, 
 	acsc=, rmacs=\E^O, smacs=\E^N, use=tek4014, 
-tek4014-sm|4014-sm|tektronix 4014 in small font, 
+tek4014-sm|tektronix 4014 in small font, 
 	cols#121, lines#58, 
-	is2=\E\017\E\072, use=tek4014, 
+	is2=\E\017\E\:, use=tek4014, 
 # (tek4015-sm: added <acsc> to suppress tic warnings re <smacs>/<rmacs> --esr)
-tek4015-sm|4015-sm|tektronix 4015 in small font, 
-	acsc=, rmacs=\E^O, smacs=\E^N, 
-	use=tek4014-sm, 
-tek4023|4023|tex|tektronix 4023, 
+tek4015-sm|tektronix 4015 in small font, 
+	acsc=, rmacs=\E^O, smacs=\E^N, use=tek4014-sm, 
+# Tektronix 4023 from Andrew Klossner <orca!andrew.tektronix@csnet-relay>
+#
+# You need to have "stty nl2" in effect.  Some versions of tset(1) know
+# how to set it for you.
+#
+# It's got the Magic Cookie problem around stand-out mode.  If you can't
+# live with Magic Cookie, remove the :so: and :se: fields and do without
+# reverse video.  If you like reverse video stand-out mode but don't want
+# it to flash, change the letter 'H' to 'P' in the :so: field.
+tek4023|tektronix 4023, 
 	am, 
-	cols#80, lines#24, vt#4, 
-	bel=^G, clear=\E\014$<4>, cr=^M, cub1=^H, cud1=^J, cuf1=^I, 
-	cup=\034%p2%{32}%+%c%p1%{32}%+%c, ind=^J, rmso=^_@, 
+	cols#80, lines#24, vt#4, xmc#1, 
+	bel=^G, clear=\E\014$<4/>, cr=^M, cub1=^H, cud1=^J, cuf1=^I, 
+	cup=\034%p2%{32}%+%c%p1%{32}%+%c, kbs=^H, rmso=^_@, 
 	smso=^_P, 
 # It is recommended that you run the 4025 at 4800 baud or less;
 # various bugs in the terminal appear at 9600.  It wedges at the
@@ -8984,9 +9882,9 @@ tek4024|tek4025|tek4027|tektronix 4024/4025/4027,
 	is2=!com 31\r\n\037sto 9 17 25 33 41 49 57 65 73\r, 
 	rmkx=\037lea p2\r\037lea p4\r\037lea p6\r\037lea p8\r\037lea f5\r, 
 	smkx=\037lea p4 /h/\r\037lea p8 /k/\r\037lea p6 / /\r\037lea p2 /j/\r\037lea f5 /H/\r, 
-tek4025-17|4025-17|4027-17|tek 4025 17 line window, 
+tek4025-17|tek 4025 17 line window, 
 	lines#17, use=tek4025, 
-tek4025-17-ws|4025-17-ws|4025-17ws|4027-17ws|4027-17-ws|tek 4025 17 line window in workspace, 
+tek4025-17-ws|tek 4025 17 line window in workspace, 
 	is2=!com 31\r\n\037sto 9 17 25 33 41 49 57 65 73\r\037wor 17\r\037mon 17\r, 
 	rmcup=\037mon h\r, rmso=\037att s\r, smcup=\037wor h\r, 
 	smso=\037att e\r, 
@@ -9015,7 +9913,7 @@ tek4025-ex|tek4027-ex|tek 4025/4027 w/!,
 # Delays not specified; use "stty ixon -ixany" to enable DC3/DC1 flow control!
 # (tek4025a: removed obsolete ":xx:". This may mean the tek4025a entry won't
 # work any more. -- esr)
-tek4025a|4025a|Tektronix 4025A, 
+tek4025a|Tektronix 4025A, 
 	am, bw, da, db, xon, 
 	cols#80, it#8, lines#34, 
 	bel=^G, cbt=\035bac;, clear=\035era;\n\035rup;, cmdch=^], 
@@ -9032,21 +9930,21 @@ tek4025a|4025a|Tektronix 4025A,
 # not try to scroll, or cursor addressing won't work.  Also, you can't
 # see the cursor.)
 # (This "learns" the arrow keys for rogue. I have adapted it for termcap - mrh)
-tek4025-cr|4025-cr|tek 4025 for curses and rogue, 
+tek4025-cr|tek 4025 for curses and rogue, 
 	am, 
 	cols#80, it#8, lines#33, 
 	clear=\037era;, cub1=^H, cud1=^F^J, cuf1=\037rig;, 
-	cup=\037jum%i%p1%d\054%p2%d;, cuu1=^K, ht=^I, ind=^F^J, 
+	cup=\037jum%i%p1%d\,%p2%d;, cuu1=^K, ht=^I, ind=^F^J, 
 	is2=!com 31\r\n\037sto 9 17 25 33 41 49 57 65 73\r, 
 	rmcup=\037wor 0, smcup=\037wor 33h, 
 # next two lines commented out since curses only allows 128 chars, sigh.
 #	:ti=\037lea p1/b/\037lea p2/j/\037lea p3/n/\037lea p4/h/\037lea p5/ /\037lea p6/l/\037lea p7/y/\037lea p8/k/\037lea p9/u/\037lea p./f/\037lea pt/`era w/13\037lea p0/s/\037wor 33h:\
 #	:te=\037lea p1\037lea p2\037lea p3\037lea p4\037lea pt\037lea p5\037lea p6\037lea p7\037lea p8\037lea p9/la/13\037lea p.\037lea p0\037wor 0:
 tek4025ex|4025ex|4027ex|tek 4025 w/!, 
-	is2=\037com 33\r\n!sto 9\05417\05425\05433\05441\05449\05457\05465\05473\r, 
+	is2=\037com 33\r\n!sto 9\,17\,25\,33\,41\,49\,57\,65\,73\r, 
 	rmcup=\037com 33\r, smcup=!com 31\r, 
 	use=tek4025, 
-tek4105|4105|tektronix 4105, 
+tek4105|tektronix 4105, 
 	am, mir, msgr, ul, xenl, xt, 
 	cols#79, it#8, lines#29, 
 	acsc=, bel=^G, blink=\E[=3;<7m, bold=\E[=7;<4m, cbt=\E[Z, 
@@ -9056,12 +9954,13 @@ tek4105|4105|tektronix 4105,
 	il1=\E[1L, ind=\E[S, invis=\E[=6;<5, is1=\E%!1\E[m, 
 	is2=\E%!1\E[?6141\E[m, kbs=^H, kcub1=\E[1D, kcud1=\E[1B, 
 	kcuf1=\E[1C, kcuu1=\E[1A, rev=\E[=1;<3m, ri=\E[T, 
-	rmacs=\E[m, rmir=\E[4l, rmso=\E[=0;<1m, rmul=\E[=0;<1m, 
-	sgr0=\E[=0;<1m, smacs=\E[1m, smcup=\E%!1\E[?6l\E[2J, 
-	smir=\E[4h, smso=\E[=2;<3m, smul=\E[=5;<2m, tbc=\E[1g, 
+	rmacs=\E[m, rmcup=, rmir=\E[4l, rmso=\E[=0;<1m, 
+	rmul=\E[=0;<1m, sgr0=\E[=0;<1m, smacs=\E[1m, 
+	smcup=\E%!1\E[?6l\E[2J, smir=\E[4h, smso=\E[=2;<3m, 
+	smul=\E[=5;<2m, tbc=\E[1g, 
 
 # (tek4105-30: I added <rmam>/<smam> based on the init string -- esr)
-tek4105-30|4105-30|4015 emulating 30 line vt100, 
+tek4105-30|4015 emulating 30 line vt100, 
 	am, mir, msgr, xenl, xon, 
 	cols#80, it#8, lines#30, vt#3, 
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, 
@@ -9083,7 +9982,93 @@ tek4105-30|4105-30|4015 emulating 30 line vt100,
 	sgr0=\E[m\017$<2>, smacs=^N, smam=\E[?7h, smkx=\E[?1h\E=, 
 	smso=\E[1;7m$<2>, smul=\E[4m$<2>, tbc=\E[3g, 
 
-tek4107|tek4109|4107|4109|tektronix terminals 4107 4109, 
+# Tektronix 4105 from BRL
+# The following setup modes are assumed for normal operation:
+#	CODE ansi		CRLF no			DABUFFER 141
+#	DAENABLE yes		DALINES 30		DAMODE replace
+#	DAVISIBILITY yes	ECHO no			EDITMARGINS 1 30
+#	FLAGGING input		INSERTREPLACE replace	LFCR no
+#	ORIGINMODE relative	PROMPTMODE no		SELECTCHARSET G0 B
+#	SELECTCHARSET G1 0	TABS -2
+# Other setup modes may be set for operator convenience or communication
+# requirements; I recommend
+#	ACURSOR 1 0		AUTOREPEAT yes		AUTOWRAP yes
+#	BYPASSCANCEL <LF>	CURSORKEYMODE no	DAINDEX 1 0 0
+#	EOFSTRING ''		EOLSTRING <CR>		EOMCHARS <CR> <NU>
+#	GAMODE overstrike	GCURSOR 0 100 0		GSPEED 10 1
+#	IGNOREDEL no		KEYEXCHAR <DL>		NVDEFINE -53 "<NU>"
+#	PROMPTSTRING ''		QUEUESIZE 2460		WINDOW 0 0 4095 3132
+#	XMTDELAY 0
+# and factory color maps.  After setting these modes, save them with NVSAVE. No
+# delays are specified; use "stty ixon -ixany" to enable DC3/DC1 flow control!
+# "IC" cannot be used in combination with "im" & "ei".
+# "tek4105a" is just a guess:
+tek4105a|Tektronix 4105, 
+	msgr, xon, 
+	cols#80, it#8, lines#30, vt#3, 
+	acsc=, bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, 
+	civis=\E%!0\ETD00\E%!1, clear=\E[H\E[J, 
+	cnorm=\E%!0\ETD10\E%!1, cr=^M, csr=\E[%i%p1%d;%p2%dr, 
+	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=^J, 
+	cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, 
+	cuu=\E[%p1%dA, cuu1=\EM, cvvis=\E%!0\ETD70\E%!1, 
+	dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, 
+	ech=\E[%p1%dX, ed=\E[J, el=\E[K, home=\E[H, ht=^I, hts=\EH, 
+	il=\E[%p1%dL, il1=\E[L, ind=^J, indn=\E[%p1%dS, is2=\E%!1, 
+	kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, 
+	kf0=\EOA, kf1=\EOB, kf2=\EOC, kf3=\EOD, kf4=\EOP, kf5=\EOQ, 
+	kf6=\EOR, kf7=\EOS, lf0=F1, lf1=F2, lf2=F3, lf3=F4, lf4=F5, 
+	lf5=F6, lf6=F8, ll=\E[30;H, nel=\EE, rc=\E8, rev=\E[7m, ri=\EM, 
+	rin=\E[%p1%dT, rmacs=^O, rmcup=\E%!0\ELBH=\E%!1, 
+	rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m, sc=\E7, 
+	sgr0=\E[m, smacs=^N, smcup=\E[?6l, smir=\E[4h, 
+	smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g, 
+
+#
+# Tektronix 4106/4107/4109 from BRL
+# The following setup modes are assumed for normal operation:
+#	CODE ansi		COLUMNMODE 80		CRLF no
+#	DABUFFER 141		DAENABLE yes		DALINES 32
+#	DAMODE replace		DAVISIBILITY yes	ECHO no
+#	EDITMARGINS 1 32	FLAGGING input		INSERTREPLACE replace
+#	LFCR no			LOCKKEYBOARD no		ORIGINMODE relative
+#	PROMPTMODE no		SELECTCHARSET G0 B	SELECTCHARSET G1 0
+#	TABS -2
+# Other setup modes may be set for operator convenience or communication
+# requirements; I recommend
+#	ACURSOR 1 0		AUTOREPEAT yes		AUTOWRAP yes
+#	BYPASSCANCEL <LF>	CURSORKEYMODE no	DAINDEX 1 0 0
+#	EOFSTRING ''		EOLSTRING <CR>		EOMCHARS <CR> <NU>
+#	GAMODE overstrike	GCURSOR 0 100 0		GSPEED 9 3
+#	IGNOREDEL no		KEYEXCHAR <DL>		NVDEFINE -53 "<NU>"
+#	PROMPTSTRING ''		QUEUESIZE 2620		WINDOW 0 0 4095 3132
+#	XMTDELAY 0
+# and factory color maps.  After setting these modes, save them with NVSAVE.  No
+# delays are specified; use "stty ixon -ixany" to enable DC3/DC1 flow control!
+# "IC" cannot be used in combination with "im" & "ei".
+tek4106brl|tek4107brl|tek4109brl|Tektronix 4106, 4107, or 4109, 
+	msgr, xon, 
+	cols#80, it#8, lines#32, vt#3, 
+	acsc=, bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, 
+	civis=\E%!0\ETD00\E%!1, clear=\E[H\E[J, 
+	cnorm=\E%!0\ETD10\E%!1, cr=^M, csr=\E[%i%p1%d;%p2%dr, 
+	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=^J, 
+	cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, 
+	cuu=\E[%p1%dA, cuu1=\EM, cvvis=\E%!0\ETD70\E%!1, 
+	dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, 
+	ech=\E[%p1%dX, ed=\E[J, el=\E[K, home=\E[H, ht=^I, hts=\EH, 
+	il=\E[%p1%dL, il1=\E[L, ind=^J, indn=\E[%p1%dS, is2=\E%!1, 
+	kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, 
+	kf0=\EOA, kf1=\EOB, kf2=\EOC, kf3=\EOD, kf4=\EOP, kf5=\EOQ, 
+	kf6=\EOR, kf7=\EOS, lf0=F1, lf1=F2, lf2=F3, lf3=F4, lf4=F5, 
+	lf5=F6, lf6=F8, ll=\E[32;H, nel=\EE, rc=\E8, rev=\E[7m, ri=\EM, 
+	rin=\E[%p1%dT, rmacs=^O, rmcup=\E%!0\ELBH=\E%!1, 
+	rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m, 
+	rs1=\030\E%!0\EKC\E\014\EKR0\EKF0\ENM0\ELBH=\ETF8000010F40\ELI100\ELLB0\ELM0\EKE0\ENF1\EKS0\END0\ERE0\E%!1\Ec\E[?3;5l\E[?7;8h\E[r\E[m\E>, 
+	sc=\E7, sgr0=\E[m, smacs=^N, smcup=\E[?6l, smir=\E[4h, 
+	smkx=\E[?1h\E=, smso=\E[7;42m, smul=\E[4m, tbc=\E[3g, 
+
+tek4107|tek4109|tektronix terminals 4107 4109, 
 	am, mir, msgr, ul, xenl, xt, 
 	cols#79, it#8, lines#29, 
 	bel=^G, blink=\E%!1\E[5m$<2>\E%!0, 
@@ -9134,9 +10119,9 @@ tek4112|tek4114|tektronix 4110 series,
 	ed=\E[0J, el=\E[0K, ich1=\E[@, il1=\E[L, 
 	ind=\E7\E[0;0H\E[M\E8, is2=\E3!1, ri=\E7\E[0;0H\E[L\E8, 
 	rmso=\E[m, rmul=\E[m, sgr0=\E[m, smso=\E[7m, smul=\E[4m, 
-tek4112-nd|4112-nd|4112 not in dialog area, 
+tek4112-nd|4112 not in dialog area, 
 	cuu1=^K, use=tek4112, 
-tek4112-5|4112-5|4112 in 5 line dialog area, 
+tek4112-5|4112 in 5 line dialog area, 
 	lines#5, use=tek4112, 
 # (tek4113: this used to have "<cuf1=\LM1\s\LM0>", someone's mistake;
 # removed "<smacs=\E^N>, <rmacs=\E^O>", which had been commented out in 8.3.
@@ -9149,13 +10134,13 @@ tek4113|tektronix 4113 color graphics with 5 line dialog area,
 	clear=\ELZ, cub1=^H, cud1=^J, cuf1=\ELM1 \ELM0, 
 	flash=\ERBA4\ERBA4\ERBA4\ERBA4\ERBA4\ERBA4\ERBA4\ERBA4\ERBA4\ERBA4\ERB0, 
 	is2=\EKA1\ELL5\ELV0\ELV1, uc=\010\ELM1_\ELM0, 
-tek4113-34|4113-34|tektronix 4113 color graphics with 34 line dialog area, 
+tek4113-34|tektronix 4113 color graphics with 34 line dialog area, 
 	lines#34, 
 	is2=\EKA1\ELLB2\ELV0\ELV1, use=tek4113, 
 # :ns: left off to allow vi visual mode. APL font (:as=\E^N:/:ae=\E^O:) not 
 # supported here. :uc: is slow, but looks nice. Suggest setenv MORE -up .
 # :vb: needs enough delay to let you see the background color being toggled.
-tek4113-nd|4113-nd|tektronix 4113 color graphics with no dialog area, 
+tek4113-nd|tektronix 4113 color graphics with no dialog area, 
 	am, eo, 
 	cols#80, it#8, lines#34, 
 	clear=\E^L, cub1=^H, cud1=^J, cuf1=^I, cuu1=^K, 
@@ -9202,31 +10187,34 @@ tek4115|newer tektronix 4115 entry with more ANSI capabilities,
 # chokes on; and adds a lot of initialization for the tek dialog area.
 # Note that this entry uses all 34 lines and sets the cursor color to green.
 # Steve Jacobson 8/85
-# (tek4125: there were two "\!"s in the is that I replaced with "\E!" -- esr)
+# (tek4125: there were two "\!"s in the is that I replaced with "\E!";
+# commented out, <smir>=\E1 because there's no <rmir>  -- esr)
 tek4125|tektronix 4125, 
 	lines#34, 
 	csr@, dl1=\E[1M, il1=\E[1L, 
 	is2=\E%\E!0\EQD1\EUX03\EKA\ELBB2\ELCE0\ELI100\ELJ2\ELLB2\ELM0\ELS1\ELX00\ELV1\E%\E!1\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, 
-	rc@, sc@, smir=\E1, smkx=\E=, 
+	rc@, sc@, smkx=\E=, 
 	use=vt100, 
 
 # From: <jcoker@ucbic>
 # (tek4207: This was the termcap file's entry for the 4107/4207, but SCO
 # supplied another, less capable 4107 entry.  So we'll use that for 4107 and
-# note that if jcoker wasn't confused you may be able to use this one. -- esr)
+# note that if jcoker wasn't confused you may be able to use this one.
+# I merged in <msgr>,<ind>,<ri>,<invis>,<tbc> from a BRL entry -- esr)
 tek4207|Tektronix 4207 graphics terminal with memory, 
-	am, bw, mir, ul, xenl, 
+	am, bw, mir, msgr, ul, xenl, 
 	cols#80, it#8, lines#32, 
 	blink=\E[5m, bold=\E[1m, cbt=\E[Z, clear=\E[H\E[J$<156/>, 
 	cub1=^H, cud1=^J, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, 
 	cuu1=\EM, dch1=\E[P$<4/>, dl1=\E[M$<3/>, ed=\E[J, 
 	el=\E[K$<5/>, home=\E[H, ht=^I, ich1=\E[@$<4/>, 
-	il1=\E[L$<3/>, 
+	il1=\E[L$<3/>, ind=\E[S, invis=\E[=6;<5, 
 	is2=\E%!0\ELBP0\E%!1\E[H\E[2g\EH\E[8C\EH\E[8C\EH\E[8C\EH\E[8C\EH\E[8C\EH\E[8C\EH\E[8C\EH\E[8C\EH\E[8C\EH\E[J, 
 	kcub1=\E[D, kcud1=\ED, kcuf1=\E[C, kcuu1=\EM, khome=\E[H, 
-	rev=\E[7m, rmcup=\E[?6h\E%!0\ELBP0\E%!1\E[32;1f, 
-	rmso=\E[m, rmul=\E[m, sgr0=\E[m, smcup=\E[?6l\E[H\E[J, 
-	smso=\E[7m, smul=\E[4m, 
+	rev=\E[7m, ri=\E[T, 
+	rmcup=\E[?6h\E%!0\ELBP0\E%!1\E[32;1f, rmso=\E[m, 
+	rmul=\E[m, sgr0=\E[m, smcup=\E[?6l\E[H\E[J, smso=\E[7m, 
+	smul=\E[4m, tbc=\E[1g, 
 
 # From: <carolyn@dali.berkeley.edu>  Thu Oct 31 12:54:27 1985
 # (tek4404: There was a "\!" in <smcup> that I replaced with "\E!".
@@ -9253,8 +10241,8 @@ ct8500|tektronix ct8500,
 	bel=^G, cbt=\E^I, clear=\E^E, cr=^M, cub1=^H, cud1=^J, 
 	cuf1=\ES, cup=\E|%p1%{32}%+%c%p2%{32}%+%c, cuu1=\ER, 
 	dch1=\E^], dl1=\E^M, ed=\E^U, el=\E^T, ht=^I, ich1=\E^\, 
-	il1=\E^L, ind=^J, is2=\037\EZ\Ek, ri=\E^A, rmso=\E , 
-	rmul=\E , sgr0=\E , smso=\E$, smul=\E!, 
+	il1=\E^L, ind=^J, is2=\037\EZ\Ek, ri=\E^A, rmso=\E\s, 
+	rmul=\E\s, sgr0=\E\s, smso=\E$, smul=\E!, 
 
 # Tektronix 4205 terminal.
 #
@@ -9269,7 +10257,7 @@ ct8500|tektronix ct8500,
 # The <initc> cap uses RGB notation to define colors.  for arguments 1-3 the 
 # interval (0-1000) is broken into 8 smaller sub-intervals (125).  Each sub-
 # interval then maps into pre-defined value.
-tek4205|4205|tektronix 4205, 
+tek4205|tektronix 4205, 
 	ccc, mir, msgr, 
 	colors#8, cols#80, it#8, lines#30, ncv#49, pairs#63, 
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, 
@@ -9280,14 +10268,14 @@ tek4205|4205|tektronix 4205,
 	dch1=\E[1P, dim=\E[=1;<6m, dl1=\E[1M, ech=\E%p1%dX, 
 	ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E)0, home=\E[H, ht=^I, 
 	ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[1L, ind=\ED, 
-	initc=\E%%!0\n\ETF4\n%?%p1%{0}%=%t0\n%e%p1%{1}%=%t4\n%e%p1%{2}%=%t3\n%e%p1%{3}%=%t5\n%e%p1%{4}%=%t2\n%e%p1%{5}%=%t6\n%e%p1%{6}%=%t7\n%e1%;\n%?%p2%{125}%<%t0\n%e%p2%{250}%<%tA2\n%e%p2%{375}%<%tA?\n%e%p2%{500}%<%tC8\n%e%p2%{625}%<%tD4\n%e%p2%{750}%<%tE1\n%e%p2%{875}%<%tE\072\n%eF4%;\n%?%p3%{125}%<%t0\n%e%p3%{250}%<%tA2\n%e%p3%{375}%<%tA?\n%e%p3%{500}%<%tC8\n%e%p3%{625}%<%tD4\n%e%p3%{750}%<%tE1\n%e%p3%{875}%<%tE\072\n%eF4%;\n%?%p4%{125}%<%t0\n%e%p4%{250}%<%tA2\n%e%p4%{375}%<%tA?\n%e%p4%{500}%<%tC8\n%e%p4%{625}%<%tD4\n%e%p4%{750}%<%tE1\n%e%p4%{875}%<%tE\072\n%eF4%;\n\E%%!1, 
+	initc=\E%%!0\n\ETF4\n%?%p1%{0}%=%t0\n%e%p1%{1}%=%t4\n%e%p1%{2}%=%t3\n%e%p1%{3}%=%t5\n%e%p1%{4}%=%t2\n%e%p1%{5}%=%t6\n%e%p1%{6}%=%t7\n%e1%;\n%?%p2%{125}%<%t0\n%e%p2%{250}%<%tA2\n%e%p2%{375}%<%tA?\n%e%p2%{500}%<%tC8\n%e%p2%{625}%<%tD4\n%e%p2%{750}%<%tE1\n%e%p2%{875}%<%tE\:\n%eF4%;\n%?%p3%{125}%<%t0\n%e%p3%{250}%<%tA2\n%e%p3%{375}%<%tA?\n%e%p3%{500}%<%tC8\n%e%p3%{625}%<%tD4\n%e%p3%{750}%<%tE1\n%e%p3%{875}%<%tE\:\n%eF4%;\n%?%p4%{125}%<%t0\n%e%p4%{250}%<%tA2\n%e%p4%{375}%<%tA?\n%e%p4%{500}%<%tC8\n%e%p4%{625}%<%tD4\n%e%p4%{750}%<%tE1\n%e%p4%{875}%<%tE\:\n%eF4%;\n\E%%!1, 
 	invis=\E[=6;<5, is1=\E%!0\ETM1\E%!1\E[m, kbs=^H, 
 	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf0=\EOA, 
 	kf1=\EOB, kf2=\EOC, kf3=\EOD, kf4=\EP, kf5=\EQ, kf6=\ER, 
 	kf7=\ES, 
 	oc=\E%!0\n\ETFB0\n0000\n1F4F4F4\n2F400\n30F40\n4A4C<F4\n50F4F4\n6F40F4\n7F4F40\n\E%!1, 
-	op=\E[39;40m, rev=\E[7m, ri=\EM, rmacs=^O, rmir=\E[4l, 
-	rmso=\E[=0;<1m, rmul=\E[24m, 
+	op=\E[39;40m, rev=\E[7m, ri=\EM, rmacs=^O, rmcup=, 
+	rmir=\E[4l, rmso=\E[=0;<1m, rmul=\E[24m, 
 	setb=\E[=%?%p1%{0}%=%t0m\n%e%p1%{1}%=%t4m\n%e%p1%{2}%=%t3m\n%e%p1%{3}%=%t5m\n%e%p1%{4}%=%t2m\n%e%p1%{5}%=%t6m\n%e%p1%{6}%=%t7m\n%e1m%;, 
 	setf=\E[<%?%p1%{0}%=%t0m\n%e%p1%{1}%=%t4m\n%e%p1%{2}%=%t3m\n%e%p1%{3}%=%t5m\n%e%p1%{4}%=%t2m\n%e%p1%{5}%=%t6m\n%e%p1%{6}%=%t7m\n%e1m%;, 
 	sgr0=\E[=0;<1m\E[24;25;27m\017, smacs=^N, 
@@ -9347,12 +10335,11 @@ tty43|model 43 teletype,
 scanset|sc410|sc415|Tymshare Scan Set, 
 	am, bw, msgr, 
 	cols#80, lines#24, 
-	acsc=l<m-k4j%q\\\054x5, bel=^G, clear=\EH\EJ, cr=^M, 
-	cub1=^H, cud1=^J, cuf1=^I, 
-	cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=^K, ed=\EJ, el=\EK, 
-	home=\EH, ind=^J, kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA, 
-	mc0=\E;3, mc4=\E;0, mc5=\E;0, rc=^C, rmacs=^O, rs1=\E>, sc=^B, 
-	smacs=^N, 
+	acsc=l<m-k4j%q\,x5, bel=^G, clear=\EH\EJ, cr=^M, cub1=^H, 
+	cud1=^J, cuf1=^I, cup=\EY%p1%{32}%+%c%p2%{32}%+%c, 
+	cuu1=^K, ed=\EJ, el=\EK, home=\EH, ind=^J, kcub1=\ED, 
+	kcud1=\EB, kcuf1=\EC, kcuu1=\EA, mc0=\E;3, mc4=\E;0, 
+	mc5=\E;0, rc=^C, rmacs=^O, rs1=\E>, sc=^B, smacs=^N, 
 
 #### Volker-Craig (vc)
 #
@@ -9391,10 +10378,10 @@ vc414|vc414h|Volker-Craig 414H in sane escape mode.,
 	clear=\E\034$<40>, cud1=\E^K, cuf1=^P, 
 	cup=\E\021%p2%c%p1%c$<40>, cuu1=\E^L, dch1=\E3, 
 	dl1=\E\023$<40>, ed=\E^X, el=\E\017$<10/>, home=\E^R, 
-	ich1=\E\072, il1=\E\032$<40>, kcub1=^H, kcud1=\E^K, 
-	kcuf1=^P, kcuu1=\E^L, kf0=\EA, kf1=\EB, kf2=\EC, kf3=\ED, 
-	kf4=\EE, kf5=\EF, kf6=\EG, kf7=\EH, khome=\E^R, lf0=PF1, 
-	lf1=PF2, lf2=PF3, lf3=PF4, lf4=PF5, lf5=PF6, lf6=PF7, lf7=PF8, 
+	ich1=\E\:, il1=\E\032$<40>, kcub1=^H, kcud1=\E^K, kcuf1=^P, 
+	kcuu1=\E^L, kf0=\EA, kf1=\EB, kf2=\EC, kf3=\ED, kf4=\EE, 
+	kf5=\EF, kf6=\EG, kf7=\EH, khome=\E^R, lf0=PF1, lf1=PF2, 
+	lf2=PF3, lf3=PF4, lf4=PF5, lf5=PF6, lf6=PF7, lf7=PF8, 
 	rmso=\E^_, smso=\E^Y, 
 vc415|volker-craig 415, 
 	clear=^L, use=vc404, 
@@ -9414,24 +10401,79 @@ vc415|volker-craig 415,
 pcplot|pc-plot terminal emulation program, 
 	xenl@, 
 	csr@, dl@, dl1@, il@, il1@, rc@, sc@, use=vt100, 
-# (kaypro: removed obsolete ":ma=^K^P:" -- esr)
+# KayPro II from Richard G Turner <rturner at Darcom-Hq.ARPA>
+# I've found that my KayPro II, running MDM730, continues to emulate an
+# ADM-3A terminal, just like I was running TERM.COM. On our 4.2 UNIX
+# system the following termcap entry works well:
+# I have noticed a couple of minor glitches, but nothing I can't work
+# around. (I added two capabilities from the BRL entry -- esr)
 kaypro|kaypro2|kaypro II, 
 	am, 
 	cols#80, lines#24, 
-	clear=\032$<1/>, cub1=^H, cuf1=^L, 
-	cup=\E=%p1%{32}%+%c%p2%{32}%+%c, cuu1=^K, home=^^, 
-	kcub1=^H, kcud1=^J, kcuf1=^L, kcuu1=^K, 
+	bel=^G, clear=\032$<1/>, cr=^M, cud1=^J, cuf1=^L, 
+	cup=\E=%p1%{32}%+%c%p2%{32}%+%c, cuu1=^K, dl1=\ER, ed=^W, 
+	el=^X, home=^^, il1=\EE, ind=^J, kcud1=^J, kcuf1=^L, kcuu1=^K, 
 
 # From IBM, Thu May  5 19:35:27 1983
+# (ibmpc: commented out <smir>=\200R because we don't know <rmir> -- esr)
 ibmpc|ibm-pc|ibm5051|5051|IBM Personal Computer (no ANSI.SYS), 
 	am, 
 	cols#80, lines#24, 
 	bel=^G, clear=^L^K, cr=^M^^, cub1=^], cud1=^J, cuf1=^\, 
-	cuu1=^^, home=^K, ind=\n$<10>, kcud1=^_, smir=\200R, 
+	cuu1=^^, home=^K, ind=\n$<10>, kcud1=^_, 
 
-#### Apple
+#### Apple II
+#
+# Apple II firmware console first, then various 80-column cards and 
+# terminal emulators.  For two cents I'd toss all these in the UFO file
+# along with the 40-column apple entries.
 #
 
+# From: brsmith@umn-cs.cs.umn.edu (Brian R. Smith) via BRL
+#	'it#8' tells UNIX that you have tabs every 8 columns.  This is a
+#		function of TIC, not the firmware.
+#	The clear key on a IIgs will do something like clear-screen, 
+#		depending on what you're in.
+appleIIgs|appleIIe|appleIIc|Apple 80 column firmware interface, 
+	am, bw, eo, msgr, 
+	cols#80, it#8, lines#24, 
+	bel=^G, clear=^L, cr=^M, cub1=^H, cud1=^J, cuf1=^\, 
+	cup=\036%p2%{32}%+%c%p1%{32}%+%c, cuu1=^_, ed=^K, el=^], 
+	home=^Y, ht=^I, ind=^W, kbs=^H, kclr=^X, kcub1=^H, kcud1=^J, 
+	kcuf1=^U, kcuu1=^K, kdch1=\177, nel=^M^W, ri=^V, rmso=^N, 
+	smso=^O, 
+# Apple //e with 80-column card, entry from BRL
+# The modem interface is permitted to discard LF (maybe DC1), otherwise
+# passing characters to the 80-column firmware via COUT (PR#3 assumed).
+# Auto-wrap does not work right due to newline scrolling delay, which also
+# requires that you set "stty cr2".
+# Note: Cursor addressing is only available via the Pascal V1.1 entry,
+# not via the BASIC PR#3 hook.  All this nonsense can be avoided only by
+# using a terminal emulation program instead of the built-in firmware.
+apple2e|Apple //e, 
+	bw, msgr, 
+	cols#80, lines#24, 
+	bel=^G, clear=\014$<100/>, cub1=^H, cud1=^J, cuu1=^_, 
+	ed=\013$<4*/>, el=\035$<4/>, home=^Y, ht=^I, ind=^W, 
+	is2=^R^N, kbs=^H, kcub1=^H, kcud1=^J, kcuf1=^U, kcuu1=^K, 
+	nel=\r$<100/>, rev=^O, ri=^V, rmso=^N, rs1=^R^N, sgr0=^N, 
+	smso=^O, 
+# mcvax!vu44!vu45!wilcke uses the "ap" entry together with Ascii Express Pro
+# 4.20, with incoming and outgoing terminals both on 0, emulation On.
+apple2e-p|Apple //e via Pascal, 
+	cup=\036%p2%{32}%+%c%p1%{32}%+%c, kbs=^H, kcub1=^H, 
+	kcud1=^J, 
+	use=apple2e, 
+# (ASCII Express) MouseTalk "Standard Apple //" emulation from BRL
+# Enable DC3/DC1 flow control with "stty ixon -ixany".
+apple-ae|ASCII Express, 
+	am, bw, msgr, nxon, xon, 
+	cols#80, it#8, lines#24, 
+	bel=\007$<500/>, clear=^L, cr=^M, cub1=^H, cud1=^J, cuf1=^U, 
+	cup=\036%p2%{32}%+%c%p1%{32}%+%c, cuu1=^_, ed=^K, el=^], 
+	home=^Y, ind=^W, is2=^R^N, kclr=^X, kcub1=^H, kcud1=^J, 
+	kcuf1=^U, kcuu1=^K, rev=^O, ri=^V, rmso=^N, rs1=^R^N, sgr0=^N, 
+	smso=^O, 
 appleII|apple ii plus, 
 	am, 
 	cols#80, it#8, lines#24, 
@@ -9467,24 +10509,141 @@ apple-videx|Apple with videx videoterm 80 column board with inverse video,
 	cup=\036%p2%{32}%+%c%p1%{32}%+%c, cuu1=^_, ed=^K, el=^], 
 	home=^Y, ht=^I, kcub1=^H, kcud1=^J, kcuf1=^U, khome=^Y, 
 	rmso=^Z2, sgr0=^Z2, smso=^Z3, 
+# My system [for reference] : Apple ][+, 64K, Ultraterm display card,
+#			      Apple Cat ][ 212 modem, + more all
+#			      controlled by ASCII Express: Pro.
+# From Dave Shaver <isucs1!shaver>
+apple-uterm-vb|Videx Ultraterm for Apple micros with Visible Bell, 
+	am, eo, xt, 
+	cols#80, lines#24, 
+	acsc=, clear=^L, cuf1=^\, 
+	cup=\036%p2%{32}%+%c%p1%{32}%+%c, cuu1=^_, ed=^K, el=^], 
+	flash=^W35^W06, home=^Y, 
+	is2=^V4^W06\017\rVisible Bell Installed.\016\r\n, 
+	rmso=^N, smso=^O, 
+apple-uterm|Ultraterm for Apple micros, 
+	am, eo, xt, 
+	cols#80, lines#24, 
+	acsc=, clear=^L, cuf1=^\, 
+	cup=\036%p2%{32}%+%c%p1%{32}%+%c, cuu1=^_, ed=^K, el=^], 
+	home=^Y, is2=^V4^W06\016, rmso=^N, smso=^O, 
+# from trwrba!bwong (Bradley W. Wong):
+#
+# This entry assumes that you are using an apple with the UCSD Pascal
+# language card.  SYSTEM.MISCINFO is assumed to be the same as that
+# supplied with the standard apple except that screenwidth should be set
+# using SETUP to 80 columns.  Note that the right arrow in not mapped in
+# this termcap entry.  This is because that key, on the Apple, transmits
+# a ^U and would thus preempt the more useful "up" function of vi.
+#
+# HMH 2/23/81
+apple80p|80-column apple with Pascal card, 
+	am, bw, 
+	cols#80, lines#24, 
+	clear=^Y^L, cuf1=^\\:, 
+	cup=\036%p2%{32}%+%c%p1%{32}%+%c, cuu1=^_, ed=^K, el=^], 
+	home=^Y, kcub1=^H, 
+#
+# Apple II+ equipped with Videx 80 column card
+#
+# Terminfo from ihnp4!ihu1g!djc1 (Dave Christensen) via BRL;
+# manually converted by D A Gwyn
+#
+# DO NOT use any terminal emulation with this data base, it works directly
+# with the Videx card.  This has been tested with vi 1200 baud and works fine.
+#
+# This works great for vi, except I've noticed in pre-R2, ^U will scroll back
+# 1 screen, while in R2 ^U doesn't.
+# For inverse alternate character set add:
+#	<smacs>=^O:<rmacs>=^N:
+# (apple-v: added it#8 -- esr)
+apple-videx2|Apple II+ w/ Videx card (similar to Datamedia h1520), 
+	am, xenl, 
+	cols#80, it#8, lines#24, 
+	bel=\007$<100/>, clear=\014$<16*/>, cr=^M, cub1=^H, 
+	cud1=^J, cuf1=^\, cup=\036%p2%{32}%+%c%p1%{32}%+%c, 
+	cuu1=^_, ed=\013$<16*/>, el=^], home=^Y, ht=\011$<8/>, 
+	ind=^J, kbs=^H, kcub1=^H, kcud1=^J, kcuf1=^\, kcuu1=^_, 
+	khome=^Y, rmso=^Z2, smso=^Z3, 
+apple-videx3|vapple|Apple II with 80 col card, 
+	am, 
+	cols#80, lines#24, 
+	clear=\Ev, cuf1=\EC, cup=\EY%p1%{32}%+%c%p2%{32}%+%c, 
+	cuu1=\EA, el=\Ex, home=\EH, kcub1=\ED, kcud1=\EB, kcuf1=\EC, 
+	kcuu1=\EA, kf0=\EP, kf1=\EQ, kf2=\ER, kf3=\E\s, kf4=\E!, 
+	kf5=\E", kf6=\E#, kf7=\E$, kf8=\E%, kf9=\E&, khome=\EH, 
+#From: decvax!cbosgd!cbdkc1!mww Mike Warren via BRL
+aepro|Apple II+ running ASCII Express Pro--vt52, 
+	cols#80, lines#24, 
+	clear=\014$<300/>, cuf1=\EC, 
+	cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, ed=\EJ, 
+	el=\EK, home=\EH, 
+# UCSD addition: Yet another termcap from Brian Kantor's Micro Munger Factory
+apple-vm80|ap-vm80|apple with viewmax-80, 
+	cols#80, lines#24, 
+	clear=\014$<300/>, cuf1=^\\:, 
+	cup=\036%p1%{32}%+%c%p2%{32}%+%c$<100/>, cuu1=^_, 
+	ed=\013$<300/>, el=^], home=\031$<200/>, 
+
+#### Apple Lisa & Macintosh
+#
+
+# (lisa: changed <cvvis> to <cnorm> -- esr)
 lisa|apple lisa console display (black on white), 
 	am, eo, msgr, 
 	cols#88, it#8, lines#32, 
 	acsc=lfmekcjdttuvvuwsqax`nb, civis=\E[5h, clear=^L, 
-	cub1=^H, cud1=\E[B, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, 
-	cuu1=\E[A, cvvis=\E[5l, dch1=\E[P, dl1=\E[M, ed=\E[J, 
-	el=\E[K, home=\E[H, ht=^I, ich1=\E[@, il1=\E[L, 
+	cnorm=\E[5l, cub1=^H, cud1=\E[B, cuf1=\E[C, 
+	cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dch1=\E[P, dl1=\E[M, 
+	ed=\E[J, el=\E[K, home=\E[H, ht=^I, ich1=\E[@, il1=\E[L, 
 	is2=\E>\E[m\014, kbs=^H, kcub1=\E[D, kcud1=\E[B, 
 	kcuf1=\E[C, kcuu1=\E[A, rmacs=\E[10m, rmso=\E[m, rmul=\E[m, 
 	sgr0=\E[m, smacs=\E[11m, smso=\E[7m, smul=\E[4m, 
 liswb|apple lisa console display (white on black), 
 	is2=\E>\E[0;7m\014, rmso=\E[0;7m, rmul=\E[0;7m, 
 	smso=\E[m, smul=\E[4m, use=lisa, 
+
+# lisaterm from ulysses!gamma!epsilon!mb2c!jed (John E. Duncan III) via BRL;
+# <is2> revised by Ferd Brundick <fsbrn@BRL.ARPA>
+#
+# These entries assume that the 'Auto Wraparound' is enabled.
+# Xon-Xoff flow control should also be enabled.
+#
+# The vt100 uses :rs2: and :rf: rather than :is2:/:tbc:/:hts: because the tab
+# settings are in non-volatile memory and don't need to be reset upon login.
+# Also setting the number of columns glitches the screen annoyingly.
+# You can type "reset" to get them set.
+#
+lisaterm|Apple Lisa or Lisa/2 running LisaTerm vt100 emulation, 
+	am, xenl, xon, 
+	cols#80, it#8, lines#24, vt#3, 
+	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cr=^M, 
+	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, 
+	cud=\E[%p1%dB, cud1=^J, cuf=\E[%p1%dC, cuf1=\E[C, 
+	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, ed=\E[J, 
+	el=\E[K, home=\E[H, ht=^I, hts=\EH, ind=^J, kbs=^H, kcub1=\EOD, 
+	kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf0=\EOP, kf1=\EOQ, 
+	kf2=\EOR, kf3=\EOS, lf0=F1, lf1=F2, lf2=F3, lf3=F4, rc=\E8, 
+	rev=\E[7m, ri=\EM, rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m, 
+	rs1=\E>\E[?1l\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;24r, 
+	sc=\E7, sgr0=\E[m, smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, 
+	tbc=\E[3g, 
+# Lisaterm in 132 column ("wide") mode.
+lisaterm-w|Apple Lisa with Lisaterm in 132 column mode, 
+	cols#132, 
+	kbs=^H, kcub1=^H, kcud1=^J, use=lisaterm, 
+# Although MacTerminal has insert/delete line, it is commented out here
+# since it is much faster and cleaner to use the "lock scrolling region"
+# method of inserting and deleting lines due to the MacTerminal implementation.
+# Also, the "Insert/delete ch" strings have an extra character appended to them
+# due to a bug in MacTerminal V1.1.  Blink is disabled since it is not
+# supported by MacTerminal.
 mac|macintosh|Macintosh with MacTerminal, 
 	xenl, 
-	dch1=\E[P$<7/>, dl1=\E[M$<20/>, ich1=\E[@$<9/>, 
-	il1=\E[L$<20/>, ip=$<7/>, 
-	use=vt100, 
+	blink@, dch1=\E[P$<7/>, ich1=\E[@$<9/>, ip=$<7/>, use=lisa, 
+# Lisaterm in 132 column ("wide") mode.
+mac-w|macterminal-w|Apple Macintosh with Macterminal in 132 column mode, 
+	cols#132, use=mac, 
 
 #### Radio Shack/Tandy
 #
@@ -9495,12 +10654,12 @@ mac|macintosh|Macintosh with MacTerminal,
 coco3|os9LII|Tandy CoCo3 24*80 OS9 Level II, 
 	am, 
 	cols#80, it#8, lines#24, 
-	bel=^G, blink=^_", bold=\E\072^A, civis=^E , 
+	bel=^G, blink=^_", bold=\E\:^A, civis=^E\s, 
 	clear=\014$<5*/>, cnorm=^E!, cub1=^H, cud1=^J, cuf1=^F, 
 	cup=\002%p2%{32}%+%c%p1%{32}%+%c$<2/>, cuu1=^I, 
 	dl1=^_1, ed=^K, el=^D, home=^A, il1=^_0, kcub1=^H, kcud1=^J, 
-	kcuf1=^I, kcuu1=^L, rev=^_ , rmso=^_!, rmul=^_#, 
-	sgr0=\037!\E\072\200, smso=^_ , smul=^_", 
+	kcuf1=^I, kcuu1=^L, rev=^_\s, rmso=^_!, rmul=^_#, 
+	sgr0=\037!\E\:\200, smso=^_\s, smul=^_", 
 # (trs2: removed obsolete ":nl=^_:" -- esr)
 trs2|trsII|trs80II|Radio Shack Model II using P&T CP/M, 
 	am, msgr, 
@@ -9547,7 +10706,7 @@ uniterm|uniterm49|UniTerm VT220 emulator with 49 lines,
 # MiNT is Now TOS, the operating system which comes with all Ataris now
 # (mainly Atari Falcon). This termcap is for the VT52 emulation you get
 # under tcsh/zsh/bash/sh/ksh/ash/csh when you run MiNT in `console' mode
-# From: Per Persson <pp@pfawww.pp.se>, 27 Feb 1996
+# From: Per Persson <pp@gnu.ai.mit.edu>, 27 Feb 1996
 st52|Atari ST with VT52 emulation, 
 	am, km, 
 	cols#80, lines#25, 
@@ -9559,7 +10718,7 @@ st52|Atari ST with VT52 emulation,
 	kcuu1=\E#H, kf0=\E#D, kf1=\E#;, kf2=\E#<, kf3=\E#=, kf4=\E#>, 
 	kf5=\E#?, kf6=\E#@, kf7=\E#A, kf8=\E#B, kf9=\E#C, khome=\E#G, 
 	kil1=\E#R, kind=\E#2, kri=\E#8, lf0=f10, nel=^M^J, rc=\Ek, 
-	ri=\EI, rmso=\Eq, rs1=\Ez_\Eb@\EcA, sc=\Ej, sgr0=\Eq, 
+	ri=\EI, rmcup=, rmso=\Eq, rs1=\Ez_\Eb@\EcA, sc=\Ej, sgr0=\Eq, 
 	smcup=\Ee, smso=\Ep, 
  
 #### Commodore Business Machines
@@ -9641,22 +10800,21 @@ amiga|Amiga ANSI,
 commodore|b-128|Commodore B-128 micro, 
 	am, bw, 
 	cols#80, lines#24, pb#150, 
-	bel=^G, clear=\E\006$<10/>, cr=^M, cub1=^H, cud1=^M, cuf1=^F, 
-	cup=\E\013%p1%2d\054%p2%2d\054$<20/>, cuu1=^P, 
+	clear=\E\006$<10/>, cr=^M, cud1=^J, cuf1=^F, 
+	cup=\E\013%p1%2d\,%p2%2d\,$<20/>, cuu1=^P, 
 	dch1=\177$<10*/>, dl1=\Ed$<10*/>, el=\Eq$<10/>, 
 	home=\E^E, ht=\011$<5/>, ich1=\E\n$<5/>, il1=\Ei$<10/>, 
-	kbs=^H, kcub1=^B, kcud1=^J, kcuf1=^F, kcuu1=^P, khome=\E^E, 
-	nel=^M^M, rmir=, smir=, 
+	kcub1=^B, kcud1=^J, kcuf1=^F, kcuu1=^P, khome=\E^E, rmir=, 
+	smir=, 
 
 #### North Star
 #
 # North Star Advantage from Lt. Fickie <brl-ibd!fickie> via BRL
 northstar|North Star Advantage, 
 	cols#80, lines#24, 
-	bel=^G, clear=\004$<200/>, cr=^M, cub1=^H, cud1=^J, 
+	clear=\004$<200/>, 
 	cup=\E=%p1%{32}%+%c%p2%{32}%+%c$<1/>, ed=\017$<200/>, 
-	el=\016$<200/>, home=\034\032$<200/>, ht=^I, ind=^J, 
-	kbs=^H, kcub1=^H, kcud1=^J, nel=^M^J, 
+	el=\016$<200/>, home=\034\032$<200/>, 
 
 #### Osborne
 #
@@ -9672,14 +10830,22 @@ northstar|North Star Advantage,
 # with most systems.
 #	
 # The tab is destructive on the Ozzie; make sure to 'stty -tabs'.
-ozzie|osborne|osborne1|osborne 1, 
+osborne-w|osborne1-w|osborne I in 104-column mode, 
 	msgr, ul, xt, 
 	cols#104, lines#24, 
 	bel=^G, clear=^Z, cr=^M, cub1=^H, cud1=^J, cuf1=^L, 
 	cup=\E=%p1%{32}%+%c%p2%{32}%+%c, cuu1=^K, dch1=\EW, 
 	dl1=\ER, el=\ET, ich1=\EQ, il1=\EE, ind=^J, kcub1=^H, kcud1=^J, 
 	kcuf1=^L, kcuu1=^K, rmso=\E(, rmul=\Em, smso=\E), smul=\El, 
-
+# Osborne I	from ptsfa!rhc (Robert Cohen) via BRL
+osborne|osborne1|osborne I in 80-column mode, 
+	am, mir, msgr, ul, xhp, 
+	cols#80, lines#24, 
+	clear=^Z, cub1=\010$<4>, cud1=^J, cuf1=^L, 
+	cup=\E=%p1%{32}%+%c%p2%{32}%+%c, cuu1=^K, 
+	dch1=\\EW$<4/>, dl1=\ER, el=\ET, il1=\EE, is2=^Z, kbs=^H, 
+	kcub1=^H, kcud1=^J, kcuf1=^L, kcuu1=^K, rmir=, rmso=\E), 
+	rmul=\Em, smir=\EQ, smso=\E(, smul=\El, 
 #
 # Osborne Executive definition from BRL
 # Similar to tvi920
@@ -9689,12 +10855,12 @@ osexec|Osborne executive,
 	cols#80, lines#24, xmc#1, 
 	bel=^G, clear=^Z, cr=^M, cub1=^H, cud1=^J, cuf1=^L, 
 	cup=\E=%p1%{32}%+%c%p2%{32}%+%c, cuu1=^K, dch1=\EW, 
-	dl1=\ER, ed=\EY, el=\ET, home=^^, ht=^I, hts=\E1, ich1=\EQ, 
-	il1=\EE, is2=\Eq\Ek\Em\EA\Ex0, kbs=^H, kcub1=^H, kcud1=^J, 
-	kcuf1=^L, kcuu1=^K, kf0=^A@\r, kf1=^AA\r, kf2=^AB\r, 
-	kf3=^AC\r, kf4=^AD\r, kf5=^AE\r, kf6=^AF\r, kf7=^AG\r, 
-	kf8=^AH\r, kf9=^AI\r, nel=^M^J, rmir=, rmso=\Ek, rmul=\Em, 
-	smir=, smso=\Ej, smul=\El, tbc=\E3, 
+	dl1=\ER, ed=\EY, el=\ET, home=^^, hts=\E1, ich1=\EQ, il1=\EE, 
+	is2=\Eq\Ek\Em\EA\Ex0, kbs=^H, kcub1=^H, kcud1=^J, kcuf1=^L, 
+	kcuu1=^K, kf0=^A@\r, kf1=^AA\r, kf2=^AB\r, kf3=^AC\r, 
+	kf4=^AD\r, kf5=^AE\r, kf6=^AF\r, kf7=^AG\r, kf8=^AH\r, 
+	kf9=^AI\r, rmir=, rmso=\Ek, rmul=\Em, smir=, smso=\Ej, 
+	smul=\El, tbc=\E3, 
 
 #### Console types for obsolete UNIX clones
 #
@@ -9710,9 +10876,26 @@ osexec|Osborne executive,
 # even as single processes under SunOS and the Macintosh OS.
 #
 
-minix|minix console, 
+# This is the entry provided with minix 1.7.4, with bogus :ri: removed.
+minix|minix console (v1.7), 
+	am, xenl, 
 	cols#80, it#8, lines#25, 
-	blink=\E[5m, bold=\E[1m, clear=\E[H\E[0J, cr=^M, 
+	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[0J, cr=^M, 
+	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\E[B, 
+	cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, 
+	cuu=\E[%p1%dA, cuu1=\E[A, dch=\E[%p1%dP, dch1=\E[P, 
+	dl=\E[%p1%dM, dl1=\E[M, ed=\E[0J, el=\E[K, home=\E[H, ht=^I, 
+	ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=^J, 
+	is2=\E[0m, kbs=^H, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, 
+	kcuu1=\E[A, kf0=\E[Y, kf1=\E[V, kf2=\E[U, kf3=\E[T, kf4=\E[S, 
+	kf5=\E[G, khome=\E[H, lf0=End, lf1=PgUp, lf2=PgDn, lf3=Num +, 
+	lf4=Num -, lf5=Num 5, nel=^M^J, rev=\E[7m, ri=\EM, 
+	rmso=\E[0m, rmul=\E[0m, sgr0=\E[0m, smso=\E[7m, smul=\E[4m, 
+# Corrected Jan 14, 1997 by Vincent Broman <broman@nosc.mil>
+minix-old|minix console (v1.5), 
+	xon, 
+	cols#80, it#8, lines#25, 
+	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[0J, cr=^M, 
 	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\E[B, 
 	cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, 
 	cuu=\E[%p1%dA, cuu1=\E[A, dch=\E[%p1%dP, dch1=\E[P, 
@@ -9722,6 +10905,10 @@ minix|minix console,
 	kf0=\E[Y, kf1=\E[V, kf2=\E[U, kf3=\E[T, kf4=\E[S, kf5=\E[G, 
 	khome=\E[H, nel=^M^J, rev=\E[7m, ri=\EM, rmso=\E[0m, 
 	rmul=\E[0m, sgr0=\E[0m, smso=\E[7m, smul=\E[4m, 
+# The linewrap option can be specified by editing /usr/include/minix/config.h
+# before recompiling the minix 1.5 kernel.
+minix-old-am|minix console with linewrap, 
+	am, use=minix-old, 
 
 pc-minix|minix console on an Intel box, 
 	use=klone+acs, use=minix, 
@@ -9783,20 +10970,36 @@ xerox820|x820|Xerox 820,
 #### Videotex and teletext
 #
 
-# standard-issue France Telecom minitel terminal (made by Philips)
-# (m2-nam: had unknown :zd=\E[1m:zb=\E[5m:zc=lkmjqxtuwvn:; also deleted
-# unnecessary :ug#0:sg#0: and added <acsc> to quiet tic. -- esr)
-m2-nam|minitel|minitel-2|minitel-2-nam|France Telecom Minitel, 
-	xenl, 
-	cols#80, it#8, lines#24, 
-	acsc=, clear=\E[H\E[J, cub1=^H, cuf1=\E[C, 
-	cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dch1=\E[P, dl1=\E[M, 
-	ed=\E[J, el=\E[K, home=\E[H, ht=^I, il1=\E[L, ind=^J, ip=$<7/>, 
-	is2=\E[1;24r\E[24;1H, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, 
-	kcuu1=\E[A, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, 
-	khome=\E[H, ri=\EM, rmacs=\E(B, rmir=\E[4l, rmso=\E[m, 
-	rmul=\E[m, sgr0=\E[m, smacs=\E(0, smir=\E[4h, smso=\E[7m, 
-	smul=\E[4m, 
+# \E\:1}	switch to te'le'informatique mode (ascii terminal/ISO 6429)
+# \E[?3l	80 columns
+# \E[?4l	scrolling on
+# \E[12h	local echo off
+# \Ec		reset: G0 U.S. charset (to get #,@,{,},...), 80 cols, clear screen
+# \E)0		G1 DEC set (line graphics)
+#
+# From: Igor Tamitegama <igor@ppp1493-ft.teaser.fr>, 18 Jan 1997
+m2-nam|minitel|minitel-2|minitel-2-nam|France Telecom Minitel 2 mode te'le'informatique, 
+	eslok, hs, xenl, 
+	cols#80, it#8, lines#24, wsl#72, xmc#0, 
+	acsc=aaffggjjkkllmmnnooqqssttuuvvwwxx, bel=^G, 
+	blink=\E[5m, bold=\E[1m, civis=\E[<1h, clear=\E[H\E[J, 
+	cnorm=\E[<1l, cr=^M, csr=\E[%i%p1%d;%p2%dr, 
+	cub=\E[%p1%dD, cub1=\E[D, cud=\E[%p1%dB, cud1=\E[B, 
+	cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, 
+	cuu=\E[%p1%dA, cuu1=\E[A, dch=\E[%p1%dP, dch1=\E[P, 
+	dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, flash=^G, fsl=^J, 
+	home=\E[H, ht=^I, il=\E[%p1%dL, il1=\E[L, ind=^J, indn=^J, 
+	ip=$<7/>, is1=\E\:1}\Ec\E[?4l\E[12h, is2=\Ec\E[12h\E)0, 
+	is3=\E[?3l kbs=\010, kclr=\E[2J, kcub1=\E[D, kcud1=\E[B, 
+	kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[P, kdl1=\E[M, kf0=\EOp, 
+	kf1=\EOq, kf10=\EOp, kf2=\EOr, kf3=\EOs, kf4=\EOt, kf5=\EOu, 
+	kf6=\EOv, kf7=\EOw, kf8=\EOx, kf9=\EOy, khome=\E[H, 
+	kich1=\E[4h, kil1=\E[4l, knp=\EOn, kpp=\EOR, ll=\E[24;80H, 
+	mc0=\E[i, nel=^M^J, rc=\E8, rev=\E[7m, ri=\EM, rin=\EM, 
+	rmacs=^O, rmir=\E[4l, rmso=\E[27m, rmul=\E[24m, 
+	rs1=\Ec\E[?4l\E[12h, rs2=\Ec\E)0, sc=\E7, sgr0=\E[m, 
+	smacs=^N, smir=\E[4h, smso=\E[7m, smul=\E[4m, tsl=^_@A, 
+	u6=\E[%i%d;%dR, u7=\E[6n, 
 
 ######## OBSOLETE VDT TYPES
 #
@@ -9932,13 +11135,12 @@ cg7900|chromatics|chromatics 7900,
 	am, 
 	cols#80, lines#40, 
 	bel=^G, clear=^L, cr=^M, cub1=^H, cud1=^J, cuf1=^], 
-	cup=\001M%p2%d\\\054%p1%d\\\054, cuu1=^K, dch1=^A<1, 
-	dl1=^A<2, ed=^Al, el=^A`, home=^\, ich1=^A>1, il1=^A>2, ind=^J, 
-	ll=^A|, 
-	rmcup=\001W0\\\05440\\\05485\\\05448\\\054\014\001W0\\\0540\\\05485\\\05448\\\054\001M0\\\05440\\\054, 
-	rmso=\001C1\\\054\001c2\\\054, 
-	smcup=\001P0\001O1\001R1\001C4\\\054\001c0\\\054\014\001M0\\\05442\\\054WARNING DOUBLE ENTER ESCAPE and \025\001C1\\\054\001c2\\\054\001W0\\\0540\\\05479\\\05439\\\054, 
-	smso=\001C4\\\054\001c7\\\054, uc=\001\001_\001\200, 
+	cup=\001M%p2%d\,%p1%d\,, cuu1=^K, dch1=^A<1, dl1=^A<2, 
+	ed=^Al, el=^A`, home=^\, ich1=^A>1, il1=^A>2, ind=^J, ll=^A|, 
+	rmcup=\001W0\,40\,85\,48\,\014\001W0\,0\,85\,48\,\001M0\,40\,, 
+	rmso=\001C1\,\001c2\,, 
+	smcup=\001P0\001O1\001R1\001C4\,\001c0\,\014\001M0\,42\,WARNING DOUBLE ENTER ESCAPE and \025\001C1\,\001c2\,\001W0\,0\,79\,39\,, 
+	smso=\001C4\,\001c7\,, uc=\001\001_\001\200, 
 
 #### Computer Automation
 #
@@ -10059,7 +11261,6 @@ dw2|decwriter|dw|decwriter II,
 	hc, os, 
 	cols#132, 
 	bel=^G, cr=^M, cub1=^H, cud1=^J, ind=^J, kbs=^H, 
-
 # \E(B		Use U.S. character set (otherwise # => british pound !)
 # \E[20l	Disable "linefeed newline" mode (else puts \r after \n,\f,\v)
 # \E[w   	10 char/in pitch
@@ -10282,20 +11483,23 @@ alto-h19|altoh19|altoheath|alto-heath|alto emulating heathkit h19,
 # it's only given an insert character ability or the Z29 doesn't 
 # require padding with this (the former is probably more likely, 
 # but I haven't checked it out).
-# (z29: added empty <acsc> to suppress a tic warning --esr)
+# (z29: added empty <acsc> to suppress a tic warning, merged in
+# status line capabilities from BRL entry --esr)
 z29|zenith29|z29b|zenith z29b, 
-	am, msgr, 
+	am, eslok, hs, mir, msgr, 
 	cols#80, lines#24, 
 	acsc=, bel=^G, cbt=\E-, clear=\EE$<14>, cnorm=\Ey4, cr=^M, 
 	cub1=^H, cud1=\EB, cuf1=\EC, 
 	cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\E$<1>A, 
-	cvvis=\Ex4, dch1=\EN$<0.1*>, dl1=\EM$<1>, ed=\EJ$<14>, 
-	el=\EK$<1>, home=\EH, ht=^I, ich1=\E<\E[1@\E[?2h$<1>, 
-	il1=\EL$<1>, ind=\n$<2>, is2=\E<\E[?2h\Ev, kbs=^H, 
-	kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA, kf0=\E~, kf1=\ES, 
-	kf2=\ET, kf3=\EU, kf4=\EV, kf5=\EW, kf6=\EP, kf7=\EQ, kf8=\ER, 
-	kf9=\E0I, khome=\EH, lf0=home, ri=\EI$<2>, rmacs=\EF, 
-	rmso=\Eq, rmul=\Es0, smacs=\EG, smso=\Ep, smul=\Es8, 
+	cvvis=\Ex4, dch1=\EN$<0.1*>, dl1=\EM$<1/>, dsl=\Ey1, 
+	ed=\EJ$<14>, el=\EK$<1>, fsl=\Ek\Ey5, home=\EH, ht=^I, 
+	ich1=\E<\E[1@\E[?2h$<1>, il1=\EL$<1/>, ind=\n$<2>, 
+	is2=\E<\E[?2h\Ev, kbs=^H, kcub1=\ED, kcud1=\EB, kcuf1=\EC, 
+	kcuu1=\EA, kf0=\E~, kf1=\ES, kf2=\ET, kf3=\EU, kf4=\EV, 
+	kf5=\EW, kf6=\EP, kf7=\EQ, kf8=\ER, kf9=\E0I, khome=\EH, 
+	lf0=home, ri=\EI$<2/>, rmacs=\EF, rmir=\EO, rmso=\Eq, 
+	rmul=\Es0, smacs=\EG, smir=\E@, smso=\Ep, smul=\Es8, 
+	tsl=\Ej\Ex5\Ex1\EY8%+ \Eo, 
 # z29 in ansi mode. Assumes that the cursor is in the correct state, and that
 # the world is stable. <rs1> causes the terminal to be reset to the state
 # indicated by the name. kc -> key click, nkc -> no key click, uc -> underscore
@@ -10304,7 +11508,7 @@ z29|zenith29|z29b|zenith z29b,
 # (z29a: replaced nonexistent <if=/usr/share/tabset/zenith29> befause <hts>
 # looks vt100-compatible -- esr)
 z29a|z29a-kc-bc|h29a-kc-bc|heath/zenith 29 in ansi mode, 
-	eslok, hs, 
+	am, eslok, hs, mir, msgr, 
 	cols#80, it#8, lines#24, 
 	bel=^G, blink=\E[5m, bold=\E[2m, clear=\E[2J, cr=^M, 
 	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, 
@@ -10392,6 +11596,7 @@ ztx|ztx11|zt-1|htx11|ztx-1-a|ztx-10 or 11,
 # There was a company called IMS International located in Carson City, 
 # Nevada, that flourished from the mid-70s to mid-80s.  They made S-100
 # bus/Z80 hardware and a line of terminals called Ultimas.  
+#
 
 # From: Erik Fair <fair@ucbarpa.berkeley.edu>  Sun Oct 27 07:21:05 1985
 ims950-b|bare ims950 no init string, 
@@ -10433,6 +11638,9 @@ superbrain|intertec superbrain,
 	cup=\EY%p1%{32}%+%c%p2%{32}%+%c$<20>, cuu1=^K, 
 	ed=\E~k<10*>, el=\E~K$<15>, ht=^I, ind=^J, kcub1=^U, 
 	kcud1=^J, kcuf1=^F, kcuu1=^K, rmcup=^L, smcup=^L, 
+# (intertube: a Gould entry via BRL asserted smul=\E0@$<200/>, 
+# rmul=\E0A$<200/>; my guess is the highlight letter is bit-coded like an ADM,
+# and the reverse is actually true.  Try it. -- esr)
 intertube|intertec|Intertec InterTube, 
 	am, 
 	cols#80, lines#25, 
@@ -10460,7 +11668,7 @@ intertube2|intertec data systems intertube 2,
 # However, the outfit went bankrupt years ago.
 #
 
-# The Graphos III was a color graphics terminal frome Ithaca Intersystems.
+# The Graphos III was a color graphics terminal from Ithaca Intersystems.
 # These entries were written (originally in termcap syntax) by Brian Yandell 
 # <yandell@stat.wisc.edu> and Mike Meyer <mikem@stat.wisc.edu> at the 
 # University of Wisconsin.
@@ -10499,7 +11707,7 @@ graphos-30|graphos III with 30 lines,
 # I think Modgraph is long gone.
 #
 
-modgraph|mod|modgraph terminal emulating vt100, 
+modgraph|mod24|modgraph terminal emulating vt100, 
 	xenl@, 
 	cols#80, lines#24, 
 	cvvis=\E\^9;0s\E\^7;1s, 
@@ -10515,6 +11723,32 @@ modgraph2|modgraph gx-1000 80x24 with keypad not enabled,
 	ed=\EJ$<50/>, el=\EK$<3/>, ht=^I, 
 	is2=\E<\E\^5;2s\E\^7;1s\E[3g\E\^11;9s\E\^11;17s\E\^11;25s\E\^11;33s\E\^11;41s\E\^11;49s\E\^11;57s\E\^11;65s\E\^11;73s\E\^11;81s\E\^11;89s\E\^12;0s\E\^14;2s\E\^15;9s\E\^25;1s\E\^9;1s\E\^27;1, 
 	ri=\EI$<5/>, 
+#
+# Modgraph from Nancy L. Cider <nancyc@brl-tbd>
+# BUG NOTE from Barbara E. Ringers <barb@brl-tbd>:
+# If we set TERM=vt100, and set the Modgraph screen to 24 lines, setting a
+# mark and using delete-to-killbuffer work correctly.  However, we would
+# like normal mode of operation to be using a Modgraph with 48 line setting.
+# If we set TERM=mod (which is a valid entry in termcap with 48 lines)
+# the setting mark and delete-to-killbuffer results in the deletion of only
+# the line the mark is set on.
+# We've discovered that the delete-to-killbuffer works correctly
+# with TERM=mod and screen set to 80x48 but it's not obvious.  Only
+# the first line disappears but a ctrl-l shows that it did work
+# correctly.
+modgraph48|mod|Modgraph w/48 lines, 
+	am, xenl, 
+	cols#80, it#8, lines#48, vt#3, 
+	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[;H\E[2J, cr=^M, 
+	csr=\E[%i%p1%d;%p2%dr, cub1=^H, cud1=^J, cuf1=\E[C, 
+	cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, ed=\E[J, el=\E[K, 
+	flash=\E[?5h\E[0q\E[1;2q\E[?5l\E[0q\E[4;3q, 
+	home=\E[H, ht=^I, is2=\E<\E[1;48r\E[0q\E[3;4q\E=\E[?1h, 
+	kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, 
+	kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, rc=\E8, rev=\E[7m, 
+	ri=\EM, rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m, 
+	rs1=\E=\E[0q\E>, sc=\E7, sgr0=\E[m, smkx=\E[?1h\E=, 
+	smso=\E[7m, smul=\E[4m, 
 
 #### Morrow Designs
 # 
@@ -10534,7 +11768,7 @@ modgraph2|modgraph gx-1000 80x24 with keypad not enabled,
 mt70|mt-70|Morrow MD-70; native Morrow mode, 
 	am, mir, msgr, xon, 
 	cols#80, it#8, lines#24, 
-	acsc=+z\\\054{.yOi-x`|jGkFlEmDnHtLuKvNwMxIqJ, bel=^G, 
+	acsc=+z\,{.yOi-x`|jGkFlEmDnHtLuKvNwMxIqJ, bel=^G, 
 	cbt=\EI, civis=\E"0, clear=^Z, cnorm=\E"2, cr=^M, cub1=^H, 
 	cud1=^J, cuf1=^L, cup=\E=%p1%{32}%+%c%p2%{32}%+%c$<1>, 
 	cuu1=^K, dch1=\EW, dim=\EG2, dl1=\ER, ed=\EY, el=\ET$<10>, 
@@ -10546,10 +11780,24 @@ mt70|mt-70|Morrow MD-70; native Morrow mode,
 	kf17=^Af\r, kf18=^Ag\r, kf19=^Ah\r, kf2=^AA\r, kf20=^Ai\r, 
 	kf3=^AB\r, kf4=^AC\r, kf5=^AD\r, kf6=^AE\r, kf7=^AF\r, 
 	kf8=^AG\r, kf9=^AH\r, khlp=^AO\r, khome=^AN\r, nel=^_, 
-	rmacs=\E%, smacs=\E$, smcup=\E"2\EG0\E], smul=\EG1, 
+	rmacs=\E%, rmcup=, smacs=\E$, smcup=\E"2\EG0\E], smul=\EG1, 
 	tbc=\E0, 
 	use=adm+sgr, 
 
+#### Motorola
+#
+
+# Motorola EXORterm 155	from {decvax, ihnp4}!philabs!sbcs!megad!seth via BRL
+# (Seth H Zirin)
+ex155|Motorola Exorterm 155, 
+	am, bw, 
+	cols#80, lines#24, 
+	cbt=\E[, clear=\EX, cud1=\EB, cuf1=\ED, 
+	cup=\EE%p1%{32}%+%c%p2%{32}%+%c, ed=\ET, el=\EU, 
+	home=\E@, ht=\EZ, kbs=^H, kcbt=\E[, kclr=\EX, kcub1=^H, 
+	kcud1=^J, kcuf1=^L, kcuu1=^K, ked=\ET, kel=\EU, khome=\E@, 
+	rmso=\Ec\ED, rmul=\Eg\ED, smso=\Eb\ED, smul=\Ef\ED, 
+
 #### Omron
 #
 # This company is still around in 1995, manufacturing point-of-sale systems.
@@ -10598,7 +11846,17 @@ rt6221|Ramtek 6221, 80x24,
 # [TO DO: Check out: short forms of ho/cl and ll; reset (\Ec)].
 rt6221-w|Ramtek 6221, 160x48, 
 	cols#160, lines#48, 
-	kbs=^H, kcub1=^H, kcud1=^J, ll=\E[48;1H, use=rt6221, 
+	ll=\E[48;1H, use=rt6221, 
+
+#### RCA
+#
+
+# RCA VP3301 or VP3501
+rca|rca vp3301/vp3501, 
+	cols#40, lines#24, 
+	clear=^L, cuf1=^U, cup=\EY%p1%{32}%+%c%p2%{32}%+%c, 
+	cuu1=^K, home=^Z, rmso=\E\ES0, smso=\E\ES1, 
+
 
 #### Selanar
 #
@@ -10623,7 +11881,7 @@ hirez100|Selanar HiREZ-100,
 	cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, 
 	cuu=\E[%p1%dA, cuu1=\EM, dch=\E[%p1%dP, dch1=\E[P, 
 	dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, home=\E[H, ht=^I, 
-	hts=\EH, il=\E[%p1%dL, il1=\E[L, ind=^J, is2=\E<\E)0, kbs=^H, 
+	hts=\EH, il=\E[%p1%dL, il1=\E[L, is2=\E<\E)0, kbs=^H, 
 	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf0=\EOP, 
 	kf1=\EOQ, kf2=\EOR, kf3=\EOS, lf0=PF1, lf1=PF2, lf2=PF3, 
 	lf3=PF4, ll=\E[48H, mc0=\E[i, mc4=\E[4i\E[?4i, 
@@ -10633,8 +11891,7 @@ hirez100|Selanar HiREZ-100,
 	sc=\E7, sgr0=\E[m, smacs=^N, smkx=\E[?1h\E=, smso=\E[7m, 
 	smul=\E[4m, tbc=\E[3g, 
 hirez100-w|Selanar HiREZ-100 in 132-column mode, 
-	cols#132, 
-	kbs=^H, kcub1=^H, kcud1=^J, use=hirez100, 
+	cols#132, use=hirez100, 
 
 #### Signetics
 #
@@ -10645,8 +11902,8 @@ vsc|Signetics Vsc Video driver by RMC,
 	cols#80, it#8, lines#26, 
 	clear=\E[;H\E[2J$<50/>, cr=^M, cub1=^H, cud1=^J, cuf1=\E[C, 
 	cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, el=\E[K, home=\E[H, 
-	ht=^I, ind=^J, kbs=^H, kcub1=^H, kcud1=^J, nel=^M^J, rev=^_ , 
-	rmso=^_!, rmul=^_#, sgr0=^_!, smso=^_ , smul=^_", 
+	ht=^I, ind=^J, kbs=^H, kcub1=^H, kcud1=^J, nel=^M^J, rev=^_\s, 
+	rmso=^_!, rmul=^_#, sgr0=^_!, smso=^_\s, smul=^_", 
 
 #### Soroc
 #
@@ -10806,7 +12063,7 @@ t3800|teleray 3800 series,
 	cols#80, it#8, lines#24, 
 	bel=^G, clear=^L, cr=^M, cub1=^H, cud1=^J, cuf1=\EC, 
 	cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=^K, ed=\EJ, el=\EK, 
-	home=\EH, ht=^I, ind=^J, ll=\EY7 , 
+	home=\EH, ht=^I, ind=^J, ll=\EY7\s, 
 t1061|teleray|teleray 1061, 
 	am, km, xhp, xt, 
 	cols#80, it#8, lines#24, xmc#1, 
@@ -10816,7 +12073,7 @@ t1061|teleray|teleray 1061,
 	ich1=\EP, il1=\EL$<2*>, ind=^J, ip=$<0.4*>, 
 	is2=\Ee\EU01^Z1\EV\EU02^Z2\EV\EU03^Z3\EV\EU04^Z4\EV\EU05^Z5\EV\EU06^Z6\EV\EU07^Z7\EV\EU08^Z8\EV\Ef, 
 	kf1=^Z1, kf2=^Z2, kf3=^Z3, kf4=^Z4, kf5=^Z5, kf6=^Z6, kf7=^Z7, 
-	kf8=^Z8, rmso=\ER@, rmul=\ER@, smso= \ERD, smul=\ERH, 
+	kf8=^Z8, rmso=\ER@, rmul=\ER@, smso=\s\ERD, smul=\ERH, 
 	tbc=\EG, 
 t1061f|teleray 1061 with fast PROMs, 
 	dl1=\EM, il1=\EL, ip@, use=t1061, 
@@ -10866,6 +12123,46 @@ ti700|ti733|ti735|ti745|ti800|ti silent 700/733/735/745 or omni 800,
 	cols#80, 
 	bel=^G, cr=\r$<162>, cub1=^H, cud1=^J, ind=^J, 
 
+#
+# Texas Instruments 916 VDT 7 bit control mode
+#
+ti916|ti916-220-7|Texas Instruments 916 VDT 8859/1 vt220 mode 7 bit CTRL, 
+	da, db, in, msgr, 
+	cbt=\E[Z, civis=\E[?25l, clear=\E[H\E[2J$<6>, 
+	cnorm=\E[?25h, cub=\E[%p1%dD, cud=\E[%p1%dB, 
+	cuf=\E[%p1%dC, cup=\E[%p1%i%p1%d;%p2%dH, cuu=\E[%p1%dA, 
+	cvvis=\E[?25h, dch=\E[%p1%dP$<250>, dch1=\E[P, 
+	dl=\E[%p1%dM, ech=\E[%p1%dX$<20>, ed=\E[J$<6>, el=\E[0K, 
+	el1=\E[1K, enacs=\E(B\E)0, ff=^L, flash=\E[?5h\E[?5l$<6>, 
+	hpa=\E[%p1%{1}%+%dG, hts=\E[0W, ich=\E[%p1%d@$<250>, 
+	il=\E[%p1%dL$<36>, ip=$<10>, is2=\E[1;24r\E[24;1H, 
+	kcmd=\E[29~, kdch1=\E[P, kent=^J, kf1=\E[17~, kf10=\E[28~, 
+	kf11=\E[29~, kf12=\E[31~, kf2=\E[18~, kf3=\E[19~, 
+	kf4=\E[20~, kf5=\E[21~, kf6=\E[23~, kf7=\E[24~, kf8=\E[25~, 
+	kf9=\E[26~, khome=\E[H, kich1=\E[@, knp=\E[S, kpp=\E[T, 
+	kprt=^X, prot=\E&, rmacs=\017$<2>, rs2=\E[!p, 
+	smacs=\016$<2>, tbc=\E[3g, vpa=\E[%p1%{1}%+%dd, use=vt220, 
+#
+# Texas Instruments 916 VDT 8 bit control mode
+#
+ti916-8|ti916-220-8|Texas Instruments 916 VDT 8859/1 8 vt220 mode bit CTRL, 
+	kcmd=\23329~, kcub1=\233D, kcud1=\233B, kcuf1=\233C, 
+	kcuu1=\233A, kdch1=\233P, kent=^J, kf1=\23317~, 
+	kf10=\23328~, kf11=\23329~, kf12=\23331~, kf2=\23318~, 
+	kf3=\23319~, kf4=\23320~, kf5=\23321~, kf6=\23323~, 
+	kf7=\23324~, kf8=\23325~, kf9=\23326~, khome=\233H, 
+	kich1=\233@, knp=\233S, kpp=\233T, kprt=^X, 
+	use=ti916, 
+#
+# Texas Instruments 916 VDT 8859/1 7 bit control 132 column mode
+#
+ti916-132|Texas Instruments 916 VDT vt220 132 column, 
+	cols#132, use=ti916, 
+#
+# Texas Instruments 916 VDT 8859/1 8 bit control 132 column mode
+#
+ti916-8-132|Texas Instruments 916 VDT vt220 132 column, 
+	cols#132, use=ti916-8, 
 ti924|Texas Instruments 924 VDT 8859/1 7 bit CTRL, 
 	am, xon, 
 	cols#80, it#8, lines#24, 
@@ -10984,6 +12281,19 @@ zen50|z50|zentec zephyr,
 	rmul@, smul@, 
 	use=adm+sgr, 
 
+# CCI 4574 (Office Power) from Will Martin <wmartin@BRL.ARPA> via BRL
+cci|cci1|z8001|zen8001|CCI Custom Zentec 8001, 
+	am, bw, 
+	cols#80, lines#24, 
+	blink=\EM", clear=\EH\EJ, cnorm=\EP, 
+	csr=\ER%p1%{32}%+%c%p2%{32}%+%c, cub1=^H, cud1=^J, 
+	cuf1=\EC, cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, 
+	cvvis=\EF\EQ\EM \ER 7, dim=\EM!, ed=\EJ, el=\EK, home=\EH, 
+	invis=\EM(, is2=\EM \EF\ET\EP\ER 7, kbs=^H, kcub1=\ED, 
+	kcud1=\EB, kcuf1=\EC, kcuu1=\EA, khome=\EH, mc4=^T, mc5=^R, 
+	rev=\EM$, ri=\EI, rmso=\EM\s, rmul=\EM\s, sgr0=\EM\s, 
+	smso=\EM$, smul=\EM0, 
+
 ######## OBSOLETE UNIX CONSOLES
 #
 
@@ -11001,7 +12311,7 @@ apollo|apollo console,
 	cup=\EM%p1%{32}%+%c%p2%d), cuu1=\EA, dch1=\EP, dl1=\EL, 
 	ed=\EJ, el=\EK, hpa=\EN%p1%d, il1=\EI, ind=\EE, ri=\ED, 
 	rmcup=\EX, rmir=\ER, rmso=\ET, rmul=\EV, smcup=\EW, smir=\EQ, 
-	smso=\ES, smul=\EU, vpa=\EO+ , 
+	smso=\ES, smul=\EU, vpa=\EO+\s, 
 
 # We don't know whether or not the apollo guys replicated DEC's firmware bug
 # in the VT132 that reversed <rmir>/<smir>.  To be on the safe side, disable
@@ -11013,6 +12323,49 @@ apollo_19L|apollo 19 inch display,
 apollo_color|apollo color display, 
 	rmir@, smir@, use=vt132, 
 
+#### Convergent Technology
+#
+# Burroughs bought Convergent shortly before it merged with Univac.
+# CTOS is (I believe) dead.  Probably the aws is too (this entry dates
+# from 1991 or earlier).
+#
+
+# Convergent AWS workstation from Gould/SEL UTX/32 via BRL
+# (aws: removed unknown :dn=^K: -- esr)
+aws|Convergent Technologies AWS workstation under UTX,Xenix, 
+	am, 
+	cols#80, lines#28, xmc#0, 
+	acsc=, clear=^L, cud1=^K, cuf1=^R, cup=\EC%p2%c%p1%c, 
+	cuu1=^A, dch1=\EDC, dl1=\EDL, ed=\EEF, el=\EEL, hpa=\EH%p1%c, 
+	ich1=\EIC, il1=\EIL, ind=\ESU, kbs=^H, kcub1=^N, kcud1=^K, 
+	kcuf1=^R, kcuu1=^A, ri=\ESD, rmacs=\EAAF, rmso=\EARF, 
+	rmul=\EAUF, smacs=\EAAN, smso=\EARN, smul=\EAUN, 
+	vpa=\EV%p1%c, 
+awsc|Convergent Technologies AWS workstation under CTOS, 
+	am, 
+	cols#80, lines#24, xmc#0, 
+	acsc=, clear=^L, cud1=^K, cuf1=^R, cup=\EC%p2%c%p1%c, 
+	cuu1=^A, ed=\EEF, el=\EEL, kbs=^H, kcub1=^N, kcud1=^K, 
+	kcuf1=^R, kcuu1=^A, rmacs=\EAAF, rmso=\EAA, rmul=\EAA, 
+	smacs=\EAAN, smso=\EAE, smul=\EAC, 
+
+#### DEC consoles
+#
+
+# The MicroVax console.  Tim Theisen <tim@cs.wisc.edu> writes:
+# The digital uVax II's had a graphic display called a qdss.  It was
+# supposed to be a high performance graphic accelerator, but it was
+# late to market and barely appeared before faster dumb frame buffers
+# appeared.  I have only used this display while running X11.  However,
+# during bootup, it was in text mode, and probably had a terminal emulator
+# within it.  And that is what your termcap entry is for.  In graphics
+# mode the screen size is 1024x864 pixels.
+qdss|qdcons|qdss glass tty, 
+	am, 
+	cols#128, lines#57, 
+	clear=\032$<1/>, cub1=^H, cud1=^J, cuf1=^L, 
+	cup=\E=%p1%c%p2%c, cuu1=^K, 
+
 #### Fortune Systems consoles
 #
 # Fortune made a line of 68K-based UNIX boxes that were pretty nifty
@@ -11042,7 +12395,7 @@ fos|fortune|Fortune system,
 	acsc=l m"k(j*v%w#q&x-, bel=^G, blink=\EN, civis=\E], 
 	clear=\014$<20>, cnorm=\E\\, cr=^M, cub1=^H, cud1=\n$<3>, 
 	cup=\034C%p1%{32}%+%c%p2%{32}%+%c, cuu1=\013$<3>, 
-	cvvis=\E\072, dch1=\034W$<5>, dl1=\034R$<15>, 
+	cvvis=\E\:, dch1=\034W$<5>, dl1=\034R$<15>, 
 	ed=\034Y$<3*>, el=^\Z, home=\036$<10>, ht=^Z, 
 	ich1=\034Q$<5>, il1=\034E$<15>, ind=^J, is2=^_.., kbs=^H, 
 	kcub1=^Aw\r, kcud1=^Ay\r, kcuf1=^Az\r, kcuu1=^Ax\r, 
@@ -11073,23 +12426,6 @@ masscomp1|masscomp large screen version 1,
 masscomp2|masscomp large screen version 2, 
 	cols#64, lines#21, use=masscomp, 
 
-#### DEC consoles
-#
-
-# The MicroVax console.  Tim Theisen <tim@cs.wisc.edu> writes:
-# The digital uVax II's had a graphic display called a qdss.  It was
-# supposed to be a high performance graphic accelerator, but it was
-# late to market and barely appeared before faster dumb frame buffers
-# appeared.  I have only used this display while running X11.  However,
-# during bootup, it was in text mode, and probably had a terminal emulator
-# within it.  And that is what your termcap entry is for.  In graphics
-# mode the screen size is 1024x864 pixels.
-qdss|qdcons|qdss glass tty, 
-	am, 
-	cols#128, lines#57, 
-	clear=\032$<1/>, cub1=^H, cud1=^J, cuf1=^L, 
-	cup=\E=%p1%c%p2%c, cuu1=^K, 
-
 ######## OTHER OBSOLETE TYPES
 #
 # These terminals are *long* dead -- these entries are retained for
@@ -11154,7 +12490,7 @@ ctrm|C terminal emulator,
 gs6300|emots|AT&T PC6300 with EMOTS terminal emulator, 
 	am, bce, msgr, xon, 
 	colors#8, cols#80, it#8, lines#24, pairs#63, 
-	acsc=\\\054\\\054..--++``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, 
+	acsc=\,\,..--++``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, 
 	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[J, cr=^M, 
 	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=^J, 
 	cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, 
@@ -11229,7 +12565,7 @@ simterm|attpc running simterm,
 	bel=^G, clear=\EH\EJ, cr=^M, cub1=^H, cud1=\EB, cuf1=\EC, 
 	cup=\E=%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, dch1=\ER, 
 	dl1=\EM, ed=\EJ, el=\EK, home=\EH, il1=\EL, ind=^J, rmcup=\EVE, 
-	rmso=\E&d@, sgr0=\E&d@, smcup=\EVS, smir=\EQ, smso=\E&dB, 
+	rmso=\E&d@, sgr0=\E&d@, smcup=\EVS, smso=\E&dB, 
 
 #### Daisy wheel printers
 #
@@ -11276,7 +12612,7 @@ dtc382|DTC 382,
 	bel=^G, clear=\020\035$<20>, cnorm=^Pb, cr=^P^M, cub1=^H, 
 	cuf1=^PR, cup=\020\021%p2%c%p1%c, cuu1=^P^L, cvvis=^PB, 
 	dch1=^X, dl1=^P^S, ed=\020\025\020\023\020\023, el=^P^U, 
-	home=^P^R, il1=^P^Z, ind=^J, pad=\177, rmir=^Pi, 
+	home=^P^R, il1=^P^Z, ind=^J, pad=\177, rmcup=, rmir=^Pi, 
 	rmul=^P \200, smcup=\020\035$<20>, smir=^PI, smul=^P ^P, 
 dtc300s|DTC 300s, 
 	hc, os, 
@@ -11345,13 +12681,15 @@ cops10|cops|cops-10|cops 10,
 	cup=\020%p1%{32}%+%c%p2%{32}%+%c, cuu1=^K, ed=^W, el=^V, 
 	ind=^J, kbs=^H, kcub1=^H, kcud1=^J, kcuf1=^L, kcuu1=^K, 
 	khome=^Y, 
-# (d132: removed duplicate ":ic=\E5:" -- esr)
+# (d132: removed duplicate :ic=\E5:,
+# merged in capabilities from a BRL entry -- esr)
 d132|datagraphix|datagraphix 132a, 
 	da, db, in, 
 	cols#80, lines#30, 
-	bel=^G, clear=^L, cnorm=\Em\En, cr=^M, cud1=^J, cuf1=\El, 
-	cuu1=\Ek, cvvis=\Ex, dch1=\E6, home=\Et, ich1=\E5, il1=\E3, 
-	ind=\Ev, ri=\Ew, 
+	bel=^G, clear=^L, cnorm=\Em\En, cr=^M, cub1=^H, cud1=^J, 
+	cuf1=\EL, cup=\E8%i%p1%3d%p2%3d, cuu1=\EK, cvvis=\Ex, 
+	dch1=\E6, home=\ET, ht=^I, ich1=\E5, il1=\E3, ind=^J, kbs=^H, 
+	kcub1=^H, kcud1=^J, nel=^M^J, ri=\Ew, 
 # The d800 was an early portable terminal from c.1984-85 that looked a lot
 # like the original Compaq `lunchbox' portable (but no handle).  It had a vt220
 # mode (which is what this entry looks like) and several other lesser-known
@@ -11375,7 +12713,7 @@ digilog|digilog 333,
 dwk|dwk-vt|dwk terminal, 
 	am, 
 	cols#80, it#8, lines#24, 
-	acsc=lJmFkCjXtEuPv\\wKqUxWnNo~s_`+a\072f'g#~_\\\054Q+\^.M-Sh#I#0\177, 
+	acsc=lJmFkCjXtEuPv\\wKqUxWnNo~s_`+a\:f'g#~_\\\,Q+\^.M-Sh#I#0\177, 
 	bel=^G, clear=\EH\EJ, cr=^M, cub1=^H, cud1=^J, cuf1=\EC, 
 	cup=\EY%p1%' '%+%c%p2%' '%+%c, cuu1=\EA, dch1=\EP, 
 	ed=\EJ, el=\EK, home=\EH, ht=^I, ich1=\EQ, ind=^J, kbs=\177, 
@@ -11427,7 +12765,7 @@ opus3n1+|Esprit Opus3n1+ in wy60 mode with ANSI arrow keys,
 	ed=\EY$<100>, el=\ET, fsl=^M, home=\036$<2>, ht=\011$<5>, 
 	hts=\E1, if=/usr/share/tabset/std, il1=\EE$<4>, ind=^J, 
 	ip=$<3>, 
-	is2=\E`\072\Ee(\EO\Ee6\Ec41\E~4\Ec21\Ed/\Ezz&\E[A\177\Ezz'\E[B\177\Ezz(\E[D\177\Ezz)\E[C\177\Ezz<\E[Q\177\Ezz`\E[F\177\EA1*\EZH12, 
+	is2=\E`\:\Ee(\EO\Ee6\Ec41\E~4\Ec21\Ed/\Ezz&\E[A\177\Ezz'\E[B\177\Ezz(\E[D\177\Ezz)\E[C\177\Ezz<\E[Q\177\Ezz`\E[F\177\EA1*\EZH12, 
 	kHOM=\E{, kbs=^H, kcbt=\EI, kcub1=\E[D, kcud1=\E[B, 
 	kcuf1=\E[C, kcuu1=\E[A, kdch1=\EW, kdl1=\ER, ked=\EY, 
 	kel=\ET, kend=\E[F, kent=\E7, kf1=^A@\r, kf10=^AI\r, 
@@ -11439,8 +12777,9 @@ opus3n1+|Esprit Opus3n1+ in wy60 mode with ANSI arrow keys,
 	pfloc=\EZ2%p1%'?'%+%c%p2%s\177, 
 	pfx=\EZ1%p1%'?'%+%c%p2%s\177, 
 	pln=\Ez%p1%'/'%+%c%p2%s\r, prot=\E), ri=\Ej$<7>, 
-	rmacs=\EH^C, rmam=\Ed., rmir=\Er, rmln=\EA11, rmxon=\Ec20, 
-	rs1=\E~!\E~4$<150>, rs2=\EeF$<150>, rs3=\EwG\Ee($<150>, 
+	rmacs=\EH^C, rmam=\Ed., rmcup=, rmir=\Er, rmln=\EA11, 
+	rmxon=\Ec20, rs1=\E~!\E~4$<150>, rs2=\EeF$<150>, 
+	rs3=\EwG\Ee($<150>, 
 	sgr=%?%p8%t\E)%e\E(%;%?%p9%t\EH\002%e\EH\003%;\EG%'0'%?%p2%p6%|%t%{8}%|%;%?%p1%p3%|%p6%|%t%{4}%|%;%?%p4%t%{2}%|%;%?%p1%p5%|%t%{64}%|%;%?%p7%t%{1}%|%;%c, 
 	sgr0=\E(\EH\003\EG0\EcD, smacs=\EH^B, smam=\Ed/, 
 	smcup=\Ezz&\E[A\177\Ezz'\E[B\177\Ezz(\E[D\177\Ezz)\E[C\177\Ezz<\E[Q\177, 
@@ -11452,11 +12791,6 @@ teletec|Teletec Datascreen,
 	cols#80, lines#24, 
 	bel=^G, clear=^L, cr=^M, cub1=^H, cud1=^J, cuf1=^_, cuu1=^K, 
 	home=^^, ind=^J, 
-# Terak made a PDP-11 based machine with a bitmapped display that ran UCSD
-# Pascal as the native OS. It was quite a nice box, and there were several
-# at UC Berkeley.
-terak|Terak emulating Datamedia 1520, 
-	use=dm1520, 
 # From: Mark Dornfeld <romwa@ucbvax.berkeley.edu>
 #		This termcap is for the LANPAR Technologies VISION 3220
 #	terminal.  The function key definitions k0-k5 represent the
@@ -11569,7 +12903,7 @@ v3220|LANPAR Vision II model 3220/3221/3222,
 # ED   Erase in Display          \E [ Ps J           0         eF     ed  (J)
 # EF   Erase in Field            \E [ Ps N           0         eF     -
 # EL   Erase in Line             \E [ Ps K           0         eF     el  (J)
-# EM   Eend of Medium *          ^Y                  -         -      -
+# EM   End of Medium *           ^Y                  -         -      -
 # EMI  Enable Manual Input       \E b                          Fs     -
 # ENQ  Enquire                   ^E                  -         -      -
 # EOT  End Of Transmission       ^D                  -         *      -
@@ -11712,7 +13046,7 @@ v3220|LANPAR Vision II model 3220/3221/3222,
 #
 # (D) terminfo (nel) is usually \r\n rather than ANSI \EE.
 #
-# (E) ECNA-48 calls this "Active Position Report" but preserves the CPR 
+# (E) ECMA-48 calls this "Active Position Report" but preserves the CPR 
 # abbreviation.
 # 
 # (F) CTC parameter values: 0 = set char tab, 1 = set line tab, 2 = clear
@@ -11765,7 +13099,7 @@ v3220|LANPAR Vision II model 3220/3221/3222,
 #
 # (R) Some ANSI.SYS versions accept VPR, but more commonly `ANSI' terminals
 # use CUD for this function and ignore VPR.  ECMA calls it `Line Position
-# Absolute but retains the VPA abbreviation.
+# Absolute' but retains the VPA abbreviation.
 #
 # (S) MC parameters: 0 = start xfer to primary aux device, 1 = start xfer from
 # primary aux device, 2 = start xfer to secondary aux device, 3 = start xfer
@@ -11926,7 +13260,8 @@ v3220|LANPAR Vision II model 3220/3221/3222,
 # 
 # Here is a description of the color and attribute controls supported in the
 # the ANSI.SYS driver under MS-DOS.  Most console drivers and ANSI
-# terminal emulators for Intel boxes obey these.
+# terminal emulators for Intel boxes obey these.  They are a proper subset
+# of the ECMA-48 escapes.
 #
 # 0	all attributes off
 # 1	foreground bright
@@ -11954,11 +13289,8 @@ v3220|LANPAR Vision II model 3220/3221/3222,
 #   braindamage (this is required by iBCS2).
 #
 # * Some older versions of ANSI.SYS have a bug that causes thems to require
-#   ESC [ Pn k as EL rather than the ANSI ESC [ Pn K.
-#
-# The entries following are not standalone.  They are meant to be included
-# via use= in other entries.
-#
+#   ESC [ Pn k as EL rather than the ANSI ESC [ Pn K.  (This is not ECMA-48
+#   compatible.)
 
 #### Intel Binary Compatibility Standard
 #
@@ -12101,6 +13433,7 @@ v3220|LANPAR Vision II model 3220/3221/3222,
 # These were invented to take advantage of the IBM PC ROM character set.  One
 # can compose an acsc string from the single-width characters as follows
 #	"j{G4}k{G1}l{G2}m{G3}q{GH}x{GV}t{GR}u{GL}v{GU}w{GD}n{GC}"
+# When translating a termcap file, ncurses tic will do this automatically.
 # The double forms characters don't fit the SVr4 terminfo model.
 #
 # AT&T Extensions:
@@ -12190,6 +13523,8 @@ v3220|LANPAR Vision II model 3220/3221/3222,
 # making perfectly synchronized mistakes which I then failed to catch by
 # eyeball, the translation was correct and perfectly information-preserving.
 #
+# Major version number bumps correspond to major version changes in ncurses.
+#
 # Here is a log of the changes since then:
 #
 # 9.1.0 (Wed Feb  1 04:50:32 EST 1995):
@@ -12568,7 +13903,7 @@ v3220|LANPAR Vision II model 3220/3221/3222,
 #	  dw3, ln03, ims-ansi, graphos, t16, zen30, xtalk, simterm, d800,
 #	  ifmr, v3220, wy100q, tandem653, ibmaed.
 #	* Added DWK terminal description.
-# 9.13.8 (Wed Jul 10 11:45:21 EDT 1996)
+# 9.13.8 (Wed Jul 10 11:45:21 EDT 1996):
 #	* Many entries now have highlights inherited from adm+sgr.
 #	* xterm entry now corresponds to XFree86 3.1.2E, with color.
 #	* xtitle and xtitle-twm enable access to the X status line.
@@ -12578,33 +13913,65 @@ v3220|LANPAR Vision II model 3220/3221/3222,
 #	* Aha! The BRL terminals file told us what the Iris extensions mean.
 #	* Added, from the BRL termcap file: rt6221, rt6221-w, northstar,
 #	  commodore, cdc721-esc, excel62, osexec.  Replaced from the BRL file:
-#	  cit500, adm11, 
-
-######## REORDER
-#
-# Older termcap distributions featured a kluge called `reorder' intended to
-# time-optimize access to selected terminals by moving them to the front of
-# the file.  This is obsolete under terminfo, but for completeness's sake
-# we give a reorder script generator here (strip off the leading #s to use).
-#
-#: mkreorder --  generate script to optimize access to given terminal types
-#:
-#: entries named on command line will be sorted to the front in reverse order
-#echo "ed -- termcap <<EOF"
-#for x in $*
-#do
-#	echo "/^$x[|:]/;.,/^[a-z#]/-1m0"
-#done
-#echo "0a"
-#echo "."
-#echo "w termcap.sorted"
-#echo "q"
-#echo "EOF"
-#:end of script
-#
-# Invoke this script like this:
-#
-#	mkreorder h19 wy60 vt100 >reorder
+#	  cit500, adm11. 
+# 9.13.9 (Mon Jul 15 00:32:51 EDT 1996):
+#	* Added, from the BRL termcap file: cdc721, cdc721l, cdc752, cdc756,
+#	  aws, awsc, zentec8001, modgraph48, rca vp3301/vp3501, ex155.
+#	* Corrected, from BRL termcap file: vi50.
+#	* Better rxvt entry & corrected xterm entries from Thomas Dickey.
+# 9.13.10 (Mon Jul 15 12:20:13 EDT 1996):
+#	* Added from BRL: cit101e & variants, hmod1, vi200, ansi77, att5620-1,
+#	  att5620-s, att5620-s, dg210, aas1901, hz1520, hp9845, osborne
+#	  (old osborne moved to osborne-w), tvi970-vb, tvi970-2p, tvi925-hi,
+#	  tek4105brl, tek4106brl, tek4107brl,tek4109brl, hazel, aepro,
+#	  apple40p, apple80p, appleIIgs, apple2e, apple2e-p, apple-ae.
+#	* Paired-attribute fixes to various terminals.
+#	* Sun entry corrections from A. Lukyanov & Gert-Jan Vons.
+#	* xterm entry corrections from Thomas Dickey.
+# 9.13.11 (Tue Jul 30 16:42:58 EDT 1996):
+#	* Added t916 entry, translated from a termcap in SCO's support area.
+#	* New qnx entry from Michael Hunter.
+# 9.13.12 (Mon Aug  5 14:31:11 EDT 1996):
+#	* Added hpex2 from Ville Sulko.
+#	* Fixed a bug that ran the qnx and pcvtXX together.
+# 9.13.13 (Fri Aug  9 01:16:17 EDT 1996):
+#	* Added dtterm entry from Solaris CDE.
+# 9.13.14 (Tue Sep 10 15:31:56 EDT 1996):
+#	* corrected pairs#8 typo in dtterm entry.
+#	* added tvi9065.
+# 9.13.15 (Sun Sep 15 02:47:05 EDT 1996):
+#	* updated xterm entry to cover 3.1.2E's new features.  
+# 9.13.16 (Tue Sep 24 12:47:43 EDT 1996):
+#	* Added new minix entry
+#	* Removed aliases of the form ^[0-9]* for obsolete terminals.
+#	* Commented out linux-old, nobody's using pre-1.2 kernels now.
+# 9.13.17 (Fri Sep 27 13:25:38 EDT 1996):
+#	* Added Prism entries and kt7ix.
+#	* Caution notes about EWAN and tabset files.
+#	* Changed /usr/lib/tabset -> /usr/share/tabset.
+#	* Added acsc/rmacs/smacs to vt52.
+# 9.13.18 (Mon Oct 28 13:24:59 EST 1996):
+#	* Merged in Thomas Dickey's reorganization of the xterm entries;
+#	  added technical corrections to avoid warning messages.
+# 9.13.19 (Sat Nov 16 16:05:49 EST 1996):
+#	* Added rmso=\E[27m in Linux entry.
+#	* Added koi8-r support for Linux console.
+#	* Replace xterm entries with canonical ones from XFree86 3.2.
+# 9.13.20 (Sun Nov 17 23:02:51 EST 1996):
+#	* Added color_xterm from Jacob Mandelson
+# 9.13.21 (Mon Nov 18 12:43:42 EST 1996):
+#	* Back off the xterm entry to use r6 as a base.
+# 9.13.22 (Sat Nov 30 11:51:31 EST 1996):
+#	* Added dec-vt220 at Adrian Garside's request.
+# 9.13.23 (Fri Feb 21 16:36:06 EST 1997):
+#	* Replaced minitel-2 entry.
+#	* Added MGR, ansi-nt.
+#	* Minor corrections to xterm entries.
+#	* Replaced EWAN telnet entry.
+#	* Dropped the reorder script generator.  It was a fossil.
+# 9.13.24 (Sun Feb 23 20:55:23 EST 1997):
+#	* Thorsten Lockert added termcap `bs' to a lot of types, working from
+#	  the 4.4BSD Lite2 file.
 #
 # The following sets edit modes for GNU EMACS
 # Local Variables: