from netbsd; sync with termcap 9.11.5

1 files changed, 3414 insertions, 3097 deletions

diff --git a/share/termcap/termcap.src b/share/termcap/termcap.src
index 1820ec1a38f..949f32a60bb 100644
--- a/share/termcap/termcap.src
+++ b/share/termcap/termcap.src
@@ -1,6 +1,6 @@
-####### TERMINAL TYPE DESCRIPTIONS SOURCE FILE
+######## TERMINAL TYPE DESCRIPTIONS SOURCE FILE
 #
-#	Version 9.8.3
+#	Version 9.11.5
 #	termcap syntax
 #
 #	Eric S. Raymond		(current maintainer)
@@ -15,9 +15,23 @@
 # This file describes the capabilities of various character-cell terminals,
 # as needed by software such as screen-oriented editors.
 #
+# 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.
+#
 # Pointers to related resources (including the ncurses distribution) may
 # be found at <http://www.ccil.org/~esr/ncurses.html>.
 #
+# INTERNATIONALIZATION:
+#
+# 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
+# with the pound sign at position 2/3.
+#
 # FILE FORMAT:
 #
 # The version you are looking at may be in any of three formats: master
@@ -52,24 +66,6 @@
 # the file.  This should no longer be necessary, as the file is now ordered
 # roughly by type frequency with ANSI/VT100 and other common types up front.
 #
-# CONTINUITY WITH HISTORICAL VERSIONS:
-#
-# The last /etc/termcap version maintained by John Kunze was 8.3, dated 8/5/94.
-# Releases 9 and up are maintained by Eric Raymond as part of the ncurses
-# project.
-#
-# This file contains all the capability information present in John Kunze's
-# last version of the termcap master file, except as noted in the change 
-# comments at end of file.  Some information about very ancient obsolete
-# capabilities has been moved to comments.  Some all-numeric names of older
-# terminals have been retired.
-#
-# The 9.1.0 version of this file was translated from a syntax-corrected copy of
-# 8.3, then mechanically checked against 8.3 using Emacs Lisp code written for
-# the purpose.  Unless the ncurses tic implementation and the Lisp code were
-# making perfectly synchronized mistakes which I then failed to catch by
-# eyeball, the translation was correct and perfectly information-preserving.
-#
 # Some information has been merged in from terminfo files distributed by
 # USL and SCO (see COPYRIGHTS AND OTHER DELUSIONS below).  Much information
 # comes from vendors who maintain official terminfos for their hardware
@@ -83,9 +79,8 @@
 # of a terminfo/termcap entry.  Individual capabilities are commented out by
 # placing a period between the colon and the capability name.
 #
-# Starting with version 9.0.0, the file is divided up into major sections
-# (headed by lines beginning with "########") and minor sections (beginning
-# with "####"); do
+# The file is divided up into major sections (headed by lines beginning with 
+# the string "########") and minor sections (beginning with "####"); do
 #
 #	grep "^####" <file> | more
 #
@@ -117,29 +112,28 @@
 # All names should be in lower case, for consistency in typing.
 #
 # The following are conventionally used suffixes:
-#	mono	suppress color support
-#	rv	Terminal in reverse video mode (black on white)
-#	2p	Has two pages of memory.  Likewise 4p, 8p, etc.
-#	w	Wide - in 132 column mode.
-#	pp	Has a printer port which is used.
-#	na	No arrow keys - termcap ignores arrow keys which are
-#		actually there on the terminal, so the user can use
-#		the arrow keys locally.
-#	nam	No auto-margin - suppress am capability
-#	mc	Magic-cookie.  Some terminals (notably older Wyses) can
+#	-2p	Has two pages of memory.  Likewise 4p, 8p, etc.
+#	-am	Enable auto-margin.
+#	-m	Monochrome.  Suppress color support
+#	-mc	Magic-cookie.  Some terminals (notably older Wyses) can
 #		only support one attribute without magic-cookie lossage.
 #		Their base entry is usually paired with another that
 #		uses magic cookies to support multiple attributes.
-#	vb	Use visible bell (flash) rather than beep.
-#
-# To easily test a new terminal description, put it in $HOME/.termcap
-# and programs will look there before looking in /etc/termcap.
-# You can also setenv TERMPATH to a list of full pathnames (separated
-# by spaces or colons) to be searched by tgetent() in the order listed.
-# The TERMCAP environment variable is usually set to the termcap
-# entry itself to avoid reading files when starting up a program.
-#
-# RELEASE 9 COMMENTS:
+#	-na	No arrow keys - termcap ignores arrow keys which are
+#		actually there on the terminal, so the user can use
+#		the arrow keys locally.
+#	-nam	No auto-margin - suppress <am> capability
+#	-nl	No labels - suppress soft labels
+#	-ns	No status line - suppress status line
+#	-rv	Terminal in reverse video mode (black on white)
+#	-s	Enable status line.
+#	-vb	Use visible bell (<flash>) rather than <bel>.
+#	-w	Wide - in 132 column mode.
+# If a name has multiple suffixes and one is a line height, that one should 
+# go first.  Thus `aaa-30-s-rv' is recommended over `aaa-s-rv'.  
+# 
+# Entries with embedded plus signs are designed to be included through use/tc
+# capabilities, not used as standalone entries. 
 #
 # To avoid search clashes, some older all-numeric names for terminals have
 # been removed (i.e., "33" for the Model 33 Teletype, "2621" for the HP2621).
@@ -152,27 +146,13 @@
 # capabilities by looking at context.  All the information in the original
 # entries is preserved in the comments.
 #
-# I changed :MT: to :km: (the 4.4BSD name) everywhere.  I commented out some
-# capabilities (EP, dF, dT, dV, kn, ko, ma, ml, mu, xr, xx) that are no longer
-# used by BSD curses.
-#
-# Entries derived from XENIX use a termcap-extension set that showed up in
-# several entries, notably those for scoansi, ibmpcx, lisa, trs16, fos, and
-# the altos terminals.  Its signature is the use of GS/GE as an as/ae pair.
-# This set of extensions and their translations are described in the extended
-# comment at the end of this file.
-#
-# There is a second, smaller set of extensions used by AT&T terminals and
-# also described in the trailing comment.
-#
-# Besides these and the terminals mentioned above, only the psterm variants,
-# zen50, wsiris and minitel had unknown capabilities that weren't obviously
-# garbled.
+# In the comments, terminfo capability names are bracketed with <> (angle
+# brackets).  Termcap capability names are bracketed with :: (colons).
 #
 # INTERPRETATION OF USER CAPABILITIES
 #
 # The System V Release 4 and XPG4 terminfo format defines ten string
-# capabilities for use by applications, u0...u9.   In this file, we use
+# capabilities for use by applications, <u0>...<u9>.   In this file, we use
 # certain of these capabilities to describe functions which are not covered
 # by terminfo.  The mapping is as follows:
 #
@@ -181,11 +161,11 @@
 #	u7	cursor position request (equivalent to VT100 DSR 6)
 #	u6	cursor position report (equivalent to ANSI CPR)
 #
-# The terminal enquire string u9 should elicit an answerback response
-# from the terminal.  Common values for u9 will be ^E (on older ASCII
+# The terminal enquire string <u9> should elicit an answerback response
+# from the terminal.  Common values for <u9> will be ^E (on older ASCII
 # terminals) or \E[c (on newer VT100/ANSI-compatible terminals).
 #
-# The cursor position request (u7) string should elicit a cursor position
+# The cursor position request (<u7>) string should elicit a cursor position
 # report.  A typical value (for ANSI/VT100 terminals) is \E[6n.
 #
 # The terminal answerback description (u8) must consist of an expected
@@ -195,10 +175,12 @@
 #	%c	Accept any character
 #	%[...]	Accept any number of characters in the given set
 #
-# The cursor position report (u6) string must contain two scanf(3)-style 
+# The cursor position report (<u6>) string must contain two scanf(3)-style 
 # %d format elements.  The first of these must correspond to the Y coordinate
-# and the second to the %d.  The typical CPR value is \E[%d;%dR (on VT100/
-# ANSI-compatible terminals).
+# and the second to the %d.  If the string contains the sequence %i, it is
+# taken as an instruction to decrement each value after reading it (this is
+# the inverse sense from the cup string).  The typical CPR value is
+# \E[%i%d;%dR (on VT100/ ANSI-compatible terminals).
 #
 # These capabilities are used by tac(1m), the terminfo action checker soon
 # to be distributed with ncurses.
@@ -259,29 +241,71 @@
 # Special "terminals".  These are used to label tty lines when you don't
 # know what kind of terminal is on it.  The characteristics of an unknown
 # terminal are the lowest common denominator - they look about like a ti 700.
-# The last one, "other", is like unknown but it allows an escape from software
-# that insists that a "real" unknown terminal is merely so far unspecified.
 #
 
-dumb:\
+dumb|80-column dumb tty:\
 	:am:\
 	:co#80:\
 	:bl=^G:cr=^M:do=^J:sf=^J:
-unknown:\
-	:gn:\
-	:tc=dumb:
-other|none of the above, but not exactly unknown:\
-	:am:gn:\
-	:co#80:\
-	:cl=^M^J:do=^J:ho=^M:
-
-arpanet|bussiplexer|dialup|ethernet|network|net|patch|plugboard|switch|network switch or dialup:\
-	:tc=unknown:
-lpr|printer|print|printing|line printer:\
+unknown|unknown terminal type:\
+	:gn:\tc=dumb:
+lpr|printer|line printer:\
 	:hc:os:\
 	:co#132:li#66:\
 	:bl=^G:cr=^M:do=^J:ff=^L:le=^H:sf=^J:
 
+#### ANSI.SYS/ISO 6429 Capabilities
+#
+# See the end-of-file comment for more on these.
+#
+
+# The IBM PC alternate character set.  Plug this into any Intel console entry.
+# We use \E[11m for rmacs rather than \E[12m so the <acsc> string can use the
+# ROM graphics for control characters such as the diamond, up- and down-arrow.
+# This works with the System V, Linux, and BSDI consoles.  It's a safe bet this
+# 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:\
+	:ae=\E[10m:as=\E[11m:
+
+# Highlight controls corresponding to the ANSI.SYS standard.  Most 
+# console drivers for Intel boxes obey these.  Makes the same assumption
+# about \E[11m as klone+acs.
+klone+sgr|attribute control for ansi.sys displays:\
+	:ae=\E[11m:as=\E11m:mb=\E[5m:md=\E[1m:me=\E[0;10m:\
+	:mr=\E[7m:\
+	:..sa=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;11%;m:\
+	:se=\E[m:so=\E[7m:ue=\E[m:us=\E[4m:
+
+# Highlight controls corresponding to the ANSI.SYS standard.  *All*
+# console drivers for Intel boxes obey these.  Does not assume \E[11m will
+# work; uses \E[12m instead, which is pretty bulletproof but loses you the ACS
+# diamond and arrow characters under curses.
+klone+sgr-dumb|attribute control for ansi.sys displays (no ESC [ 11 m):\
+	:ae=\E[12m:as=\E12m:mb=\E[5m:md=\E[1m:me=\E[0;10m:\
+	:mr=\E[7m:\
+	:..sa=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;12%;m:\
+	:se=\E[m:so=\E[7m:ue=\E[m:us=\E[4m:
+
+# 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:
+# 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,
+# The DOS 5 manual asserts that these sequences meet the ISO 6429 standard.
+klone+color|color control for ansi.sys and ISO6429-compatible displays:\
+	:
+
+# For comparison, here are all the capabilities implied by the Intel
+# Binary Compatibility Standard (level 2) that fit within terminfo.
+# For more detail on this rather pathetic standard, see the comments
+# near the end of this file.
+ibcs2|Intel Binary Compatibility Standard prescriptions:\
+	:AL=\E[%dL:DC=\E[%dP:DO=\E[%dB:IC=\E[%d@:LE=\E[%dD:\
+	:RI=\E[%dC:SF=\E[%dS:SR=\E[%dT:UP=\E[%dA:bt=\E[Z:\
+	:cl=\Ec:cm=\E[%i%d;%dH:ct=\E[g:ec=\E[%dX:ei=:im=:\
+	:rc=\E8:sc=\E7:st=\EH:
+
 #### ANSI terminals and terminal emulators
 #
 # See near the end of this file for details on ANSI conformance.
@@ -291,107 +315,91 @@ lpr|printer|print|printing|line printer:\
 # if you're in doubt about what `ANSI' matches yours, try them in that
 # order and back off from the first that breaks.
 
-# (ansi: changed ":pt:" to ":it#8:" -- esr)
 ansi-mini|any ansi terminal with pessimistic assumptions:\
 	:am:bs:\
 	:co#80:it#8:li#24:\
-	:ce=\E[K:cl=\E[;H\E[2J:cm=\E[%i%d;%dH:do=\E[B:\
-	:ho=\E[H:le=\E[D:nd=\E[C:up=\E[A:
-
-# Color controls corresponding to the ANSI.SYS de-facto standard
-# (This is not a standalone entry)
-ansi-pc-color:\
-	:
+	:ce=\E[K:cl=\E[H\E[2J:cm=\E[%i%d;%dH:do=\E[B:ho=\E[H:\
+	:le=\E[D:nd=\E[C:ta=^I:up=\E[A:
 
 # 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.
-# From: Eric S. Raymond <esr@snark.thyrsus.com> July 25 1995
-pcansi-mono|ibm-pc terminal programs claiming to be ansi (mono mode):\
-	:am:bs:mi:ms:pt:\
+# 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 
+# <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
+pcansi-m|pcansi-mono|ibm-pc terminal programs claiming to be ansi (mono mode):\
+	:am:bs:mi:ms:\
 	:co#80:it#8:li#24:\
-	:ae=\E[10m:al=\E[L:as=\E[12m:bl=^G:bt=\E[Z:cd=\E[J:\
-	:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:ct=\E[2g:\
-	:dc=\E[P:dl=\E[M:do=\E[B:ho=\E[H:kb=^H:kd=\E[B:\
-	:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:le=\E[D:mb=\E[5m:\
-	:md=\E[1m:me=\E[0m:mk=\E[9m:mr=\E[7m:nd=\E[C:\
-	:..sa=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;%?%p7%t;8%;%?%p8%t;11%;%?%p9%t;12%;m:\
-	:se=\E[m:sf=^J:so=\E[7m:st=\EH:ta=^I:ue=\E[m:up=\E[A:\
-	:us=\E[4m:
-pcansi-mono25|ansi25|ibm-pc terminal programs with 25 lines (mono mode):\
-	:li#25:\
-	:tc=pcansi-mono:
-pcansi-mono33|ansi33|ibm-pc terminal programs with 33 lines (mono mode):\
-	:li#33:\
-	:tc=pcansi-mono:
-pcansi-mono43|ansi43|ibm-pc terminal programs with 43 lines (mono mode):\
-	:li#43:\
-	:tc=pcansi-mono:
+	:al=\E[L:bl=^G:bt=\E[Z:cd=\E[J:ce=\E[K:cl=\E[H\E[J:\
+	:cm=\E[%i%d;%dH:cr=^M:ct=\E[2g:dc=\E[P:dl=\E[M:\
+	:do=\E[B:ho=\E[H:kb=^H:kd=\E[B:kh=\E[H:kl=\E[D:\
+	:kr=\E[C:ku=\E[A:le=\E[D:nd=\E[C:sf=^J:st=\EH:ta=^I:\
+	:up=\E[A:tc=klone+sgr-dumb:
+pcansi-25-m|pcansi25m|ibm-pc terminal programs with 25 lines (mono mode):\
+	:li#25:\tc=pcansi-m:
+pcansi-33-m|pcansi33m|ibm-pc terminal programs with 33 lines (mono mode):\
+	:li#33:\tc=pcansi-m:
+pcansi-43-m|ansi43m|ibm-pc terminal programs with 43 lines (mono mode):\
+	:li#43:\tc=pcansi-m:
 # The color versions.  All PC emulators do color...
 pcansi|ibm-pc terminal programs claiming to be ansi:\
-	:tc=ansi-pc-color:tc=pcansi-mono:
+	:tc=klone+color:tc=pcansi-m:
 pcansi-25|pcansi25|ibm-pc terminal programs with 25 lines:\
-	:li#25:\
-	:tc=pcansi:
+	:li#25:\tc=pcansi:
 pcansi-33|pcansi33|ibm-pc terminal programs with 33 lines:\
-	:li#33:\
-	:tc=pcansi:
+	:li#33:\tc=pcansi:
 pcansi-43|pcansi43|ibm-pc terminal programs with 43 lines:\
-	:li#43:\
-	:tc=pcansi:
+	:li#43:\tc=pcansi:
 
-# From: Eric S. Raymond <esr@snark.thyrsus.com> Feb 3 1995
-# ansi-mono -- full X.364 with ANSI.SYS-compatible attributes, no color.
-# Function-key mappings aren't in X3.64 but these are pretty standard.
+# ansi-m -- full ANSI X3.64 with ANSI.SYS-compatible attributes, no color.
 # If you want pound signs rather than dollars, replace `B' with `A'
-# in the s?ds capabilities.
-ansi-mono|ANSI X3.64-1979 terminal with ANSI.SYS compatible attributes:\
+# in the <s0ds>, <s1ds>, <s2ds>, and <s3ds> capabilities.
+# From: Eric S. Raymond <esr@snark.thyrsus.com> Nov 6 1995
+ansi-m|ansi-mono|ANSI X3.64-1979 terminal with ANSI.SYS compatible attributes:\
 	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
 	:LE=\E[%dD:RI=\E[%dC:SF=\E[%dS:SR=\E[%dT:UP=\E[%dA:\
-	:ch=\E[%dG:ct=\E[2g:cv=\E[%dd:ec=\E[%dX:ei=:im=:\
-	:k1=\E[M:k2=\E[N:k3=\E[O:k4=\E[P:k5=\E[Q:k6=\E[R:\
-	:k7=\E[S:k8=\E[T:k9=\E[U:kb=^H:kd=\E[B:kl=\E[D:\
-	:kr=\E[C:ku=\E[A:me=\E[0;10m:nw=\r\E[S:pf=\E[4i:\
-	:po=\E[5i:..rp=%p1%c\E[%p2%{1}%-%db:\
-	:..sa=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;%?%p7%t;8%;%?%p8%t;11%;%?%p9%t;12%;m:\
-	:ta=\E[I:tc=pcansi:
+	:ct=\E[2g:ec=\E[%dX:ei=:im=:kI=\E[L:kb=^H:kd=\E[B:\
+	:kl=\E[D:kr=\E[C:ku=\E[A:nw=\r\E[S:\
+	:..rp=%p1%c\E[%p2%{1}%-%db:ta=\E[I:tc=pcansi-m:
 
 # ansi -- this terminfo expresses the largest subset of X3.64 that will fit in
 # standard terminfo.  Assumes ANSI.SYS-compatible attributes and color
-# From: Eric S. Raymond <esr@snark.thyrsus.com> Feb 12 1995
+# From: Eric S. Raymond <esr@snark.thyrsus.com> Nov 6 1995
 ansi|ansi/pc-term compatible with color:\
-	:tc=ansi-pc-color:tc=ansi-mono:
+	:tc=klone+color:tc=klone+acs:tc=klone+sgr:tc=ansi-m:
 
 #
 # ANSI.SYS entries
 #
-# Cannot use :pt:, it does not work (why?).  :ho: seems required (why?). [gts]
-# Caution: 4.3 BSD tset does not pass li#25 to stty rows except during login?
-# :cl: clears attributes and sets wrap at margin before clearing the screen.
-# (ansi.sys: removed obsolete ":ma=^Hh^Jj^Kk^Ll^^H:" -- esr)
-# From: greg small <gts@populi.berkeley.edu>
-ansi.sys|ansisys|PC-DOS 3.1 ANSI.SYS:\
-	:am:bs:ms:\
+# This completely describes the sequences specified in the DOS 2.1 ANSI.SYS
+# documentation (except for the keyboard key reassignment feature, which
+# doen't fit the <pfkey> model well).  The klone+acs sequences were valid
+# though undocumented.  The <pfkey> capability is untested but should work for
+# keys F1-F10 (%p1 values outside this range will yield unpredictable results).
+# From: Eric S. Raymond <esr@snark.thyrsus.com> Nov 7 1995
+ansi.sys-old|ANSI.SYS under PC-DOS 2.1:\
+	:am:mi:ms:xo:\
 	:co#80:li#25:\
-	:ae=\E[10:as=\E[12:ce=\E[K:cl=\E[m\E[7h\E[2J:\
-	:cm=\E[%i%d;%dH:ho=\E[H:\
-	:is=U1 PC-DOS 3.1 ANSI.SYS 9-23-86\n\E[m\E[7h:kd=^J:\
-	:kh=^^:kl=^H:kr=^L:ku=^K:md=\E[1m:me=\E[0;10m:\
-	:mr=\E[7m:nd=\E[C:se=\E[m:so=\E[1m:ue=\E[m:up=\E[A:\
-	:us=\E[4m:
+	:ce=\E[k:cl=\E[2J:cm=\E[%i%d;%dH:do=\E[B:ho=\E[H:\
+	:is=\E[m\E[?7h:kd=^J:kh=^^:kl=^H:kr=^L:ku=^K:le=^H:\
+	:nd=\E[C:rc=\E[u:sc=\E[s:up=\E[A:tc=klone+color:tc=klone+acs:tc=klone+sgr:
+ansi.sys|ANSI.SYS 3.1 and later versions:\
+	:ce=\E[K:tc=ansi.sys-old:
+
 #
 # Define IBM PC keypad keys for vi as per MS-Kermit while using ANSI.SYS.
 # This should only be used when the terminal emulator cannot redefine the keys.
 # Since redefining keys with ansi.sys also affects PC-DOS programs, the key
 # definitions must be restored.  If the terminal emulator is quit while in vi
-# or others using :ks:ke:, the keypad keys will not be defined as per PC-DOS.
+# or others using <smkx>/<rmkx>, the keypad will not be defined as per PC-DOS.
 # The PgUp and PgDn are prefixed with ESC so that tn3270 can be used on Unix
 # (^U and ^D are already defined for tn3270).  The ESC is safe for vi but it
 # does "beep".  ESC ESC i is used for Ins to avoid tn3270 ESC i for coltab.
-# Left arrow is always BS, because PC-dos can tolerate this change.
+# Note that <kcub1> is always BS, because PC-dos can tolerate this change.
 # Caution: vi is limited to 256 string bytes, longer crashes or weirds out vi.
 # Consequently the End keypad key could not be set (it is relatively safe and
 # actually useful because it sends ^@ O, which beeps and opens a line above).
@@ -415,41 +423,46 @@ nansi.sysk|nansisysk|PC-DOS Public Domain NANSI.SYS with keypad redefined for vi
 
 # This entry is good for the 1.1.47 version of the Linux console driver.
 #
-# It assumes that you want A_PROTECT mapped to the alternate character set
-# mode that permits IBM ROM characters to be displayed (this is the assumption
-# used by ncurses version 1.9 and after, in order not to collide with the
-# internationalization attribute values specified in the XSI Curses standard).
-#
-# We use \E11m for rmacs rather than \E12m so the acsc string can use the ROM
-# graphics for control characters such as the diamond, up arrow and down-arrow.
-# This trick could work with other Intel consoles like the att6386 and pc3.
-#
 # Note: there are numerous broken linux entries out there, which didn't screw
 # up BSD termcap but hose ncurses's smarter cursor-movement optimization.
-# One common pathology is an incorrect tab length of 4.  Also note that the 
-# hpa=\E[%dG/vpa=\E[%dd capabilities seem not to be reliable.  To reproduce
-# the bug, re-introduce them and run worm -T 200 212 from the ncurses
-# test suite, save the trace, then worm -N -T 200 212.  Observe that the first
-# run fails to properly delete some worm segments, then diff the trace files.
-#
-# From: Eric S. Raymond <esr@snark.thyrsus.com> 23 July 1995
+# One common pathology is an incorrect tab length of 4.
+#
+# ***************************************************************************
+# *                                                                         *
+# *                           WARNING:                                      *
+# * Some Linuxes come with a default keyboard mapping that makes kbs=^? and *
+# * all have kcbt=^I.  Apply `loadkeys -d' to change this if necessary, and *
+# * bug your Linux distributor to get it right in the next release.  Here   *
+# * are the keymap replacement lines that will fix the problem:             *
+# *                                                                         *
+#	keycode  14 = BackSpace       BackSpace
+#		alt     keycode  14 = Meta_BackSpace
+#	keycode  15 = Tab             Tab
+#		alt     keycode  15 = Meta_Tab
+#		shift	keycode  15 = F26
+#	string F26 ="\033[Z"
+# *                                                                         *
+# * This has to use F26 which is unfortunate.  The change ought to be built *
+# * into the kernel tables.                                                 *
+# *                                                                         *
+# ***************************************************************************
+#
+# From: Eric S. Raymond <esr@snark.thyrsus.com> 9 Nov 1995
 linux|linux console:\
-	:am:bs:eo:mi:ms:xn:xo:\
+	:am:eo:mi:ms:xn:xo:\
 	:co#80:it#8:li#25:\
 	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:IC=\E[%d@:K2=\E[G:\
-	:ae=\E[10m:al=\E[L:as=\E[11m:bl=^G:cd=\E[J:ce=\E[K:\
-	:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:\
-	:ct=\E[3g:dc=\E[P:dl=\E[M:do=^J:ei=\E[4l:ho=\E[H:\
-	:ic=\E[@:im=\E[4h:k1=\E[[A:k2=\E[[B:k3=\E[[C:\
-	:k4=\E[[D:k5=\E[[E:k6=\E[17~:k7=\E[18~:k8=\E[19~:\
-	:k9=\E[20~:kb=^H:kd=\E[B:kh=\E[1~:kl=\E[D:kr=\E[C:\
-	:ku=\E[A:le=^H:mb=\E[5m:md=\E[1m:me=\E[0;10m:\
-	:mr=\E[7m:nd=\E[C:nw=^M^J:rc=\E8:\
-	:..sa=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;%?%p7%t;8%;%?%p8%t;11%;%?%p9%t;11%;m:\
-	:sc=\E7:se=\E[m:sf=^J:so=\E[7m:sr=\EM:st=\EH:ta=^I:\
-	:ue=\E[24m:up=\E[A:us=\E[4m:vb=\E[?5h\E[?5l:\
-	:ve=\E[?25h:vi=\E[?25l:
-linux-mono|Linux console, no color:\
+	:al=\E[L:bl=^G:cd=\E[J:ce=\E[K:cl=\E[H\E[J:\
+	:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:ct=\E[3g:\
+	:dc=\E[P:dl=\E[M:do=^J:ei=\E[4l:ho=\E[H:ic=\E[@:\
+	:im=\E[4h:k1=\E[[A:k2=\E[[B:k3=\E[[C:k4=\E[[D:\
+	:k5=\E[[E:k6=\E[17~:k7=\E[18~:k8=\E[19~:k9=\E[20~:\
+	:kD=\E[3~:kI=\E[2~:kN=\E[6~:kP=\E[5~:kb=^H:kd=\E[B:\
+	:kh=\E[1~:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:mr=\E[7m:\
+	:nd=\E[C:nw=^M^J:rc=\E8:sc=\E7:sf=^J:sr=\EM:st=\EH:\
+	:ta=^I:up=\E[A:vb=200\E[?5h\E[?5l:ve=\E[?25h:\
+	:vi=\E[?25l:tc=klone+sgr:tc=klone+color:tc=klone+acs:
+linux-m|Linux console no color:\
 	:tc=linux:
 
 # See the note on ICH/ICH1 VERSUS RMIR/SMIR near the end of file
@@ -459,51 +472,52 @@ linux-nic|linux with ich/ich1 suppressed for non-curses programs:\
 # SCO console and SOS-Syscons console for 386bsd
 # (scoansi: had unknown capabilities
 #	:Gc=N:Gd=K:Gh=M:Gl=L:Gu=J:Gv=\072:\
-#	:GC=E:GD=B:GH=D:GL=\64:GU=A:GV=\63:GR=C:RT=^J:
+#	:GC=E:GD=B:GH=D:GL=\64:GU=A:GV=\63:GR=C:
 #	:G1=?:G2=Z:G3=@:G4=Y:G5=;:G6=I:G7=H:G8=<:\
 #	:CW=\E[M:NU=\E[N:RF=\E[O:RC=\E[P:\
 #	:WL=\E[S:WR=\E[T:CL=\E[U:CR=\E[V:\
-# I renamed GS/GE/HM/EN/PU/PD and mapped ":pt:" to ":it#8:" -- esr)
+# I renamed GS/GE/HM/EN/PU/PD/RT -- esr)
 scoansi|SCO Extended ANSI standard crt:\
-	:am:bs:eo:pt:\
+	:am:bs:eo:xo:\
 	:co#80:it#8:li#25:\
 	:ae=\E[10m:al=\E[L:as=\E[12m:bt=\E[Z:cd=\E[J:ce=\E[K:\
-	:cl=\E[2J\E[H:cm=\E[%i%d;%dH:dc=\E[P:dl=\E[M:do=\E[B:\
+	:cl=\E[H\E[2J:cm=\E[%i%d;%dH:dc=\E[P:dl=\E[M:do=\E[B:\
 	:ei=:ho=\E[H:ic=\E[@:im=:k1=\E[M:k2=\E[N:k3=\E[O:\
 	:k4=\E[P:k5=\E[Q:k6=\E[R:k7=\E[S:k8=\E[T:k9=\E[U:\
-	:kb=^H:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:\
-	:mb=\E[5m:md=\E[1m:me=\E[m:nd=\E[C:se=\E[m:sf=\E[S:\
-	:so=\E[7m:sr=\E[T:ue=\E[m:up=\E[A:us=\E[4m:
+	:kN=\E[G:kP=\E[I:kb=^H:kd=\E[B:kh=\E[H:kl=\E[D:\
+	:kr=\E[C:ku=\E[A:le=\E[D:mb=\E[5m:md=\E[1m:me=\E[m:\
+	:nd=\E[C:se=\E[m:sf=\E[S:so=\E[7m:sr=\E[T:ta=^I:\
+	:ue=\E[m:up=\E[A:us=\E[4m:
 
 # From: Eric Raymond <esr@snark.thyrsus.com> Wed Jan 18 17:14:34 EST 1995
-att6386|AT386|at386|386AT|386at|AT&T WGS 6386 console:\
+att6386|at386|386at|AT&T WGS 6386 console:\
 	:am:bw:eo:xo:\
 	:co#80:it#8:li#25:\
 	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
 	:LE=\E[%dD:RI=\E[%dC:SF=\E[%dS:SR=\E[%dT:UP=\E[%dA:\
 	:ae=\E[10m:al=\E[1L:as=\E[12m:bl=^G:bt=\E[Z:cd=\E[J:\
-	:ce=\E[K:ch=\E[%i%dG:cl=\E[2J\E[H:cm=\E[%i%d;%dH:\
-	:cr=^M:ct=\E[2g:cv=\E[%dd:dc=\E[P:dl=\E[1M:do=\E[B:\
-	:ec=\E[%dX:ei=:ho=\E[H:ic=\E[1@:im=:is=\E[0;10;39m:\
-	:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:k5=\EOT:k6=\EOU:\
-	:k7=\EOV:k8=\EOW:k9=\EOX:kb=^H:kd=\E[B:kh=\E[H:\
-	:kl=\E[D:kr=\E[C:ku=\E[A:le=\E[D:mb=\E[5m:md=\E[1m:\
-	:me=\E[0;10m:mk=\E[9m:mr=\E[7m:nd=\E[C:nw=\r\E[S:\
+	:ce=\E[K:cl=\E[2J\E[H:cm=\E[%i%d;%dH:cr=^M:ct=\E[2g:\
+	:dc=\E[P:dl=\E[1M:do=\E[B:ec=\E[%dX:ei=:ho=\E[H:\
+	:ic=\E[1@:im=:is=\E[0;10;39m:k1=\EOP:k2=\EOQ:k3=\EOR:\
+	:k4=\EOS:k5=\EOT:k6=\EOU:k7=\EOV:k8=\EOW:k9=\EOX:\
+	:kD=\E[P:kI=\E[@:kN=\E[U:kP=\E[V:kb=^H:kd=\E[B:\
+	:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:le=\E[D:mb=\E[5m:\
+	:md=\E[1m:me=\E[0;10m:mr=\E[7m:nd=\E[C:nw=\r\E[S:\
 	:..sa=\E[10m\E[0%?%p1%p3%|%t;7%;%?%p2%t;4%;%?%p4%t;5%;%?%p6%t;1%;%?%p9%t;12%e;10%;%?%p7%t;9%;m:\
 	:se=\E[m:sf=\E[S:so=\E[7m:sr=\E[T:st=\EH:ta=^I:\
-	:ue=\E[m:up=\E[A:us=\E[4m:vb=^G:tc=ansi-pc-color:
-# (pc6300plus: ":KM=/usr/lib/ua/kmap.s5:"; renamed BO/EE/CI/CV -- esr)
-pc6300plus|6300plus:\
-	:am:bs:\
+	:ue=\E[m:up=\E[A:us=\E[4m:tc=klone+color:
+# (pc6300plus: removed ":KM=/usr/lib/ua/kmap.s5:"; renamed BO/EE/CI/CV -- esr)
+pc6300plus|AT&T 6300 plus:\
+	:am:xo:\
 	:co#80:li#24:\
 	:al=\E[1L:bl=^G:cd=\E[0J:ce=\E[0K:cl=\E[2J\E[H:\
 	:cm=\E[%i%2;%2H:cr=^M:ct=\E[3g:dc=\E[1P:dl=\E[1M:\
 	:do=\E[B:ei=:ho=\E[H:ic=\E[1@:im=:k1=\EOc:k2=\EOd:\
 	:k3=\EOe:k4=\EOf:k5=\EOg:k6=\EOh:k7=\EOi:k8=\EOj:\
 	:k9=\EOk:kb=^H:kd=\E[B:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:\
-	:mb=\E[5m:md=\E[1m:me=\E[m:mh=\E[2m:mk=\E[9m:\
-	:mr=\E[7m:nd=\E[C:nw=^M^J:se=\E[m:sf=^J:so=\E[7m:\
-	:st=\EH:ue=\E[m:up=\E[A:us=\E[4m:ve=\E[=1C:vi=\E[=C:
+	:mb=\E[5m:md=\E[1m:me=\E[m:mh=\E[2m:mr=\E[7m:nd=\E[C:\
+	:nw=^M^J:se=\E[m:sf=^J:so=\E[7m:st=\EH:ue=\E[m:\
+	:up=\E[A:us=\E[4m:ve=\E[=1C:vi=\E[=C:
 
 #
 #	Terminfo entry for the AT&T Unix PC 7300
@@ -559,13 +573,14 @@ att7300|unixpc|pc7300|3b1|s4|AT&T UNIX PC Model 7300:\
 	:UP=\E[%dA:ae=\E[10m:al=\E[L:as=\E[11m:bl=^G:bt=\E^I:\
 	:cd=\E[0J:ce=\E[0K:cl=\E[2J\E[H:cm=\E[%i%d;%dH:cr=^M:\
 	:dl=\E[M:do=\E[B:ho=\E[H:i1=^O:k1=\EOP:k2=\EOQ:\
-	:k3=\EOR:k4=\EOS:k5=\E5:k6=\E6:k7=\E7:k8=\E8:kb=^H:\
-	:kd=\E[B:kh=\Ehm:kl=\E[D:kr=\E[C:ku=\E[A:md=\E[7m:\
-	:me=\E[0;10m:mh=\E[2m:mr=\E[7m:nd=\E[C:nw=\EE:\
-	:se=\E[0m:sf=^J:so=\E[7m:sr=\EM:ue=\E[0m:up=\E[A:\
-	:us=\E[4m:
+	:k3=\EOR:k4=\EOS:k5=\E5:k6=\E6:k7=\E7:k8=\E8:kD=\Edc:\
+	:kI=\Eim:kN=\Epg:kP=\EPG:kb=^H:kd=\E[B:kh=\Ehm:\
+	:kl=\E[D:kr=\E[C:ku=\E[A:md=\E[7m:me=\E[0;10m:\
+	:mh=\E[2m:mr=\E[7m:nd=\E[C:nw=\EE:se=\E[m:sf=^J:\
+	:so=\E[7m:sr=\EM:ue=\E[m:up=\E[A:us=\E[4m:
 
 # From: <davis@unidata.ucar.edu>
+# (iris-ansi: added rmam/smam based on init string -- esr)
 iris-ansi|iris-ansi-net|IRIS emulating ANSI terminal:\
 	:am:\
 	:co#80:it#8:li#40:\
@@ -573,22 +588,23 @@ iris-ansi|iris-ansi-net|IRIS emulating ANSI terminal:\
 	:UP=\E[%dA:al=\E[L:bl=^G:cd=\E[J:ce=\E[K:\
 	:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cr=^M:ct=\E[3g:dl=\E[M:\
 	:do=^J:ho=\E[H:\
-	:is=\E[?1l\E>\E[?7h\E[100g\E[0m\E7\E[r\E8:k1=\E[001q:\
+	:is=\E[?1l\E>\E[?7h\E[100g\E[m\E7\E[r\E8:k1=\E[001q:\
 	:k2=\E[002q:k3=\E[003q:k4=\E[004q:k5=\E[005q:\
-	:k6=\E[006q:k7=\E[007q:k8=\E[008q:k9=\EOP:kb=^H:\
-	:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:le=\E[D:\
-	:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:nw=\EE:rc=\E8:\
-	:sc=\E7:se=\E[m:sf=\ED:so=\E[1;7m:sr=\EM:st=\EH:\
-	:ta=^I:ue=\E[m:up=\E[A:us=\E[4m:\
-	:ve=\E[9/y\E[12/y\E[=6l:vs=\E[10/y\E[=1h\E[=2l\E[=6h:
+	:k6=\E[006q:k7=\E[007q:k8=\E[008q:k9=\EOP:kD=\177:\
+	:kI=\E[139q:kN=\E[154q:kP=\E[150q:kb=^H:kd=\E[B:\
+	:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:le=\E[D:md=\E[1m:\
+	:me=\E[m:mr=\E[7m:nd=\E[C:nw=\EE:rc=\E8:sc=\E7:\
+	:se=\E[m:sf=\ED:so=\E[1;7m:sr=\EM:st=\EH:ta=^I:\
+	:ue=\E[m:up=\E[A:us=\E[4m:ve=\E[9/y\E[12/y\E[=6l:\
+	:vs=\E[10/y\E[=1h\E[=2l\E[=6h:
 
 # From: Alex R.N. Wetmore <aw2t@andrew.cmu.edu>
 oldpc3|oibmpc3|IBM PC 386BSD Console:\
-	:am:bs:bw:eo:\
+	:am:bw:eo:xo:\
 	:co#80:li#25:\
 	:cd=\E[J:ce=\E[K:cl=\Ec:cm=\E[%i%2;%2H:do=\E[B:\
-	:ho=\E[;H:kd=\E[B:kh=\E[Y:kl=\E[D:kr=\E[C:ku=\E[A:\
-	:md=\E[7m:me=\E[0m\E[1;0x\E[2;7x:nd=\E[C:\
+	:ho=\E[H:kd=\E[B:kh=\E[Y:kl=\E[D:kr=\E[C:ku=\E[A:\
+	:le=^H:md=\E[7m:me=\E[m\E[1;0x\E[2;7x:nd=\E[C:\
 	:se=\E[1;0x\E[2;7x:sf=\E[S:so=\E[1;7x\E[2;0x:sr=\E[T:\
 	:ue=\E[1;0x\E[2;7x:up=\E[A:us=\E[1;7x\E[2;0x:
 
@@ -597,19 +613,19 @@ oldpc3|oibmpc3|IBM PC 386BSD Console:\
 # listed in the iBSC2 (e.g. color and character-set selection).
 # The console will also work with fewer lines after doing
 # "stty rows NN", e.g. to use 24 lines.
-pc3ul|ibmpc3-ul|IBM PC BSD/OS Console:\
-	:am:bw:eo:km:\
+bsdos|ibmpc3-ul|ibmpc3ul|IBM PC BSD/OS Console:\
+	:am:bw:eo:km:xo:\
 	:co#80:it#8:li#25:\
 	:AL=\E[%dL:DL=\E[%dM:DO=\E[%dB:LE=\E[%dD:RI=\E[%dC:\
 	:UP=\E[%dA:al=\E[L:bl=^G:cd=\E[J:ce=\E[K:cl=\Ec:\
-	:cm=\E[%i%d;%dH:cr=^M:dl=\E[M:do=^J:ho=\E[H:kb=^H:\
-	:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:\
-	:mb=\E[5m:md=\E[1m:me=\E[0m:mh=\E[=8F:mr=\E[7m:\
-	:nd=\E[C:nw=^M^J:rc=\E[=u:sc=\E[=s:se=\E[0m:sf=^J:\
-	:so=\E[7m:ta=^I:up=\E[A:
-# (This is equivalent to the entry BSDI ships)
-pc3|ibmpc3|IBM PC BSD/OS Console with bold instead of underline:\
-	:ue=\E[0m:us=\E[1m:tc=pc3ul:
+	:cm=\E[%i%d;%dH:cr=^M:dl=\E[M:do=^J:ho=\E[H:kH=\E[F:\
+	:kI=\E[L:kN=\E[G:kP=\E[I:kb=^H:kd=\E[B:kh=\E[H:\
+	:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:mb=\E[5m:md=\E[1m:\
+	:me=\E[m:mh=\E[=8F:mr=\E[7m:nd=\E[C:nw=^M^J:rc=\E[=u:\
+	:sc=\E[=s:se=\E[m:sf=^J:so=\E[7m:ta=^I:up=\E[A:
+# (This is equivalent to the entry BSDI shipped in 1.0. 1.1, and 2.0)
+bsdos-ul|pc3|ibmpc3|IBM PC BSD/OS Console with bold instead of underline:\
+	:ue=\E[m:us=\E[1m:tc=bsdos:
 
 # 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
@@ -619,13 +635,13 @@ pc3|ibmpc3|IBM PC BSD/OS Console with bold instead of underline:\
 # capabilities of the PC monochrome display, without ANY emulation; most
 # communications packages (but NOT PC/IX connect) do some kind of emulation.
 pcix|PC/IX console:\
-	:am:bs:bw:eo:\
+	:am:bw:eo:\
 	:co#80:li#24:\
 	:cd=\E[J:ce=\E[K:cl=\Ec:cm=\E[%i%2;%2H:do=\E[B:\
-	:ho=\E[;H:nd=\E[C:se=\E[0m:so=\E[7m:ue=\E[0m:up=\E[A:\
-	:us=\E[4m:
+	:ho=\E[H:le=^H:nd=\E[C:se=\E[m:so=\E[7m:ue=\E[m:\
+	:up=\E[A:us=\E[4m:
 
-# (ibmx: this entry formerly included the following unknown capabilities:
+# (ibmx: this entry formerly included the following extension capabilities:
 #	:GC=b:GL=v:GR=t:RT=^J:\
 #	:GH=\E[196g:GV=\E[179g:\
 #	:GU=\E[193g:GD=\E[194g:\
@@ -633,62 +649,123 @@ pcix|PC/IX console:\
 #	:CW=\E[E:NU=\E[F:RF=\E[G:RC=\E[H:\
 #	:WL=\E[K:WR=\E[L:CL=\E[M:CR=\E[N:\
 # I renamed GS/GE/WL/WR/CL/CR/PU/PD/HM/EN; also, removed a duplicate
-# ":kh=\E[Y:" -- esr)
+# ":kh=\E[Y:".  Added IBM-PC forms characters and highlights, they match
+# what was there before. -- esr)
 ibmpcx|xenix|ibmx|IBM PC xenix console display:\
-	:am:bs:ms:\
+	:am:ms:\
 	:co#80:li#25:\
-	:ae=\E[10m:al=\E[L:as=\E[11m:cd=\E[J:ce=\E[K:cl=^L:\
-	:cm=\E[%d;%dH:dc=\E[P:dl=\E[M:do=\E[B:ei=:ho=\E[H:\
-	:ic=\E[@:im=:k1=\E[K:k2=\E[L:k3=\E[M:k4=\E[N:kb=^H:\
-	:kd=\E[B:kh=\E[Y:kl=\E[D:kr=\E[C:ku=\E[A:nd=\E[C:\
-	:se=\E[0m:so=\E[7m:ue=\E[m:up=\E[A:us=\E[4m:
-ibmc|ibmcpc|IBM PC xenix color console display:\
-	:tc=ibmpcx:
-ibmcx|ibmcpcx:\
-	:tc=ibmpcx:
-
-pcvt25h|386BSD pcvt rel 2.10 vt220 emulator video driver:\
-	:am:km:mi:ms:xn:\
-	:it#8:pb#9216:vt#3:\
-	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
-	:LE=\E[%dD:RI=\E[%dC:SF=\E%dD:SR=\E%dM:UP=\E[%dA:\
-	:ae=^O:al=\E[L:as=^N:bl=^G:cd=\E[J:ce=\E[K:\
-	:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:\
-	:ct=\E[3g:dc=\E[P:dl=\E[M:do=^J:ei=\E[4l:ho=\E[H:\
-	:i1=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;25r\E[25;1H:\
-	:ic=\E[@:im=\E[4h:k1=\E[17~:k2=\E[18~:k3=\E[19~:\
-	:k4=\E[20~:k5=\E[21~:k6=\E[23~:k7=\E[24~:k8=\E[25~:\
-	:kb=^_:kd=\EOB:ke=\E[?1l\E>:kh=\E[1~:kl=\EOD:kr=\EOC:\
-	:ks=\E[?1h\E=:ku=\EOA:le=^H:mb=\E[5m:md=\E[1m:\
-	:me=\E[m:mr=\E[7m:nd=\E[C:nw=^M^J:rc=\E8:sc=\E7:\
-	:se=\E[27m:sf=\ED:so=\E[7m:sr=\EM:st=\EH:ta=^I:\
-	:ue=\E[24m:up=\E[A:us=\E[4m:
-
-## QNX 4.0 Console
-# No auto-margin capability is listed because the smcup capability string
-# explicitly turns it off. This allows full screen applications on terminals
-# to be able to address the bottom, right corner.
+	:al=\E[L:cd=\E[J:ce=\E[K:cl=^L:cm=\E[%d;%dH:dc=\E[P:\
+	:dl=\E[M:do=\E[B:ei=:ho=\E[H:ic=\E[@:im=:k1=\E[K:\
+	:k2=\E[L:k3=\E[M:k4=\E[N:kN=\E[e:kP=\E[Z:kb=^H:\
+	:kd=\E[B:kh=\E[Y:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:\
+	:nd=\E[C:up=\E[A:tc=klone+acs:tc=klone+sgr:
+
+
+# QNX 4.0 Console
+# Michael's original version of this entry had <am>@, <smcup>=\Ei,
+# <rmcup>=\Eh\ER; this was so terminfo applications could write the lower
+# right corner without triggering a scroll.  The ncurses terminfo library can
+# handle this case with the <ich1> capability, and prefers am for optimization.
 # From: Michael Hunter <mphunter@qnx.com> 25 Aug 1995
 qnx|qnx4|qnx console:\
-	:km:mi:ms:xt:\
+	:am:km:mi:ms:xt:\
 	:co#80:it#4:li#25:\
 	:al=\EE:bl=^G:cd=\EJ:ce=\EK:cl=\EH\EJ:cm=\EY%+ %+ :\
 	:cr=^M:dc=\Ef:dl=\EF:do=^J:ei=:ho=\EH:ic=\Ee:im=:\
 	:k1=\377\201:k2=\377\202:k3=\377\203:k4=\377\204:\
 	:k5=\377\205:k6=\377\206:k7=\377\207:k8=\377\210:\
-	:k9=\377\211:kd=\377\251:kh=\377\240:kl=\377\244:\
+	:k9=\377\211:kD=\377\254:kI=\377\253:kN=\377\252:\
+	:kP=\377\242:kd=\377\251:kh=\377\240:kl=\377\244:\
 	:kr=\377\246:ku=\377\241:le=^H:mb=\E{:md=\E<:\
 	:me=\E}\E]\E>\E):mr=\E(:nd=\EC:rp=\Eg%r%+ %.:\
 	:..sa=%?%p1%t\E<%;%p2%t\E[%;%p3%t\E(%;%p4%t\E{%;%p6%t\E<%;:\
-	:se=\E):sf=^J:so=\E(:sr=\EI:ta=^I:te=\Eh\ER:ti=\Ei:\
-	:ue=\E]:up=\EA:us=\E[:ve=\Ey1:vi=\Ey0:vs=\Ey2:
+	:se=\E):sf=^J:so=\E(:sr=\EI:ta=^I:te=\ER:ue=\E]:\
+	:up=\EA:us=\E[:ve=\Ey1:vi=\Ey0:vs=\Ey2:
+
+#### FreeBSD and NetBSD consoles
+#
+# pcvt termcap database entries (corresponding to release 3.31)
+# Author's last edit-date: [Fri Sep 15 20:29:10 1995]
+#
+# (For the terminfo master file, I translated these into terminfo syntax.
+# Then I dropped all the pseudo-HP entries. we don't want and can't use
+# the :Xs: flag. Then I split :is: into a size-independent <is1> and a
+# size-dependent <is2>.  Finally, I added <rmam>/<smam> -- esr)
+
+# NOTE: because the 386BSD "vi"/"elvis" seems to have a bug if
+# both <ich1> and <smir> are specified (an original VT220 
+# shows the same buggy behaviour!), <ich1> has been taken
+# out of this entry. for reference, it should be <ich1>=\E[@.
+pcvtXX|pcvt vt200 emulator (DEC VT220):\
+	:am:km:mi:ms:xn:\
+	:it#8:vt#3:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
+	:LE=\E[%dD:RI=\E[%dC:SF=\E[%dS:SR=\E[%dT:UP=\E[%dA:\
+	:ae=\E(B:al=\E[L:as=\E(0:bl=^G:cd=\E[J:ce=\E[K:\
+	:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:\
+	:ct=\E[3g:dc=\E[P:dl=\E[M:do=\E[B:ei=\E[4l:ho=\E[H:\
+	:i1=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:im=\E[4h:\
+	:k1=\E[17~:k2=\E[18~:k3=\E[19~:k4=\E[20~:k5=\E[21~:\
+	:k6=\E[23~:k7=\E[24~:k8=\E[25~:kD=\E[3~:kH=\E[4~:\
+	:kI=\E[2~:kN=\E[6~:kP=\E[5~:kb=\177:kd=\EOB:\
+	:ke=\E[?1l\E>:kh=\E[1~:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:\
+	:ku=\EOA:le=^H:mb=\E[5m:md=\E[1m:me=\E[m:mr=\E[7m:\
+	:nd=\E[C:nw=\EE:rc=\E8:sc=\E7:se=\E[27m:sf=\ED:\
+	:so=\E[7m:sr=\EM:st=\EH:ta=^I:ue=\E[24m:up=\E[A:\
+	:us=\E[4m:
+
+#	NetBSD/FreeBSD vt220 terminal emulator console (pc keyboard & monitor)
+#	termcap entries for pure VT220-Emulation and 25, 28, 35, 40, 43 and
+#	50 lines entries; 80 columns
+pcvt25|dec vt220 emulation with 25 lines:\
+	:co#80:li#25:\
+	:is=\E[1;25r\E[25;1H:tc=pcvtXX:
+pcvt28|dec vt220 emulation with 28 lines:\
+	:co#80:li#28:\
+	:is=\E[1;28r\E[28;1H:tc=pcvtXX:
+pcvt35|dec vt220 emulation with 35 lines:\
+	:co#80:li#35:\
+	:is=\E[1;35r\E[35;1H:tc=pcvtXX:
+pcvt40|dec vt220 emulation with 40 lines:\
+	:co#80:li#40:\
+	:is=\E[1;40r\E[40;1H:tc=pcvtXX:
+pcvt43|dec vt220 emulation with 43 lines:\
+	:co#80:li#43:\
+	:is=\E[1;43r\E[43;1H:tc=pcvtXX:
+pcvt50|dec vt220 emulation with 50 lines:\
+	:co#80:li#50:\
+	:is=\E[1;50r\E[50;1H:tc=pcvtXX:
+
+#	NetBSD/FreeBSD vt220 terminal emulator console (pc keyboard & monitor)
+#	termcap entries for pure VT220-Emulation and 25, 28, 35, 40, 43 and
+#	50 lines entries; 132 columns
+pcvt25w|dec vt220 emulation with 25 lines and 132 cols:\
+	:co#132:li#25:\
+	:is=\E[1;25r\E[25;1H:tc=pcvtXX:
+pcvt28w|dec vt220 emulation with 28 lines and 132 cols:\
+	:co#132:li#28:\
+	:is=\E[1;28r\E[28;1H:tc=pcvtXX:
+pcvt35w|dec vt220 emulation with 35 lines and 132 cols:\
+	:co#132:li#35:\
+	:is=\E[1;35r\E[35;1H:tc=pcvtXX:
+pcvt40w|dec vt220 emulation with 40 lines and 132 cols:\
+	:co#132:li#40:\
+	:is=\E[1;40r\E[40;1H:tc=pcvtXX:
+pcvt43w|dec vt220 emulation with 43 lines and 132 cols:\
+	:co#132:li#43:\
+	:is=\E[1;43r\E[43;1H:tc=pcvtXX:
+pcvt50w|dec vt220 emulation with 50 lines and 132 cols:\
+	:co#132:li#50:\
+	:is=\E[1;50r\E[50;1H:tc=pcvtXX:
 
-#### DEC VT100 and compatibles
 
-# DEC terminals from the vt100 forward are collected here.  Older DEC terminals
-# and micro consoles can be found in the `obsolete' section.  More details
-# on the relationship between the VT100 and ANSI X3.64 may be found near the
-# end of this file.
+#### DEC VT100 and compatibles
+#
+# DEC terminals from the vt100 forward (and the vt52, way obsolete but still
+# the basis of some emulations) are collected here. Older DEC terminals and
+# micro consoles can be found in the `obsolete' section.  More details on
+# the relationship between the VT100 and ANSI X3.64/ISO 6429/ECMA-48 may be
+# found near the end of this file.
 #
 # Except where noted, these entries are DEC's official terminfos.
 # Contact Bill Hedberg <hedberg@hannah.enet.dec.com> of Terminal Support
@@ -696,13 +773,24 @@ qnx|qnx4|qnx console:\
 # are kept available at ftp://gatekeeper.dec.com/pub/DEC/termcaps.
 #
 
-# Note that the xenl glitch in vt100 is not quite the same as on the Concept,
+vt52|dec vt52:\
+	:co#80:it#8:li#24:\
+	:bl=^G:cd=\EJ:ce=\EK:cl=\EH\EJ:cm=\EY%+ %+ :cr=^M:\
+	:do=\EB:ho=\EH:kb=^H:kd=\EB:kl=\ED:kr=\EC:ku=\EA:\
+	:le=\ED:nd=\EC:nw=^M^J:sf=^J:sr=\EI:ta=^I:up=\EA:
+
+# NOTE:  Any VT100 emulation, whether in hardware or software, almost
+# certainly includes what DEC called the `Level 1 editing extension' codes;
+# only the very oldest VT100s lacked these and there probably aren't any of
+# those left alive.  To capture these, use one of the VT102 entries.
+#
+# Note that the <xenl> glitch in vt100 is not quite the same as on the Concept,
 # since the cursor is left in a different position while in the
 # weird state (concept at beginning of next line, vt100 at end
 # of this line) so all versions of vi before 3.7 don't handle
-# xenl right on vt100. The correct way to handle xenl is when
+# <xenl> right on vt100. The correct way to handle <xenl> is when
 # you output the char in column 80, immediately output CR LF
-# and then assume you are in column 1 of the next line. If xenl
+# and then assume you are in column 1 of the next line. If <xenl>
 # is on, am should be on too.
 # 
 # I assume you have smooth scroll off or are at a slow enough baud
@@ -713,7 +801,7 @@ qnx|qnx4|qnx console:\
 # The padding requirements listed here are guesses. It is strongly
 # recommended that xon/xoff be enabled, as this is assumed here.
 # 
-# The vt100 uses rs2 and rf rather than is2/tbc/hts because the 
+# 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.
@@ -725,8 +813,42 @@ qnx|qnx4|qnx console:\
 #	1   = ka1	  2   = kb2	    3     = ka3
 #	0   = kc1	  .   = kc3	    ENTER = kent
 #
+# And here, for those of you with orphaned VT100s lacking documentation, is
+# a description of the soft switches invoked when you do `Set Up'.
+# 
+#  Scroll 0-Jump               Shifted 3   0-#
+#  |      1-Smooth             |           1-British pound sign
+#  | Autorepeat 0-Off          | Wrap Around 0-Off
+#  | |          1-On           | |           1-On
+#  | | Screen 0-Dark Bkg       | | New Line 0-Off
+#  | | |      1-Light Bkg      | | |        1-On
+#  | | | Cursor 0-Underline    | | | Interlace 0-Off
+#  | | | |      1-Block        | | | |         1-On
+#  | | | |                     | | | |
+#  1 1 0 1       1 1 1 1       0 1 0 0       0 0 1 0       <--Standard Settings
+#                | | | |                     | | | |
+#                | | | Auto XON/XOFF 0-Off   | | | Power 0-60 Hz
+#                | | |               1-On    | | |       1-50 Hz
+#                | | Ansi/VT52 0-VT52        | | Bits Per Char. 0-7 Bits
+#                | |           1-ANSI        | |                1-8 Bits
+#                | Keyclick 0-Off            | Parity 0-Off
+#                |          1-On             |        1-On
+#                Margin Bell 0-Off           Parity Sense 0-Odd
+#                            1-On                         1-Even
+#
+# The following SET-UP modes are assumed for normal operation:
+#	ANSI_MODE	AUTO_XON/XOFF_ON	NEWLINE_OFF	80_COLUMNS
+#	WRAP_AROUND_ON  JUMP_SCROLL_OFF
+# Other SET-UP modes may be set for operator convenience or communication
+# requirements; I recommend
+#	AUTOREPEAT_ON	BLOCK_CURSOR	MARGIN_BELL_OFF    SHIFTED_3_#
+# Unless you have a graphics add-on such as Digital Engineering's VT640
+# (and even then, whenever it can be arranged!) you should set
+#	INTERLACE_OFF
+#
+# (I added <rmam>/<smam> based on the init string -- esr)
 vt100|vt100-am|dec vt100 (w/advanced video):\
-	:am:mi:ms:xn:xo:\
+	:am:ms:xn:xo:\
 	:co#80:it#8:li#24:vt#3:\
 	:DO=\E[%dB:K1=\EOq:K2=\EOr:K3=\EOs:K4=\EOp:K5=\EOn:\
 	:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:ae=^O:as=^N:bl=^G:\
@@ -739,26 +861,21 @@ vt100|vt100-am|dec vt100 (w/advanced video):\
 	:..sa=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;:\
 	:sc=\E7:se=\E[m:sf=^J:so=\E[7m:sr=\EM:st=\EH:ta=^I:\
 	:ue=\E[m:up=\E[A:us=\E[4m:
-
-vt100nam|vt100-nam|vt100 w/no am (w/advanced video):\
-	:am@:xn@:\
-	:tc=vt100-am:
+vt100nam|vt100-nam|vt100 no automargins:\
+	:am@:xn@:\tc=vt100-am:
 
 # Ordinary vt100 in 132 column ("wide") mode.
 vt100-w|vt100-w-am|dec vt100 132 cols (w/advanced video):\
-	:co#132:li#24:\
-	:tc=vt100-am:
+	:co#132:li#24:\tc=vt100-am:
 vt100-w-nam|vt100-nam-w|dec vt100 132 cols (w/advanced video no automargin):\
-	:co#132:li#14:vt@:\
-	:tc=vt100-nam:
+	:co#132:li#14:vt@:\tc=vt100-nam:
 
 # vt100 with no advanced video.
 vt100-nav|vt100 without advanced video option:\
 	:sg#1:\
 	:mb@:md@:me@:mr@:sa@:se=\E[m:so=\E[7m:ue@:us@:tc=vt100:
 vt100-nav-w|vt100-w-nav|dec vt100 132 cols 14 lines (no advanced video option):\
-	:co#132:li#14:\
-	:tc=vt100-nav:
+	:co#132:li#14:\tc=vt100-nav:
 
 # vt100 with one of the 24 lines used as a status line.
 # We put the status line on the top.
@@ -777,39 +894,6 @@ vt100-s-bot|vt100-bot-s|vt100 for use with bottom sysline:\
 	:ds=\E7\E[1;24r\E8:fs=\E8:is=\E[1;23r\E[23;1H:\
 	:ts=\E7\E[24;%p1%dH\E[1K:tc=vt100-am:
 
-# DEC VT100 with Advanced Video Option -- NOT DEC'S ENTRY!!!
-# This may be used as an alternate vt102 entry; it's probably better than the
-# stock one if you can live with XON/XOFF.  All the AVO gave you was smul/rmul.
-# From: Doug Gwyn <gwyn@smoke.brl.mil> 25 Jan 93
-# The following SET-UP modes are assumed for normal operation:
-#	ANSI_MODE	AUTO_XON/XOFF_ON	NEWLINE_OFF	80_COLUMNS
-#	WRAP_AROUND_ON
-# Other SET-UP modes may be set for operator convenience or communication
-# requirements; I recommend
-#	SMOOTH_SCROLL	AUTOREPEAT_ON	BLOCK_CURSOR	MARGIN_BELL_OFF
-#	SHIFTED_3_#
-# Unless you have a graphics add-on such as Digital Engineering's VT640
-# (and even then, whenever it can be arranged!) you should set
-#	INTERLACE_OFF
-# Hardware tabs are assumed to be set every 8 columns; they can be set up
-# by the "reset", "tset", or "tabs" utilities (use vt100-x, 132 columns, for
-# this).  I have included some compatible code in "rs" for the VT640 if you
-# have one.  No delays are specified; use "stty ixon -ixany" to enable DC3/DC1
-# flow control!
-# Thanks to elsie!ado (Arthur David Olson) for numerous improvements.
-vt100-avo|DEC VT100 with AVO:\
-	:ms:xo:\
-	:co#80:it#8:li#24:vt#3:\
-	:DO=\E[%dB:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:ae=^O:as=^N:\
-	:bl=^G:cd=\E[J:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:\
-	:cr=^M:cs=\E[%i%d;%dr:ct=\E[3g:do=^J:ho=\E[H:\
-	:is=\E<\E)0:k0=\EOP:k1=\EOQ:k2=\EOR:k3=\EOS:kb=^H:\
-	:kd=\EOB:ke=\E[?1l\E>:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:\
-	:ku=\EOA:le=^H:ll=\E[24H:mb=\E[5m:md=\E[1m:me=\E[m:\
-	:mr=\E[7m:nd=\E[C:nw=\EE:rc=\E8:sc=\E7:se=\E[m:sf=^J:\
-	:so=\E[7m:sr=\EM:st=\EH:ta=^I:te=150\E[?7h:ti=\E[?7l:\
-	:ue=\E[m:up=\EM:us=\E[4m:
-
 # Most of the `vt100' emulators out there actually emulate a vt102
 # This entry (or vt102-nsgr) is probably the right thing to use for
 # these.  
@@ -818,22 +902,36 @@ vt102|dec vt102:\
 	:al=\E[L:dc=\E[P:dl=\E[M:ei=\E[4l:im=\E[4h:tc=vt100:
 
 # Many brain-dead PC comm programs that pretend to be `vt100-compatible'
-# fail to interpret the ^O and ^N escapes properly.  Symptom: the sgr0
+# fail to interpret the ^O and ^N escapes properly.  Symptom: the <sgr0>
 # string in the canonical vt100 entry above leaves the screen littered
 # with little  snowflake or star characters (IBM PC ROM character \017 = ^O)
 # after highlight turnoffs.  This entry should fix that, and even leave
 # ACS support working, at the cost of making multiple-highlight changes 
 # slightly more expensive.
 # From: Eric S. Raymond <esr@snark.thyrsus.com> July 22 1995
-vt102-nsgr|dec vt102 with ACS support disabled:\
+vt102-nsgr|vt102 no sgr (use if you see snowflakes after highlight changes):\
 	:me=\E[m:sa@:tc=vt102:
 
 # VT125 Graphics CRT.  Clear screen also erases graphics
 vt125|vt125 graphics terminal:\
-	:cl=\E[;H\E[2J\EPpS(E)\E\\:tc=vt100:
+	:cl=\E[H\E[2J\EPpS(E)\E\\:tc=vt100:
+
+# This isn't a DEC entry, it came from University of Wisconsin.
+# (vt131: I added <rmam>/<smam> based on the init string -- esr)
+vt131|dec vt131:\
+	:am:xn:\
+	:co#80:it#8:li#24:vt#3:\
+	:bl=^G:cd=50\E[J:ce=3\E[K:cl=50\E[;H\E[2J:\
+	:cm=5\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:do=^J:ho=\E[H:\
+	:is=\E[1;24r\E[24;1H:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:\
+	:kb=^H:kd=\EOB:ke=\E[?1l\E>:kl=\EOD:kr=\EOC:\
+	:ks=\E[?1h\E=:ku=\EOA:le=^H:mb=2\E[5m:md=2\E[1m:\
+	:me=2\E[m:mr=2\E[7m:nd=2\E[C:nw=^M^J:rc=\E8:sc=\E7:\
+	:se=2\E[m:so=2\E[7m:sr=5\EM:ta=^I:ue=2\E[m:up=2\E[A:\
+	:us=2\E[4m:
 
 # 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
+# I'm told that <smir>/<rmir> are backwards in the terminal from the
 # manual and from the ANSI standard, this describes the actual 
 # terminal. I've never actually used a vt132 myself, so this 
 # is untested.
@@ -857,9 +955,9 @@ vt220|DEC VT220 in vt100 emulation mode:\
 	:if=/usr/share/tabset/vt100:im=\E[4h:\
 	:is=\E[1;24r\E[24;1H:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:\
 	:k5=\E[17~:k6=\E[18~:k7=\E[19~:k8=\E[20~:k9=\E[21~:\
-	:kb=^H:kd=\E[B:kh=\E[1~:kl=\E[D:kr=\E[C:ku=\E[A:\
-	:le=^H:mb=\E[5m:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:\
-	:rc=\E8:\
+	:kD=\E[3~:kI=\E[2~:kN=\E[6~:kP=\E[5~:kb=^H:kd=\E[B:\
+	:kh=\E[1~:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:mb=\E[5m:\
+	:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:rc=\E8:\
 	:..sa=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e\E(B%;:\
 	:sc=\E7:se=\E[m:sf=20\ED:so=\E[7m:sr=14\EM:ta=^I:\
 	:ue=\E[m:up=\E[A:us=\E[4m:ve=\E[?25h:vi=\E[?25l:
@@ -875,8 +973,7 @@ vt220d|DEC VT220 in vt100 mode with DEC function key labeling:\
 	:k5@:k6=\E[17~:k7=\E[18~:k8=\E[19~:k9=\E[20~:tc=vt220:
 
 vt220nam|vt220-nam|v220n|VT220 in vt100 mode with no auto margins:\
-	:am@:\
-	:tc=vt220:
+	:am@:\tc=vt220:
 
 vt220-8|dec vt220 8 bit terminal:\
 	:am:mi:ms:xn:xo:\
@@ -888,9 +985,9 @@ vt220-8|dec vt220 8 bit terminal:\
 	:ec=\E[%dX:ei=\E[4l:ho=\E[H:if=/usr/share/tabset/vt100:\
 	:im=\E[4h:is=\E[?7h\E[>\E[?1h\E F\E[?4l:k1=\EOP:\
 	:k2=\EOQ:k3=\EOR:k4=\EOS:k6=\E[17~:k7=\E[18~:\
-	:k8=\E[19~:k9=\E[20~:kb=^H:kd=\E[B:kh=\E[H:kl=\E[D:\
-	:kr=\E[C:ku=\E[A:le=^H:mb=\E[5m:md=\E[1m:me=\E[0m:\
-	:mr=\E[7m:nd=\E[C:nw=\EE:pf=\E[4i:po=\E[5i:ps=\E[i:\
+	:k8=\E[19~:k9=\E[20~:kI=\E[2~:kN=\E[6~:kP=\E[5~:\
+	:kb=^H:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:\
+	:mb=\E[5m:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:nw=\EE:\
 	:rc=\E8:sc=\E7:se=\E[27m:sf=\ED:so=\E[7m:sr=\EM:\
 	:st=\EH:ta=^I:ue=\E[24m:up=\E[A:us=\E[4m:\
 	:vb=\E[?5h\E[?5l:
@@ -902,22 +999,18 @@ vt220-8|dec vt220 8 bit terminal:\
 #
 # Use v320n for SCO's LYRIX.  Otherwise, use Adam Thompson's vt320-nam.
 #
-vt320nam|vt320-nam|v320n|DEC VT320 in vt100 emul. mode with NO AUTO WRAP mode:\
-	:am@:\
-	:tc=vt220:
+vt320nam|v320n|DEC VT320 in vt100 emul. mode with NO AUTO WRAP mode:\
+	:am@:\tc=vt220:
 
 # These entries are not DEC's official ones, they were purpose-built for the 
 # VT320.  Here are the designer's notes:
-# Specifying am kills SAS, so a vt320-sas with .am is needed for such
-# situations... I think this is a bug in SAS v6.07, where am2 actually
-# *overrides* am, and causes goofy behaviour.
-# kel is end on a PC kbd.  Actually 'select' on a VT.  Mapped to 'Erase to End
-# of Field'... since nothing seems to use 'end' anyways...
+# <kel> is end on a PC kbd.  Actually 'select' on a VT.  Mapped to 
+# 'Erase to End of Field'... since nothing seems to use 'end' anyways...
 # khome is Home on a PC kbd.  Actually 'FIND' on a VT.
-# Things that use knxt usually use tab anyways... and things that don't use
-# tab usually use knxt instead...
+# Things that use <knxt> usually use tab anyways... and things that don't use
+# tab usually use <knxt> instead...
 # kprv is same as tab - Backtab is useless...
-# I left out sgr because of its RIDICULOUS complexity,
+# I left out <sgr> because of its RIDICULOUS complexity,
 # and the resulting fact that it causes the termcap translation of the entry
 # to SMASH the 1k-barrier...
 # From: Adam Thompson <thompson@xanth.magic.mb.ca> Sept 10 1995
@@ -927,17 +1020,17 @@ vt320|vt300|dec vt320 7 bit terminal:\
 	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
 	:K1=\EOw:K2=\EOu:K3=\EOy:K4=\EOq:K5=\EOs:LE=\E[%dD:\
 	:RI=\E[%dC:UP=\E[%dA:ae=\E(B:al=\E[L:as=\E(0:bl=^G:\
-	:cd=\E[J:ce=\E[K:cl=\E[;H\E[2J:cm=\E[%i%d;%dH:cr=^M:\
+	:cd=\E[J:ce=\E[K:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cr=^M:\
 	:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:dl=\E[M:do=^J:\
 	:ec=\E[%dX:ei=\E[4l:ho=\E[H:im=\E[4h:\
 	:is=\E>\E[?3l\E[?4l\E[5?l\E[?7h\E[?8h\E[1;24r\E[24;1H:\
 	:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:k6=\E[17~:k7=\E[18~:\
-	:k8=\E[19~:k9=\E[20~:kb=\177:kd=\EOB:ke=\E[?1l\E>:\
-	:kh=\E[1~:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:ku=\EOA:le=^H:\
-	:mb=\E[5m:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:nw=\EE:\
-	:pf=\E[?4i:po=\E[?5i:ps=\E[i:rc=\E8:sc=\E7:se=\E[m:\
-	:sf=\ED:so=\E[7m:sr=\EM:st=\EH:ta=^I:\
-	:ts=\E[1$}\E[;H\E[K:ue=\E[m:up=\E[A:us=\E[4m:\
+	:k8=\E[19~:k9=\E[20~:kD=\E[3~:kI=\E[2~:kN=\E[6~:\
+	:kP=\E[5~:kb=\177:kd=\EOB:ke=\E[?1l\E>:kh=\E[1~:\
+	:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:ku=\EOA:le=^H:mb=\E[5m:\
+	:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:nw=\EE:rc=\E8:\
+	:sc=\E7:se=\E[m:sf=\ED:so=\E[7m:sr=\EM:st=\EH:ta=^I:\
+	:ts=\E[1$}\E[H\E[K:ue=\E[m:up=\E[A:us=\E[4m:\
 	:ve=\E[?25h:vi=\E[?25l:
 vt320-nam|vt300-nam|dec vt320 7 bit terminal with no am to make SAS happy:\
 	:am@:\
@@ -950,26 +1043,104 @@ vt320-w-nam|vt300-w-nam|dec vt320 wide 7 bit terminal with no am:\
 	:am@:\
 	:is=\E>\E[?3h\E[?4l\E[5?l\E[?7l\E[?8h\E[1;24r\E[24;1H:tc=vt320-w:
 
+# VT330 and VT340 -- These are ReGIS and SIXEL graphics terminals
+#   which are pretty much a superset of the VT320.  They have the
+#   host writable status line, yet another different DRCS matrix size,
+#   and such, but they add the DEC Technical character set, Multiple text
+#   pages, selectable length pages, and the like.  The difference between
+#   the vt330 and vt340 is that the latter has only 2 planes and a monochrome
+#   monitor, the former has 4 planes and a color monitor.  These terminals
+#   support VT131 and ANSI block mode, but as with much of these things,
+#   termcap/terminfo doesn't deal with these features.
+#
+# Note that this entry is are set up in what was the standard way for GNU
+# Emacs v18 terminal modes to deal with the cursor keys in that the arrow
+# 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,
+#
+# From: Daniel Glasser <dag@persoft.persoft.com>, 13 Oct 1993
+# (vt340: string capability "sb=\E[M" corrected to "sr";
+# also, added <rmam>/<smam> based on the init string -- esr)
+vt340|dec-vt340|vt330|dec-vt330|dec vt340 graphics terminal with 24 line page:\
+	:am:es:hs:mi:ms:xn:xo:\
+	:co#80:it#8:li#24:vt#3:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
+	:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:ae=^O:al=\E[L:as=^N:\
+	:cd=\E[J:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:\
+	:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:dl=\E[M:do=^J:\
+	:ds=\E[2$~\r\E[1$}\E[K\E[$}:ei=\E[4l:fs=\E[$}:\
+	:ho=\E[H:im=\E[4h:\
+	:is=\E<\E F\E>\E[?1h\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;24r\E[24;1H:\
+	:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:k6=\E[17~:k7=\E[18~:\
+	:k8=\E[19~:k9=\E[20~:kb=^H:kd=\EOB:ke=\E[?1l\E>:\
+	:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:ku=\EOA:le=^H:mb=\E[5m:\
+	:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:nw=^M\ED:rc=\E8:\
+	:sc=\E7:se=\E[27m:sf=\ED:so=\E[7m:sr=\EM:st=\EH:\
+	:ta=^I:ts=\E[2$~\E[1$}\E[1;%dH:ue=\E[24m:up=\E[A:\
+	:us=\E[4m:vb=200\E[?5h\E[?5l:ve=\E[?25h:vi=\E[?25l:\
+	:vs=\E[?25h:
+
+# DEC doesn't supply a vt400 description, so we add Daniel Glasser's
+# (originally written with vt420 as its primary name, and usable for it).
+# 
+# VT400/420 -- This terminal is a superset of the vt320.  It adds the multiple 
+#    text pages and long text pages with selectable length of the vt340, along
+#    with left and right margins, rectangular area text copy, fill, and erase
+#    operations, selected region character attribute change operations,
+#    page memory and rectangle checksums, insert/delete column, reception
+#    macros, and other features too numerous to remember right now.  TERMCAP
+#    can only take advantage of a few of these added features.
+#
+# Note that this entry is are set up in what was the standard way for GNU
+# Emacs v18 terminal modes to deal with the cursor keys in that the arrow
+# 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,
+#
+# From: Daniel Glasser <dag@persoft.persoft.com>, 13 Oct 1993
+# (vt400: string capability ":sb=\E[M:" corrected to ":sr=\E[M:";
+# also, added <rmam>/<smam> based on the init string -- esr)
+vt400|vt400-24|dec-vt400|dec vt400 24x80 column autowrap:\
+	:am:es:hs:mi:ms:xn:xo:\
+	:co#80:it#8:li#24:vt#3:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
+	:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:ae=^O:al=\E[L:as=^N:\
+	:cd=10\E[J:ce=4\E[K:cl=10\E[H\E[J:cm=\E[%i%d;%dH:\
+	:cr=^M:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:dl=\E[M:do=^J:\
+	:ds=\E[2$~\r\E[1$}\E[K\E[$}:ei=\E[4l:fs=\E[$}:\
+	:ho=\E[H:ic=\E[@:im=\E[4h:\
+	:is=\E<\E F\E>\E[?1h\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;24r\E[24;1H:\
+	:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:k6=\E[17~:k7=\E[18~:\
+	:k8=\E[19~:k9=\E[20~:kb=^H:kd=\EOB:ke=\E[?1l\E>:\
+	:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:ku=\EOA:le=^H:mb=\E[5m:\
+	:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:nw=^M\ED:rc=\E8:\
+	:sc=\E7:se=\E[27m:sf=\ED:so=\E[7m:sr=\EM:st=\EH:\
+	:ta=^I:ts=\E[2$~\E[1$}\E[1;%dH:ue=\E[24m:up=\E[A:\
+	:us=\E[4m:vb=200\E[?5h\E[?5l:ve=\E[?25h:vi=\E[?25l:\
+	:vs=\E[?25h:
+
+# (I removed <kf0>, it collided with <kf10>;
+# I also added <rmam>/<smam> based on the init string -- esr)
 vt420|DEC VT420:\
 	:am:mi:xn:xo:\
 	:co#80:li#24:vt#3:\
 	:ae=\E(B:al=\E[L:as=\E(0:bl=^G:cd=\E[J:ce=\E[K:\
-	:cl=\E[;H\E[2J:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:\
+	:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:\
 	:dc=\E[P:dl=\E[M:do=\E[B:ei=\E[4l:ho=\E[H:\
 	:i2=\E[?67h\E[64;1"p:if=/usr/share/tabset/vt100:\
-	:im=\E[4h:is=\E[1;24r\E[24;1H:k0=\E[29~:k1=\EOP:\
-	:k2=\EOQ:k3=\EOR:k4=\EOS:k5=\E[17~:k6=\E[18~:\
-	:k7=\E[19~:k8=\E[20~:k9=\E[21~:kb=^H:kd=\E[B:ke=\E>:\
-	:kl=\E[D:kr=\E[C:ks=\E=:ku=\E[A:le=^H:mb=\E[5m:\
-	:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:rc=\E8:\
+	:im=\E[4h:is=\E[1;24r\E[24;1H:k1=\EOP:k2=\EOQ:\
+	:k3=\EOR:k4=\EOS:k5=\E[17~:k6=\E[18~:k7=\E[19~:\
+	:k8=\E[20~:k9=\E[21~:kD=\E[3~:kI=\E[2~:kN=\E[6~:\
+	:kP=\E[5~:kb=^H:kd=\E[B:ke=\E>:kl=\E[D:kr=\E[C:\
+	:ks=\E=:ku=\E[A:le=^H:mb=\E[5m:md=\E[1m:me=\E[m:\
+	:mr=\E[7m:nd=\E[C:rc=\E8:\
 	:..sa=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e\E(B%;:\
 	:se=\E[m:sf=\ED:so=\E[7m:sr=\EM:ta=^I:ue=\E[m:\
 	:up=\E[A:us=\E[4m:
 
-vt420nam|vt420-nam|v420n|DEC VT420 in vt100 emul. mode with NO AUTO WRAP mode:\
-	:am@:\
-	:tc=vt420:
-
 #
 #  DECUDK   
 #               if (key < 16) then  value = key;
@@ -981,32 +1152,22 @@ vt420nam|vt420-nam|v420n|DEC VT420 in vt100 emul. mode with NO AUTO WRAP mode:\
 #
 vt420pc|DEC VT420 w/PC keyboard:\
 	:k1=\E[11~:k2=\E[12~:k3=\E[13~:k4=\E[14~:k5=\E[15~:\
-	:k6=\E[17~:k7=\E[18~:k8=\E[19~:k9=\E[20~:kh=\E[H:tc=vt420:
+	:k6=\E[17~:k7=\E[18~:k8=\E[19~:k9=\E[20~:kD=\177:\
+	:kh=\E[H:tc=vt420:
 
 vt420pcdos|DEC VT420 w/PC for DOS Merge:\
 	:li#25:\
-	:me=\E[0m:sa@:tc=vt420pc:
+	:me=\E[m:sa@:tc=vt420pc:
 
 vt420f|DEC VT420 with VT kbd; VT400 mode; F1-F5 used as Fkeys:\
 	:k1=\E[11~:k2=\E[12~:k3=\E[13~:k4=\E[14~:k5=\E[15~:\
-	:k6=\E[17~:k7=\E[18~:k8=\E[19~:k9=\E[20~:kh=\E[H:tc=vt420:
-
-vt420f-nam|v420fn|DEC VT420 no auto margins:\
-	:am@:\
-	:tc=vt420f:
-vt420pc-nam|v420pcn|DEC VT420 PC keyboard no auto margins:\
-	:am@:\
-	:tc=vt420pc:
+	:k6=\E[17~:k7=\E[18~:k8=\E[19~:k9=\E[20~:kD=\177:\
+	:kh=\E[H:tc=vt420:
 
 vt510|DEC VT510:\
 	:tc=vt420:
-vt510nam|vt510-nam|v510n|DEC VT510 in vt100 emul. mode with NO AUTO WRAP mode:\
-	:tc=vt420nam:
 vt510pc|DEC VT510 w/PC keyboard:\
 	:tc=vt420pc:
-vt510pc-nam|v510pcn|DEC VT510 PC keyboard no auto margins:\
-	:am@:\
-	:tc=vt420pc:
 vt510pcdos|DEC VT510 w/PC for DOS Merge:\
 	:tc=vt420pcdos:
 
@@ -1023,71 +1184,74 @@ vt510pcdos|DEC VT510 w/PC for DOS Merge:\
 # 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.
+# (I added <rmam>/<smam> based on the init string -- esr)
 vt520|DEC VT520:\
 	:am:mi:xn:xo:\
 	:co#80:li#24:vt#3:\
 	:ae=\E(B:al=\E[L:as=\E(0:bl=^G:cd=\E[J:ce=\E[K:\
-	:cl=\E[;H\E[2J:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:\
+	:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:\
 	:dc=\E[P:dl=\E[M:do=\E[B:ei=\E[4l:ho=\E[H:\
 	:i2=\E[?67h\E[64;1"p:if=/usr/share/tabset/vt100:\
 	:im=\E[4h:is=\E[1;24r\E[24;1H:k0=\E[29~:k1=\EOP:\
 	:k2=\EOQ:k3=\EOR:k4=\EOS:k5=\E[17~:k6=\E[18~:\
-	:k7=\E[19~:k8=\E[20~:k9=\E[21~:kb=^H:kd=\E[B:kl=\E[D:\
-	:kr=\E[C:ku=\E[A:le=^H:mb=\E[5m:md=\E[1m:me=\E[m:\
-	:mr=\E[7m:nd=\E[C:rc=\E8:\
+	:k7=\E[19~:k8=\E[20~:k9=\E[21~:kD=\E[3~:kI=\E[2~:\
+	:kN=\E[6~:kP=\E[5~:kb=^H:kd=\E[B:kl=\E[D:kr=\E[C:\
+	:ku=\E[A:le=^H:mb=\E[5m:md=\E[1m:me=\E[m:mr=\E[7m:\
+	:nd=\E[C:rc=\E8:\
 	:..sa=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e\E(B%;:\
 	:se=\E[m:sf=\ED:so=\E[7m:sr=\EM:ta=^I:ue=\E[m:\
 	:up=\E[A:us=\E[4m:
 
-vt520nam|vt520-nam|v520n|DEC VT520 with NO AUTO WRAP:\
-	:am@:\
-	:tc=vt520:
-
+# (I added <rmam>/<smam> based on the init string -- esr)
 vt525|DEC VT525:\
 	:am:mi:xn:xo:\
 	:co#80:li#24:vt#3:\
 	:ae=\E(B:al=\E[L:as=\E(0:bl=^G:cd=\E[J:ce=\E[K:\
-	:cl=\E[;H\E[2J:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:\
+	:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:\
 	:dc=\E[P:dl=\E[M:do=\E[B:ei=\E[4l:ho=\E[H:\
 	:i2=\E[?67h\E[64;1"p:if=/usr/share/tabset/vt100:\
 	:im=\E[4h:is=\E[1;24r\E[24;1H:k0=\E[29~:k1=\EOP:\
 	:k2=\EOQ:k3=\EOR:k4=\EOS:k5=\E[17~:k6=\E[18~:\
-	:k7=\E[19~:k8=\E[20~:k9=\E[21~:kb=^H:kd=\E[B:kl=\E[D:\
-	:kr=\E[C:ku=\E[A:le=^H:mb=\E[5m:md=\E[1m:me=\E[m:\
-	:mr=\E[7m:nd=\E[C:rc=\E8:\
+	:k7=\E[19~:k8=\E[20~:k9=\E[21~:kD=\E[3~:kI=\E[2~:\
+	:kN=\E[6~:kP=\E[5~:kb=^H:kd=\E[B:kl=\E[D:kr=\E[C:\
+	:ku=\E[A:le=^H:mb=\E[5m:md=\E[1m:me=\E[m:mr=\E[7m:\
+	:nd=\E[C:rc=\E8:\
 	:..sa=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e\E(B%;:\
 	:se=\E[m:sf=\ED:so=\E[7m:sr=\EM:ta=^I:ue=\E[m:\
 	:up=\E[A:us=\E[4m:
 
-vt525nam|vt525-nam|v525n|DEC VT525 with NO AUTO WRAP:\
-	:am@:\
-	:tc=vt525:
-
 #### VT100 emulations
 #
 
+# 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.
+dec-vt100|EWAN telnet's vt100 emulation:\
+	:tc=vt102-nsgr:
+
 # 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
 # that matter -- DEC's ALL-in-1 seems happy with it, as does INFOPLUS's
 # RDBM systems, it includes ReGIS and SiXel support!  I'm impressed...
 # I can send the address if requested.
+# (z340: changed garbled \E[5?l to \E[?5l, DEC smooth scroll off -- esr)
 # From: Adam Thompson <thompson@xanth.magic.mb.ca> Sept 10 1995
 z340|zstem vt340 terminal emulator 132col 42line:\
 	:li#42:\
-	:is=\E>\E[?3h\E[?4l\E[5?l\E[?7h\E[?8h\E[1;42r\E[42;1H:tc=vt320-w:
+	:is=\E>\E[?3h\E[?4l\E[?5l\E[?7h\E[?8h\E[1;42r\E[42;1H:tc=vt320-w:
 z340-nam|zstem vt340 terminal emulator 132col 42line:\
 	:am@:\
-	:is=\E>\E[?3h\E[?4l\E[5?l\E[?7l\E[?8h\E[1;42r\E[42;1H:tc=z340:
+	:is=\E>\E[?3h\E[?4l\E[?5l\E[?7l\E[?8h\E[1;42r\E[42;1H:tc=z340:
 
 #### Xterm variants
 #
 
 # X10/6.6	11/7/86, minus alternate screen, plus (csr)
-# (xterm: ":MT:" changed to ":km:"; mapped ":pt:" to ":it#8:";
+# (xterm: ":MT:" changed to ":km:"; added <smam>/<rmam> based on init string;
 # removed (hs, eslok, tsl=\E[?E\E[?%i%dT, fsl=\E[?F, dsl=\E[?E)
 # as these seem not to work -- esr)
 x10term|vs100-x10|xterm terminal emulator (X10 window system):\
-	:am:bs:km:mi:ms:pt:xn:xo:\
+	:am:km:mi:ms:xn:xo:\
 	:co#80:it#8:li#65:\
 	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:al=\E[L:cd=\E[J:\
 	:ce=\E[K:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cs=\E[%i%d;%dr:\
@@ -1097,44 +1261,31 @@ x10term|vs100-x10|xterm terminal emulator (X10 window system):\
 	:ks=\E[?1h\E=:ku=\EOA:le=^H:md=\E[1m:me=\E[m:\
 	:mr=\E[7m:nd=\E[C:\
 	:rs=\E[r\E<\E[m\E[H\E[2J\E[?7h\E[?1;3;4;6l:se=\E[m:\
-	:sf=^J:so=\E[7m:sr=\EM:ue=\E[m:up=\E[A:us=\E[4m:
+	:sf=^J:so=\E[7m:sr=\EM:ta=^I:ue=\E[m:up=\E[A:\
+	:us=\E[4m:
 # X11R6 xterm.  This is known good for the XFree86 version under Linux.
-# From: Eric S. Raymond <esr@snark.thyrsus.com> 9 Jul 1995
-# Note: If you use the line-drawing character set, the disable afterwards
-# will leave you in US-ASCII.  If you live somewhere that wants a pound sign
-# at 2/3, change rmacs to "\E(A".  Further note: cuf and cub don't seem
-# to be reliable under my xterm, so they're commented out.  Final note:
-# Older versions of this entry set/reset application keypad mode (\EO-prefix
-# cursor keys) in the [sr]mkx caps, but it wasn't necessary, and doesn't
-# actually fit the terminfo model properly.
+# 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> 9 Nov 1995
 xterm|vs100|xterm terminal emulator (X11R6 Window System):\
-	:am:bs:km:mi:ms:pt:xn:xo:\
-	:co#80:it#8:li#65:\
-	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:IC=\E[%d@:LE=\E[%dD:\
-	:UP=\E[%dA:ae=\E(B:al=\E[L:as=\E(0:bl=^G:cd=\E[J:\
-	:ce=\E[K:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cr=^M:\
-	:cs=\E[%i%d;%dr:ct=\E[3k:dc=\E[P:dl=\E[M:do=^J:\
+	:am:km:mi:ms:xn:xo:\
+	:co#80:it#8:li#24:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
+	:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:ae=^O:al=\E[L:as=^N:\
+	:bl=^G:cd=\E[J:ce=\E[K:cl=\E[H\E[2J:cm=\E[%i%d;%dH:\
+	:cr=^M:cs=\E[%i%d;%dr:ct=\E[3k:dc=\E[P:dl=\E[M:do=^J:\
 	:ei=\E[4l:ho=\E[H:ic=\E[@:im=\E[4h:\
 	:is=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l:\
 	:k1=\E[11~:k2=\E[12~:k3=\E[13~:k4=\E[14~:k5=\E[15~:\
-	:k6=\E[17~:k7=\E[18~:k8=\E[19~:k9=\E[20~:kb=^H:\
-	:kd=\E[B:kh=\E[@:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:\
+	:k6=\E[17~:k7=\E[18~:k8=\E[19~:k9=\E[20~:kI=\E[2~:\
+	:kN=\E[6~:kP=\E[5~:kb=^H:kd=\EOB:ke=\E[?1l\E>:\
+	:kh=\E[@:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:ku=\EOA:le=^H:\
 	:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:rc=\E8:sc=\E7:\
 	:se=\E[m:sf=^J:so=\E[7m:sr=\EM:ta=^I:\
 	:te=\E[2J\E[?47l\E8:ti=\E7\E[?47h:ue=\E[m:up=\E[A:\
 	:us=\E[4m:
-xterm24|vs100-24|xterm terminal emulator (24 lines) (X11R6 window system):\
-	:co#80:li#24:\
-	:tc=xterm:
-xterm25|vs100-25|xterm terminal emulator (25 lines) (X11R6 window system):\
-	:co#80:li#25:\
-	:tc=xterm:
-xterm50|vs100-50|xterm terminal emulator (50 lines) (X11R6 window system):\
-	:co#80:li#50:\
-	:tc=xterm:
-xterms|vs100s|xterm terminal emulator (small) (X11R6 window system):\
-	:tc=xterm24:
-# (kterm: this had unknown capabilities ":KJ:TY=ascii:" -- esr)
+# (kterm: this had extension capabilities ":KJ:TY=ascii:" -- esr)
 kterm|kterm kanji terminal emulator (X window system):\
 	:es:hs:\
 	:cs=\E[%i%d;%dr:ds=\E[?H:fs=\E[?F:rc=\E8:sc=\E7:\
@@ -1147,7 +1298,7 @@ xterm-nic|xterm with ich/ich1 suppressed for non-curses programs:\
 # From: Eric S. Raymond <esr@snark.thyrsus.com> May 4 1995
 # Should work with the color xterm on the X11R6 contrib tape.
 xterm-color|xterm with color support:\
-	:tc=xterm:tc=ansi-pc-color:
+	:tc=xterm:tc=klone+color:
 
 # 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
@@ -1160,6 +1311,21 @@ xterm-pcolor|xterm with color used for highlights and status line:\
 	:ds=\E]0;\007:fs=^G:md=\E[1m\E[43m:mr=\E[7m\E[34m:\
 	:so=\E[7m\E[31m:ts=\E]0;:us=\E[4m\E[42m:tc=xterm:
 
+# HP ships this.
+hpterm|X-hpterm|hp X11 terminal emulator:\
+	:am:da:db:mi:xs:\
+	:co#80:li#24:lm#0:sg#0:\
+	:ae=^O:al=\EL:as=^N:bl=^G:bt=\Ei:cd=\EJ:ce=\EK:\
+	:cl=\E&a0y0C\EJ:cm=\E&a%dy%dC:cr=^M:ct=\E3:dc=\EP:\
+	:dl=\EM:do=\EB:ei=\ER:im=\EQ:k1=\Ep:k2=\Eq:k3=\Er:\
+	:k4=\Es:k5=\Et:k6=\Eu:k7=\Ev:k8=\Ew:kD=\EP:kH=\EF:\
+	:kI=\EQ:kN=\EU:kP=\EV:kb=^H:kd=\EB:ke=\E&s0A:kh=\Eh:\
+	:kl=\ED:kr=\EC:ks=\E&s1A:ku=\EA:le=^H:md=\E&dB:\
+	:me=\E&d@:mh=\E&dH:mr=\E&dB:nd=\EC:\
+	:..sa=\E&d%?%p7%t%'s'%c%;%p1%p3%|%p6%|%{2}%*%p2%{4}%*%+%p4%+%p5%{8}%*%+%'@'%+%c%?%p9%t%'\016'%c%e%'\017'%c%;:\
+	:se=\E&d@:sf=^J:so=\E&dJ:sr=\ET:st=\E1:ta=^I:\
+	:ue=\E&d@:up=\EA:us=\E&dD:
+
 ######## UNIX VIRTUAL TERMINALS AND VIRTUAL CONSOLES
 #
 
@@ -1167,7 +1333,7 @@ xterm-pcolor|xterm with color used for highlights and status line:\
 # UNIX 4.0 and successors as line discipline 1 (?), but is 
 # undocumented and does not really work quite right.
 cbunix|cb unix virtual terminal:\
-	:am:bs:da:db:\
+	:am:da:db:\
 	:co#80:li#24:lm#0:\
 	:al=\EP:bl=^G:cd=\EL:ce=\EK:cl=\EL:cm=\EG%r%.%.:\
 	:cr=^M:dc=\EM:dl=\EN:do=^J:ei=:ic=\EO:im=:kd=\EB:\
@@ -1176,12 +1342,14 @@ cbunix|cb unix virtual terminal:\
 # (vremote: removed obsolete ":nl@:" -- esr)
 vremote|virtual remote terminal:\
 	:am@:\
-	:co#79:\
-	:tc=cbunix:
+	:co#79:\tc=cbunix:
 pty|4bsd pseudo teletype:\
 	:cm=\EG%+ %+ :se=\Eb$:so=\Ea$:ue=\Eb!:us=\Ea!:tc=cbunix:
 
-# Entries for use by the FSF's `screen' program.  These came with version 3.6.2
+# Entries for use by the FSF's `screen' program.  The screen and
+# screen-w came with version 3.6.2.  The screen2 and screen3 entries
+# come from University of Wisconsin and may be older.
+
 screen|VT 100/ANSI X3.64 virtual terminal:\
 	:am:km:mi:ms:xn:\
 	:co#80:it#8:li#24:\
@@ -1191,24 +1359,38 @@ screen|VT 100/ANSI X3.64 virtual terminal:\
 	:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:ct=\E[3g:\
 	:dc=\E[P:dl=\E[M:do=^J:ei=\E[4l:ho=\E[H:im=\E[4h:\
 	:is=\E)0:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:k5=\E[15~:\
-	:k6=\E[17~:k7=\E[18~:k8=\E[19~:k9=\E[20~:kb=^H:\
-	:kd=\EOB:ke=\E[?1l\E>:kh=\E[1~:kl=\EOD:kr=\EOC:\
-	:ks=\E[?1h\E=:ku=\EOA:le=^H:mb=\E[5m:md=\E[1m:\
-	:me=\E[m:mr=\E[7m:nd=\E[C:nw=\EE:rc=\E8:sc=\E7:\
-	:se=\E[23m:sf=^J:so=\E[3m:sr=\EM:st=\EH:ta=^I:\
-	:ue=\E[24m:up=\EM:us=\E[4m:
+	:k6=\E[17~:k7=\E[18~:k8=\E[19~:k9=\E[20~:kD=\E[3~:\
+	:kH=\E[4~:kI=\E[2~:kN=\E[6~:kP=\E[5~:kb=^H:kd=\EOB:\
+	:ke=\E[?1l\E>:kh=\E[1~:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:\
+	:ku=\EOA:le=^H:mb=\E[5m:md=\E[1m:me=\E[m:mr=\E[7m:\
+	:nd=\E[C:nw=\EE:rc=\E8:sc=\E7:se=\E[23m:sf=^J:\
+	:so=\E[3m:sr=\EM:st=\EH:ta=^I:ue=\E[24m:up=\EM:\
+	:us=\E[4m:
 screen-w|VT 100/ANSI X3.64 virtual terminal with 132 cols:\
-	:am:km:mi:ms:xn:\
-	:co#132:it#8:li#24:\
+	:co#132:\tc=screen:
+
+screen2|VT 100/ANSI X3.64 virtual terminal:\
+	:co#80:it#8:li#24:\
 	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
-	:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:ae=^O:al=\E[L:as=^N:\
-	:bl=^G:bt=\E[Z:cd=\E[J:ce=\E[K:cl=\E[H\E[J:\
-	:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:ct=\E[3g:\
-	:dc=\E[P:dl=\E[M:do=^J:ei=\E[4l:ho=\E[H:im=\E[4h:\
-	:is=\E)0:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:k5=\E[15~:\
-	:k6=\E[17~:k7=\E[18~:k8=\E[19~:k9=\E[20~:kb=^H:\
-	:kd=\EOB:ke=\E[?1l\E>:kh=\E[1~:kl=\EOD:kr=\EOC:\
-	:ks=\E[?1h\E=:ku=\EOA:le=^H:mb=\E[5m:md=\E[1m:\
+	:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:al=\E[L:bt=\E[Z:\
+	:cd=\E[J:ce=\E[K:cl=\E[2J\E[H:cm=\E[%i%d;%dH:cr=^M:\
+	:ct=\E[3g:dc=\E[P:dl=\E[M:do=\E[B:ei=\E[4l:ic=:\
+	:im=\E[4h:k0=\E~:k1=\ES:k2=\ET:k3=\EU:k4=\EV:k5=\EW:\
+	:k6=\EP:k7=\EQ:k8=\ER:k9=\E0I:kb=^H:kd=\EB:kh=\EH:\
+	:kl=\ED:kr=\EC:ku=\EA:le=^H:nd=\E[C:nw=^M^J:rc=\E8:\
+	:sc=\E7:se=\E[23m:sf=^J:so=\E[3m:sr=\EM:st=\EH:ta=^I:\
+	:ue=\E[24m:up=\E[A:us=\E[4m:
+# (screen3: removed unknown ":xv:LP:G0:" -- esr)
+screen3|VT 100/ANSI X3.64 virtual terminal:\
+	:km:mi:ms:\
+	:co#80:it#8:li#24:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
+	:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:al=\E[L:bl=^G:bt=\E[Z:\
+	:cd=\E[J:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:\
+	:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:dl=\E[M:do=^J:\
+	:ei=\E[4l:ho=\E[H:im=\E[4h:is=\E)0:k1=\EOP:k2=\EOQ:\
+	:k3=\EOR:k4=\EOS:kb=^H:kd=\EOB:ke=\E>:kl=\EOD:\
+	:kr=\EOC:ks=\E=:ku=\EOA:le=^H:mb=\E[5m:md=\E[1m:\
 	:me=\E[m:mr=\E[7m:nd=\E[C:nw=\EE:rc=\E8:sc=\E7:\
 	:se=\E[23m:sf=^J:so=\E[3m:sr=\EM:st=\EH:ta=^I:\
 	:ue=\E[24m:up=\EM:us=\E[4m:
@@ -1220,16 +1402,15 @@ screen-w|VT 100/ANSI X3.64 virtual terminal with 132 cols:\
 #
 
 # :is: resets scrolling region in case a previous user had used "tset vt100"
-# (sun: mapped ":pt:" to ":it#8:" -- esr)
 oldsun|Sun Microsystems Workstation console:\
-	:am:bs:km:mi:ms:pt:\
+	:am:km:mi:ms:\
 	:co#80:it#8:li#34:\
 	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:IC=\E[%d@:al=\E[L:\
 	:bl=^G:cd=\E[J:ce=\E[K:cl=^L:cm=\E[%i%d;%dH:cr=^M:\
-	:dc=\E[P:dl=\E[M:do=\E[B:ei=:ic=\E[@:im=:is=\E[1r:\
+	:dc=\E[P:dl=\E[M:do=\E[B:ei=:i1=\E[1r:ic=\E[@:im=:\
 	:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:kd=\E[B:kh=\E[H:\
-	:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:nd=\E[C:rs=\E[1r:\
-	:se=\E[m:sf=^J:so=\E[7m:ta=^I:up=\E[A:
+	:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:nd=\E[C:se=\E[m:sf=^J:\
+	:so=\E[7m:ta=^I:up=\E[A:
 # New entry from vendor
 sun|sun1|sun2|Sun Microsystems Inc. workstation:\
 	:am:km:ms:\
@@ -1252,20 +1433,15 @@ sun-e-s|sun-s-e|Sun Microsystems Workstation with status hacked for emacs:\
 	:hs:\
 	:ds=\E]l\E\\:fs=\E\\:ts=\E]l:tc=sun-e:
 sun-48|Sun 48-line window:\
-	:co#80:li#48:\
-	:tc=sun:
+	:co#80:li#48:\tc=sun:
 sun-34|Sun 34-line window:\
-	:co#80:li#34:\
-	:tc=sun:
+	:co#80:li#34:\tc=sun:
 sun-24|Sun 24-line window:\
-	:co#80:li#24:\
-	:tc=sun:
+	:co#80:li#24:\tc=sun:
 sun-17|Sun 17-line window:\
-	:co#80:li#17:\
-	:tc=sun:
+	:co#80:li#17:\tc=sun:
 sun-12|Sun 12-line window:\
-	:co#80:li#12:\
-	:tc=sun:
+	:co#80:li#12:\tc=sun:
 sun-1|Sun 1-line window for sysline:\
 	:es:hs:\
 	:co#80:li#1:\
@@ -1278,38 +1454,19 @@ sun-c|sun-cmd|Sun Microsystems Workstation console with scrollable history:\
 #### Iris consoles
 #
 
-# (wsiris: this had unknown capabilities
+# (wsiris: this had extension capabilities
 #	:HS=\E7F2:HE=\E7F7:\
 #	:CT#2:CZ=*Bblack,red,green,yellow,blue,magenta,cyan,*Fwhite:
-# I mapped ":pt:" to ":it#8:", removed incorrect ":cl=\Ev:" -- esr)
+# (wsiris: removed incorrect ":cl=\Ev:" -- esr)
 wsiris|iris40|iris emulating a 40 line visual 50 (approximately):\
-	:am:bs:pt:\
+	:am:\
 	:co#80:it#8:li#40:\
 	:al=\EL:cd=\EJ:ce=\EK:cl=\EH\EJ:cm=\EY%+ %+ :dl=\EM:\
 	:ho=\EH:is=\E7B0\E7F7\E7C2\E7R3:k0=\E0:k1=\E1:k2=\E2:\
 	:k3=\E3:k4=\E4:k5=\E5:k6=\E6:k7=\E7:k8=\E8:k9=\E9:\
-	:kd=\EB:kl=\ED:kr=\EC:ku=\EA:nd=\EC:se=\E0@:so=\E9P:\
-	:sr=\EI:ue=\E7R3\E0@:up=\EA:us=\E7R2\E9P:ve=\E>:\
-	:vs=\E;:
-
-#### Masscomp consoles
-#
-
-masscomp2:\
-	:co#64:li#21:\
-	:tc=masscomp:
-masscomp1:\
-	:co#104:li#36:\
-	:tc=masscomp:
-# (masscomp: ":MT:" changed to ":km:"; mapped ":pt:" to ":it#8:" -- esr)
-masscomp:\
-	:bs:km:mi:pt:\
-	:co#80:it#8:li#24:sg#0:\
-	:al=\E[L:cd=\E[J:ce=\E[K:cl=\E[2J:cm=\E[%i%d;%dH:\
-	:dc=\E[P:dl=\E[M:do=\E[B:ei=\E[4l:im=\E[4h:\
-	:is=\EGc\EGb\EGw:kb=^H:kd=\EOB:kl=\EOD:kr=\EOC:\
-	:ku=\EOA:nd=\E[C:se=\E[0m:so=\E[7m:ue=\EGau:up=\E[A:\
-	:us=\EGu:
+	:kd=\EB:kl=\ED:kr=\EC:ku=\EA:le=^H:nd=\EC:se=\E0@:\
+	:so=\E9P:sr=\EI:ta=^I:ue=\E7R3\E0@:up=\EA:\
+	:us=\E7R2\E9P:ve=\E>:vs=\E;:
 
 #### NeWS consoles
 #
@@ -1319,39 +1476,34 @@ masscomp:\
 #
 
 # Entry for NeWS's psterm from Eric Messick & Hugh Daniel
-# (psterm: unknown ":sl=\EOl:el=\ENl:" removed;
-# mapped ":pt:" to ":it#8:" -- esr)
-psterm|psterm-basic|psterm-80x34:\
-	:am:bs:hs:km:pt:ul:\
+# (psterm: unknown ":sl=\EOl:el=\ENl:" removed -- esr)
+psterm|psterm-basic|NeWS psterm-80x34:\
+	:am:bs:hs:km:ul:\
 	:co#80:it#8:li#34:\
 	:al=\EA:cd=\EB:ce=\EC:cl=^L:cm=\E%d;%d;:cs=\EE%d;%d;:\
-	:dc=\EF:dl=\EK:do=\EP:ei=\ENi:fs=\ENl:ho=\ER:im=\EOi:\
-	:is=\EN*:kd=\E[B:kl=\E[D:kr=\E[C:ku=\E[A:le=\ET:\
+	:dc=\EF:dl=\EK:do=\EP:ei=\ENi:fs=\ENl:ho=\ER:i1=\EN*:\
+	:im=\EOi:kd=\E[B:kl=\E[D:kr=\E[C:ku=\E[A:le=\ET:\
 	:ll=\EU:mb=\EOb:md=\EOd:me=\EN*:mr=\EOr:nd=\EV:rc=^\:\
-	:rs=\EN*:sc=^]:se=\ENo:sf=\EW:so=\EOo:sr=\EX:te=\ENt:\
+	:sc=^]:se=\ENo:sf=\EW:so=\EOo:sr=\EX:ta=^I:te=\ENt:\
 	:ti=\EOt:ts=\EOl:ue=\ENu:up=\EY:us=\EOu:vb=\EZ:
-psterm-96x48:\
-	:co#96:li#48:\
-	:tc=psterm:
-psterm-90x28:\
-	:co#90:li#28:\
-	:tc=psterm:
-psterm-80x24:\
-	:co#80:li#24:\
-	:tc=psterm:
+psterm-96x48|NeWS psterm 96x48:\
+	:co#96:li#48:\tc=psterm:
+psterm-90x28|NeWS psterm 90x28:\
+	:co#90:li#28:\tc=psterm:
+psterm-80x24|NeWS psterm 80x24:\
+	:co#80:li#24:\tc=psterm:
 # This is a faster termcap for psterm.  Warning:  if you use this termcap,
 # some control characters you type will do strange things to the screen.
-# (psterm-fast: unknown ":sl=^Ol:el=^Nl:";
-# removed; mapped ":pt:" to ":it#8:" -- esr)
-psterm-fast:\
-	:am:bs:hs:km:pt:ul:\
+# (psterm-fast: unknown ":sl=^Ol:el=^Nl:" -- esr)
+psterm-fast|NeWS psterm fast version (flaky ctrl chars):\
+	:am:bs:hs:km:ul:\
 	:co#80:it#8:li#34:\
 	:al=^A:cd=^B:ce=^C:cl=^L:cm=\004%d;%d;:cs=\005%d;%d;:\
-	:dc=^F:dl=^K:do=^P:ei=^Ni:fs=^Nl:ho=^R:im=^Oi:is=^N*:\
+	:dc=^F:dl=^K:do=^P:ei=^Ni:fs=^Nl:ho=^R:i1=^N*:im=^Oi:\
 	:kd=\E[B:kl=\E[D:kr=\E[C:ku=\E[A:le=^T:ll=^U:mb=^Ob:\
-	:md=^Od:me=^N*:mr=^Or:nd=^V:rc=^\:rs=^N*:sc=^]:\
-	:se=^No:sf=^W:so=^Oo:sr=^X:te=^Nt:ti=^Ot:ts=^Ol:\
-	:ue=^Nu:up=^Y:us=^Ou:vb=^Z:
+	:md=^Od:me=^N*:mr=^Or:nd=^V:rc=^\:sc=^]:se=^No:sf=^W:\
+	:so=^Oo:sr=^X:ta=^I:te=^Nt:ti=^Ot:ts=^Ol:ue=^Nu:\
+	:up=^Y:us=^Ou:vb=^Z:
 
 #### Apollo consoles
 #
@@ -1360,30 +1512,26 @@ psterm-fast:\
 #
 
 # From: Gary Darland <goodmanc@garnet.berkeley.edu>
-apollo:\
-	:am:bs:mi:\
+apollo|apollo console:\
+	:am:mi:\
 	:co#88:li#53:\
-	:al=\EI:cd=\EJ:ce=\EK:ch=\EN%d:cl=^L:cm=\EM%+ %d):\
-	:cv=\EO+ :dc=\EP:dl=\EL:do=\EB:ei=\ER:im=\EQ:nd=\EC:\
-	:se=\ET:sf=\EE:so=\ES:sr=\ED:te=\EX:ti=\EW:ue=\EV:\
-	:up=\EA:us=\EU:
+	:al=\EI:cd=\EJ:ce=\EK:cl=^L:cm=\EM%+ %d):dc=\EP:\
+	:dl=\EL:do=\EB:ei=\ER:im=\EQ:le=^H:nd=\EC:se=\ET:\
+	:sf=\EE:so=\ES:sr=\ED:te=\EX:ti=\EW:ue=\EV:up=\EA:\
+	:us=\EU:
 apollo_15P|apollo 15 inch display:\
-	:dN@:\
 	:tc=vt132:
 apollo_19L|apollo 19 inch display:\
-	:dN@:\
 	:tc=vt132:
 apollo_color|apollo color display:\
-	:dN@:\
 	:tc=vt132:
 
 #### Fortune Systems consoles
 #
 
 # From: Robert Nathanson <c160-3bp@Coral> via tut   Wed Oct 5, 1983
-# (This had unknown capabilities
-#	:rv=\EH:re=\EI:rg=0:\
-#	:GG=0:GV=-:GH=&:GU=%:GD=#:G1=(:G2= :G3=":G4=*:CF=\E]:\
+# (This had extension capabilities
+#	:rv=\EH:re=\EI:rg=0:GG=0:\
 #	:CO=\E\\:WL=^Aa\r:WR=^Ab\r:CL=^Ac\r:CR=^Ad\r:DL=^Ae\r:RF=^Af\r:\
 #	:RC=^Ag\r:CW=^Ah\r:NU=^Aj\r:EN=^Ak\r:HM=^Al:PL=^Am\r:\
 #	:PU=^An\r:PD=^Ao\r:PR=^Ap\r:HP=^A@\r:RT=^Aq\r:TB=\r:CN=\177:MP=\E+F:
@@ -1393,20 +1541,20 @@ apollo_color|apollo color display:\
 # used a Fortune myself, so I know the capabilities of the form ^A[a-z]\r are
 # function keys; thus the "Al" value for HM was certainly an error.  I renamed
 # EN/PD/PU/CO/CF according to the XENIX/TC mappings, but not HM/DL/RF/RC/RT.  
-# I think rv and re are start and end reverse video and rg is a nonexistent
-# "reverse-video-glitch" capability; I have put rv and re in with standard
+# I think :rv: and :re: are start/end reverse video and :rg: is a nonexistent
+# "reverse-video-glitch" capability; I have put :rv: and :re: in with standard
 # names below.  I've removed obsolete ":nl=5^J:" as there is a :do: -- esr)
 fos|fortune|Fortune system:\
-	:am:bs:bw:\
+	:am:bw:\
 	:co#80:li#25:\
 	:ae=^O:al=\034E:as=\Eo:bl=^G:cd=\034Y:ce=^\Z:cl=\014:\
 	:cm=\034C%+ %+ :cr=^M:dc=\034W:dl=\034R:do=\n:ei=:\
 	:ho=\036:ic=\034Q:im=:is=^_..:k1=^Aa\r:k2=^Ab\r:\
 	:k3=^Ac\r:k4=^Ad\r:k5=^Ae\r:k6=^Af\r:k7=^Ag\r:\
-	:k8=^Ah\r:kb=^H:kd=^Ay\r:kh=^A?\r:kl=^Aw\r:kr=^Az\r:\
-	:ku=^Ax\r:le=^H:mb=\EN:me=\EI:mr=\EH:nw=^M^J:se=^\I`:\
-	:sf=^J:so=^\H`:ta=^Z:ue=^\IP:up=\013:us=^\HP:ve=\E\\:\
-	:vi=\E]:vs=\E\072:
+	:k8=^Ah\r:kN=^Ao\r:kP=^An\r:kb=^H:kd=^Ay\r:kh=^A?\r:\
+	:kl=^Aw\r:kr=^Az\r:ku=^Ax\r:le=^H:mb=\EN:me=\EI:\
+	:mr=\EH:nw=^M^J:se=^\I`:sf=^J:so=^\H`:ta=^Z:ue=^\IP:\
+	:up=\013:us=^\HP:ve=\E\\:vi=\E]:vs=\E\072:
 
 ######## COMMON TERMINAL TYPES
 #
@@ -1419,7 +1567,7 @@ fos|fortune|Fortune system:\
 # His comments suggest they were shipped with the system.
 #
 
-# (altos2: had unknown capabilities
+# (altos2: had extension capabilities
 #	:c0=^A`\r:c1=^Aa\r:c2=^Ab\r:c3=^Ac\r:\
 #	:c4=^Ad\r:c5=^Ae\r:c6=^Af\r:c7=^Ag\r:\
 #	:c8=^Ah\r:c9=^Ai\r:cA=^Aj\r:cB=^Ak\r:\
@@ -1434,16 +1582,16 @@ fos|fortune|Fortune system:\
 # :sr: was given as a boolean-- esr)
 altos2|alt2|altos-2|altos II:\
 	:co#80:it#8:li#24:sg#0:\
-	:DL=\E[M:al=\E[L:cd=\E[J:ce=\E[K:cl=\E[;H\E[2J:\
+	:DL=\E[M:al=\E[L:cd=\E[J:ce=\E[K:cl=\E[H\E[2J:\
 	:cm=\E[%i%d;%dH:cr=^M:dc=\E[P:do=\E[1B:ei=:ho=\E[H:\
-	:ic=\E[@:if=/usr/share/lib/tabset/vt100:im=:\
+	:ic=\E[@:if=/usr/share/tabset/vt100:im=:\
 	:is=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:k0=^AI\r:\
 	:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:\
-	:k6=^AE\r:k7=^AF\r:k8=^AG\r:k9=^AH\r:kb=^H:kd=\E[B:\
-	:kh=\E[f:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:nd=\E[1C:\
-	:nw=^M^J:se=\E[m:sf=^J:so=\E[7m:ta=^I:ue=\E[m:\
-	:up=\E[1A:us=\E[4m:
-# (altos3: had unknown capabilities
+	:k6=^AE\r:k7=^AF\r:k8=^AG\r:k9=^AH\r:kD=^AM\r:kb=^H:\
+	:kd=\E[B:kh=\E[f:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:\
+	:nd=\E[1C:nw=^M^J:se=\E[m:sf=^J:so=\E[7m:ta=^I:\
+	:ue=\E[m:up=\E[1A:us=\E[4m:
+# (altos3: had extension capabilities
 #	:c0=^A`\r:c1=^Aa\r:c2=^Ab\r:c3=^Ac\r:\
 #	:c4=^Ad\r:c5=^Ae\r:c6=^Af\r:c7=^Ag\r:\
 #	:c8=^Ah\r:c9=^Ai\r:cA=^Aj\r:cB=^Ak\r:\
@@ -1451,32 +1599,16 @@ altos2|alt2|altos-2|altos II:\
 #	:XU=^Aq\r:XD=^Ar\r:XR=^As\r:XL=^At\r:\
 #	:HL=^AP\r:SP=\E[i:\
 #	:IS=\E[@:DE=\E[P:IL=\E[L:NS=\E[S:PS=\E[T:\
-# 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 -- esr)
-altos3|alt3|altos-3|altos III:\
-	:co#80:it#8:li#24:sg#0:\
-	:DL=\E[M:al=\E[L:cd=\E[J:ce=\E[K:cl=\E[;H\E[2J:\
-	:cm=\E[%i%d;%dH:cr=^M:dc=\E[P:do=\E[1B:ei=:ho=\E[H:\
-	:ic=\E[@:if=/usr/share/lib/tabset/vt100:im=:\
-	:is=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:k0=^AI\r:\
-	:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:\
-	:k6=^AE\r:k7=^AF\r:k8=^AG\r:k9=^AH\r:kb=^H:kd=\E[B:\
-	:kh=\E[f:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:mb=\E[5p:\
-	:me=\E[p:nd=\E[1C:nw=^M^J:se=\E[m:sf=^J:so=\E[7m:\
-	:sr=\EM:ta=^I:ue=\E[m:up=\E[1A:us=\E[4m:
+altos3|altos5|alt3|alt5|altos-3|altos-5|altos III or V:\
+	:mb=\E[5p:me=\E[p:sr=\EM:tc=altos2:
 altos4|alt4|altos-4|altos IV:\
 	:tc=wy50:
-altos5|alt5|altos-5|altos V:\
-	:tc=altos3:
-# (altos7: had unknown capabilities:
-#	:GG#0:GS=\EH^B:GE=\EH^C:\
-#	:G1=3:G2=2:G3=1:G4=5:GD=0:GU==:GH=\072:\
-#	:GV=6:GR=4:GL=9:GC=8:GI=\EH8:GF=\EH7:\
+# (altos7: had extension capabilities:
+#	:GG#0:GI=\EH8:GF=\EH7:\
 #	:c0=^A`\r:c1=^Aa\r:c2=^Ab\r:c3=^Ac\r:\
 #	:c4=^Ad\r:c5=^Ae\r:c6=^Af\r:c7=^Ag\r:\
 #	:c8=^Ah\r:c9=^Ai\r:cA=^Aj\r:cB=^Ak\r:\
 #	:cC=^Al\r:cD=^Am\r:cE=^An\r:cF=^Ao\r:
-#	:PD=\EK:PU=\EJ:PN=\Ed#:PS=\EJ:DL=\ER:\
 # 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 -- esr)
 altos7|alt7|altos VII:\
@@ -1486,9 +1618,9 @@ altos7|alt7|altos VII:\
 	:cr=^M:dc=\EW:do=^J:ei=\Er:ho=^^:im=\Eq:\
 	:is=\E`\072\Ee(\EO\Ee6\Ec41\E~4\Ec21\Eu\E~2:k0=^AI\r:\
 	:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:\
-	:k6=^AE\r:k7=^AF\r:k8=^AG\r:k9=^AH\r:kb=^H:kd=^J:\
-	:kh=^^:kl=^H:kr=^L:ku=^K:le=^H:mb=\EG2:md=\EGt:\
-	:me=\EG0:mh=\EGp:mk=\EG1:mr=\EG4:nd=^L:nw=^M^J:\
+	:k6=^AE\r:k7=^AF\r:k8=^AG\r:k9=^AH\r:kD=^AM\r:kN=\EK:\
+	:kP=\EJ:kb=^H:kd=^J:kh=^^:kl=^H:kr=^L:ku=^K:le=^H:\
+	:md=\EGt:me=\EG0:mh=\EGp:mr=\EG4:nd=^L:nw=^M^J:\
 	:se=\EG0:sf=^J:so=\EG4:sr=\Ej:ta=^I:ue=\EG0:up=^K:\
 	:us=\EG8:
 altos7pc|alt7pc|altos PC VII:\
@@ -1504,18 +1636,16 @@ altos7pc|alt7pc|altos PC VII:\
 #
 
 # Generic HP terminal - this should (hopefully) work on any HP terminal.
-hpgeneric|hewlett-packar|hewlettpackard:\
+hpgeneric|hp|hewlett-packard generic terminal:\
 	:am:da:db:mi:xs:\
 	:co#80:li#24:lm#0:vt#6:\
-	:al=\EL:bl=^G:cd=\EJ:ce=\EK:ch=\E&a%dC:cl=\EH\EJ:\
-	:cm=\E&a%r%dc%dY:cr=^M:ct=\E3:cv=\E&a%dY:dc=\EP:\
-	:dl=\EM:do=^J:ei=\ER:im=\EQ:kb=^H:le=^H:nd=\EC:\
-	:se=\E&d@:sf=^J:so=\E&dJ:st=\E1:ta=^I:ue=\E&d@:\
-	:up=\EA:us=\E&dD:
+	:al=\EL:bl=^G:cd=\EJ:ce=\EK:cl=\EH\EJ:\
+	:cm=\E&a%r%dc%dY:cr=^M:ct=\E3:dc=\EP:dl=\EM:do=^J:\
+	:ei=\ER:im=\EQ:kb=^H:le=^H:nd=\EC:se=\E&d@:sf=^J:\
+	:so=\E&dJ:st=\E1:ta=^I:ue=\E&d@:up=\EA:us=\E&dD:
 
 hp110|hewlett-packard model 110 portable:\
-	:li#16:\
-	:tc=hpgeneric:
+	:li#16:\tc=hpgeneric:
 
 hp+pfk+cr|hp function keys with CR:\
 	:k1=\Ep\r:k2=\Eq\r:k3=\Er\r:k4=\Es\r:k5=\Et\r:\
@@ -1530,25 +1660,26 @@ hp+pfk-cr|hp function keys w/o CR:\
 # user to use those keys as arrow keys rather than as function 
 # keys.
 hp+pfk+arrows|hp alternate arrow definitions:\
-	:k1@:k2@:k3@:k4@:k5@:k6@:k7@:k8@:kd=\Ew\r:kh=\Ep\r:\
-	:kl=\Eu\r:kr=\Ev\r:ku=\Et\r:
+	:k1@:k2@:k3@:k4@:k5@:k6@:k7@:k8@:kH=\Eq\r:kd=\Ew\r:\
+	:kh=\Ep\r:kl=\Eu\r:kr=\Ev\r:ku=\Et\r:
 
 hp+arrows|hp arrow definitions:\
-	:kd=\EB:kh=\Eh:kl=\ED:kr=\EC:ku=\EA:
+	:kH=\EF:kd=\EB:kh=\Eh:kl=\ED:kr=\EC:ku=\EA:
 
 # Generic stuff from the HP 262x series
 #
 hp262x|HP 262x terminals:\
 	:xs:\
-	:cd=\EJ:dc=\EP:ip=:kd=\EB:ke=\E&s0A:kh=\Eh:kl=\ED:\
-	:kr=\EC:ks=\E&s1A:ku=\EA:mb=\E&dA:me=\E&d@:mk=\E&dS:\
-	:mr=\E&dB:\
+	:cd=\EJ:dc=\EP:ip=:kD=\EP:kI=\EQ:kN=\EU:kP=\EV:\
+	:kd=\EB:ke=\E&s0A:kh=\Eh:kl=\ED:kr=\EC:ks=\E&s1A:\
+	:ku=\EA:mb=\E&dA:me=\E&d@:mr=\E&dB:\
 	:..sa=\E&d%'@'%?%p1%t%'B'%|%;%?%p2%t%'D'%|%;%?%p3%t%'B'%|%;%?%p4%t%'A'%|%;%c:\
 	:se=\E&d@:sf=\ES:so=\E&dB:ta=\011:ue=\E&d@:us=\E&dD:
-# Note: no "home" on HP's since that homes to top of memory, not screen.
+
+# Note: no <home> on HP's 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!
+# 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 
@@ -1564,15 +1695,11 @@ hp262x|HP 262x terminals:\
 hp2621-ba|2621-ba|2621 w/new rom and strap A set:\
 	:ke@:ks@:tc=hp+arrows:tc=hp2621:
 
-# 2621 with function labels. Most of the time they are off,
+# hp2621 with function labels. Most of the time they are off,
 # but inside vi, the function key labels appear. You have to
 # hold down shift to get them to xmit.
 hp2621|hp2621a|hp2621A|2621|2621a|2621A|hp2621-wl|2621-wl|hp 2621 w/labels:\
 	:is=\E&jA\r:ke=\E&jA:tc=hp2621-fl:
-
-# 2621 with function labels.  Most of the time they are off,
-# but inside vi, the function key labels appear.  You have to
-# hold down shift to get them to xmit.
 hp2621-fl|2621-fl|hp 2621:\
 	:xo:xs@:\
 	:pb#19200:\
@@ -1582,7 +1709,7 @@ hp2621-fl|2621-fl|hp 2621:\
 
 # To use 2621p printer, setenv TERM=2621p, PRINTER=2612p
 hp2621p|2621p|2621P|hp 2621 with printer:\
-	:pf=\E&p13C:po=\E&p11C:tc=hp2621:
+	:tc=hp2621:
 
 hp2621p-a|2621p-a|hp2621p with fn as arrows:\
 	:tc=hp+pfk+arrows:tc=hp2621p:
@@ -1592,17 +1719,20 @@ hp2621-k45|hp2621k45|2621k45|k45|hp 2621 with 45 keyboard:\
 	:kb=^H:kd=\EB:ke=\E&s0A:kh=\Eh:kl=\ED:kr=\EC:\
 	:ks=\E&s1A:ku=\EA:tc=hp2621:
 
-# 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
-# software to support it.
-hp2645|hp45|HP 2645 series:\
-	:pb#9600:\
-	:cr=\r:kd=\EB:ke=\E&s0A:kh=\Eh:kl=\ED:kr=\EC:\
-	:ks=\E&s1A:ku=\EA:mb=\E&dA:me=\E&d@:mh=\E&dH:\
-	:mr=\E&dB:\
-	:..sa=\E&d%'@'%?%p1%t%'B'%|%;%?%p2%t%'D'%|%;%?%p3%t%'B'%|%;%?%p4%t%'A'%|%;%?%p5%t%'H'%|%;%?%p6%t%'B'%|%;%c:\
-	:us=\E&dD:tc=hpgeneric:
+# 2621 using all 48 lines of memory, only 24 visible at any time.  
+hp2621-48|48 line 2621:\
+	:li#48:\
+	:cm=\E&a%r%dc%dR:ho=\EH:tc=hp2621:
+
+# 2621 with no labels ever. Also prevents vi delays on escape.
+hp2621-nl|hp 2621 with no labels:\
+	:kd@:ke@:kh@:kl@:kr@:ks@:ku@:tc=hp2621-fl:
+
+# Needed for UCB ARPAVAX console, since lsi-11 expands tabs 
+# (wrong).
+#
+hp2621-nt|hp 2621 w/no tabs:\
+	:ta@:tc=hp2621:
 
 # Hp 2624 B with 4 or 10 pages of memory.
 # 
@@ -1620,13 +1750,13 @@ hp2645|hp45|HP 2645 series:\
 # 	XmitFnctn(A)=No
 # 	InhEolWrp=No
 # 
-# Note: the 2624 DOES have a true "home," believe it or not!
+# Note: the 2624 DOES have a true <home>, believe it or not!
 # 
 # The 2624 has an "error line" to which messages can be sent. 
 # This is CLOSE to what is expected for a "status line". However,
 # after a message is sent to the "error line", the next carriage 
 # return is EATEN and the "error line" is turned back off again! 
-# So I guess we can't define hs, eslok, wsl, dsl, fsl, tsl
+# So I guess we can't define <hs>, <eslok>, <wsl>, <dsl>, <fsl>, <tsl>.
 # 
 # This entry supports emacs (and any other program that uses raw 
 # mode) at 4800 baud and less. I couldn't get the padding right 
@@ -1637,19 +1767,6 @@ hp2624|hp2624a|hp2624b|hp2624b-4p|2624-4p|2624|2624a|2624b|Hewlett Packard 2624
 	:lm#96:\
 	:vb=\E&w13F\200\200\200\200\E&w12F\200\200\200\200\E&w13F\200\200\200\200\E&w12F:tc=hp+labels:tc=scrhp:
 
-# These attributes are not set above:
-# 
-# civis, cmdch, cnorm, csr, cub, cud, cuf, cuu, cvvis, dch, dl, 
-# ech, eo, eslok, fsl, gn, hc, hd, hu, hz, ich, ich1, if, il, in,
-# indn, iprog, is2, is3, it, ka1, ka3, kb2, kc1, kc3, kclr, kf0, 
-# kf10, khts, km, ktbc, lf0, lf1, lf10, lf2, lf3, lf4, lf5, lf6, 
-# lf7, lf8, lf9, mc5p, os, pad, pfkey*, pfloc*, pfx*, prot, rc, 
-# rep, rin, rmcup, rmdc, rmm, rs2, rs3, sc, smcup, smdc, smm, tsl,
-# uc, ul, vt, wind, wsl, xenl, xmc, xsb, xt
-# 
-# not needed if tset is used:
-# 	if=/usr/share/tabset/std,
-# 
 # This hp2626 entry does not use any of the fancy windowing stuff 
 # of the 2626.
 # 
@@ -1690,27 +1807,35 @@ hp2626-s|2626-s|hp 2626 using only 23 lines:\
 	:i1=\E&q3t0{0H \E&w0f115n1I \E&w0f1n2I\n\E&w2f1i0d0u22l0S \E&w2f2i0d23u23l0S \E&w7f2p1I \r:\
 	:ts=\E&w7f2p2I\E&w4f2I\r\EK\E&a%p1%dC:tc=hp2626:
 # Force terminal back to 24 lines after being 23.
-#
 hp2626-ns|2626-ns|hp 2626 using all 24 lines:\
 	:i1=\E&q3t0{0H \E&w0f118n1I \E&w0f1n2I\n\E&w2f1i0d0u23l0S \E&w3f2I \E&w7f2p1I \r:tc=hp2626:
 # Various entries useful for small windows on 2626.
-#
-hp2626-12|2626-12:\
-	:li#12:\
-	:tc=hp2626:
-hp2626-12x40|2626-12x40:\
-	:co#40:li#12:\
-	:tc=hp2626:
-hp2626-x40|2626-x40:\
-	:co#40:\
-	:tc=hp2626:
-hp2626-12-s|2626-12-s:\
-	:li#11:\
-	:tc=hp2626-s:
-# You should use this terminal at 4800 baud or less.
-#
-hp2648|hp2648a|2648a|2648A|2648|HP 2648a graphics terminal:\
-	:cl=\EH\EJ:cm=\E&a%r%dc%dY:dc=\EP:ip=:tc=hp2645:
+hp2626-12|2626-12|hewlett-packard 2626 12 lines:\
+	:li#12:\tc=hp2626:
+hp2626-12x40|2626-12x40|hewlett-packard 2626 12 lines 40 columns:\
+	:co#40:li#12:\tc=hp2626:
+hp2626-x40|2626-x40|hewlett-packard 2626 40 columns:\
+	:co#40:\tc=hp2626:
+hp2626-12-s|2626-12-s|hewlett-packard 2626 11 lines plus status:\
+	:li#11:\tc=hp2626-s:
+
+#
+# hp2627 color tubes from University of Wisconsin
+#
+hp2627a-rev|hp 2627 with reverse video colors:\
+	:cr=^M:do=^J:\
+	:is=\E&v0m1a0b0c1x1y1z1i0a0b1c1x1y1z0i0S\E&j@\r\E3\r:\
+	:kb=^H:kd=^J:kl=^H:nw=^M^J:sf=^J:ta=^I:\
+	:ue=\E&v0S\E&d@:us=\E&dD\E&v1S:tc=hp2621-nl:
+hp2627a|2627|hp 2627 color terminal with no labels:\
+	:cr=^M:do=^J:\
+	:is=\E&v0m1a1b0c1i0a1b1c2i1a0b0c0i0S\E&j@\r\E3\r:\
+	:kb=^H:kd=^J:kl=^H:nw=^M^J:se=\E&v0S:sf=^J:so=\E&v2S:\
+	:ta=^I:ue=\E&v0S\E&d@:us=\E&dD\E&v1S:tc=hp2621-nl:
+hp2627c|hp 2627 color (cyan) terminal with no labels:\
+	:cr=^M:do=^J:\
+	:is=\E&v0m1a0b0c2i1a1b0c1i0a1b1c0i0S\E&j@\r\E3\r:\
+	:kb=^H:kd=^J:kl=^H:nw=^M^J:sf=^J:ta=^I:tc=hp2627a:
 
 # 2640a doesn't have the Y cursor addressing feature, and C is 
 # memory relative instead of screen relative, as we need.
@@ -1721,22 +1846,20 @@ hp2640a|2640a|hp 2640a:\
 hp2640b|hp2644a|hp 264x series:\
 	:ke@:ks@:tc=hp2645:
 
-# 2621 using all 48 lines of memory, only 24 visible at any time.  
-#
-hp2621-48|48 line 2621:\
-	:li#48:\
-	:cm=\E&a%r%dc%dR:cv=\E&a%dR:ho=\EH:tc=hp2621:
-
-# 2621 with no labels ever. Also prevents vi delays on escape.
-#
-hp2621-nl|hp 2621 with no labels:\
-	:kd@:ke@:kh@:kl@:kr@:ks@:ku@:tc=hp2621-fl:
-
-# Needed for UCB ARPAVAX console, since lsi-11 expands tabs 
-# (wrong).
-#
-hp2621-nt|hp 2621 w/no tabs:\
-	:ta@:tc=hp2621:
+# 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
+# software to support it.
+hp2645|hp45|HP 2645 series:\
+	:pb#9600:\
+	:cr=\r:kD=\EP:kI=\EQ:kN=\EU:kP=\EV:kd=\EB:ke=\E&s0A:\
+	:kh=\Eh:kl=\ED:kr=\EC:ks=\E&s1A:ku=\EA:mb=\E&dA:\
+	:me=\E&d@:mh=\E&dH:mr=\E&dB:\
+	:..sa=\E&d%'@'%?%p1%t%'B'%|%;%?%p2%t%'D'%|%;%?%p3%t%'B'%|%;%?%p4%t%'A'%|%;%?%p5%t%'H'%|%;%?%p6%t%'B'%|%;%c:\
+	:us=\E&dD:tc=hpgeneric:
+# You should use this terminal at 4800 baud or less.
+hp2648|hp2648a|2648a|2648A|2648|HP 2648a graphics terminal:\
+	:cl=\EH\EJ:cm=\E&a%r%dc%dY:dc=\EP:ip=:tc=hp2645:
 
 # The HP 150 terminal is a fairly vanilla HP terminal, with the 
 # clreol standout problem. It also has graphics capabilities and 
@@ -1759,8 +1882,8 @@ hp2621-a|hp2621a-a|2621-a|hp2621 with fn as arrows:\
 # newer hewlett packard terminals
 
 newhpkeyboard|generic entry for HP extended keyboard:\
-	:kb=^H:kd=\EB:ke=\E&s0A:kh=\Eh:kl=\ED:kr=\EC:\
-	:ks=\E&s1A:ku=\EA:tc=hp+pfk-cr:
+	:kD=\EP:kH=\EF:kI=\EQ:kN=\EU:kP=\EV:kb=^H:kd=\EB:\
+	:ke=\E&s0A:kh=\Eh:kl=\ED:kr=\EC:ks=\E&s1A:ku=\EA:tc=hp+pfk-cr:
 
 newhp|generic entry for new hewlett packard terminals:\
 	:am:bw:mi:xo:xs:\
@@ -1768,7 +1891,7 @@ newhp|generic entry for new hewlett packard terminals:\
 	:ae=^O:al=\EL:as=^N:bl=^G:bt=\Ei:cd=\EJ:ce=\EK:cr=^M:\
 	:ct=\E3:dc=\EP:dl=\EM:do=^J:ei=\ER:i1=\E&jB:im=\EQ:\
 	:ip=:le=^H:mb=\E&dA:md=\E&dF:me=\E&d@\017:mh=\E&dH:\
-	:mk=\E&dS:mr=\E&dB:nd=\EC:nw=^M^J:\
+	:mr=\E&dB:nd=\EC:nw=^M^J:\
 	:..sa=\E&d%{0}%Pa%?%p4%t%{1}%ga%+%Pa%;%?%p1%p3%|%p6%|%t%{2}%ga%+%Pa%;%?%p2%p6%|%t%{4}%ga%+%Pa%;%?%p1%p5%|%t%{8}%ga%+%Pa%;%?%p7%t%?%ga%ts%ga%'@'%+%e%'S'%;%e%?%ga%t%ga%'@'%+%e%'@'%;%;%c%?%p9%t\016%e\017%;:\
 	:se=\E&d@:sf=^J:so=\E&dJ:sr=\ET:st=\E1:ta=\011:\
 	:ue=\E&d@:up=\EA:us=\E&dD:tc=newhpkeyboard:
@@ -1776,19 +1899,19 @@ newhp|generic entry for new hewlett packard terminals:\
 memhp|memory relative addressing for new HP ttys:\
 	:vt#6:\
 	:CM=\E&a%p1%dr%p2%dC:DO=\E&a+%dR:LE=\E&a-%dC:\
-	:RI=\E&a+%dC:UP=\E&a-%dR:ch=\E&a%dC:cl=\EH\EJ:\
-	:cm=\E&a%dr%dC:cv=\E&a%dR:ho=\EH:ll=\E&a23R\r:tc=newhp:
+	:RI=\E&a+%dC:UP=\E&a-%dR:cl=\EH\EJ:cm=\E&a%dr%dC:\
+	:ho=\EH:ll=\E&a23R\r:tc=newhp:
 
 scrhp|screen relative addressing for new HP ttys:\
 	:CM=\E&a%p1%dr%p2%dC:DO=\E&a+%dR:LE=\E&a-%dC:\
-	:RI=\E&a+%dC:UP=\E&a-%dR:ch=\E&a%dC:cl=\E&a0c0Y\EJ:\
-	:cm=\E&a%dy%dC:cv=\E&a%dY:ho=\E&a0y0C:ll=\E&a0y0C\EA:tc=newhp:
+	:RI=\E&a+%dC:UP=\E&a-%dR:cl=\E&a0c0Y\EJ:\
+	:cm=\E&a%dy%dC:ho=\E&a0y0C:ll=\E&a0y0C\EA:tc=newhp:
 
 hp+labels|"standard" label info for new HP ttys:\
 	:
 
-hp+printer| "standard" printer info for HP ttys:\
-	:ff=\E&p4u0C:pf=\E&p13C:po=\E&p11C:ps=\EH\E&p4dF:
+hp+printer|"standard" printer info for HP ttys:\
+	:ff=\E&p4u0C:
 
 
 # The new hp2621b is kind of a cross between the old 2621 and the
@@ -1797,7 +1920,7 @@ hp+printer| "standard" printer info for HP ttys:\
 # length label, the following character is eaten!
 hp2621b|2621b|hp 2621b with old style keyboard:\
 	:lm#48:\
-	:kd=\EB:kh=\Eh:kl=\ED:kr=\EC:ku=\EA:tc=hp2621:
+	:kH=\EF:kd=\EB:kh=\Eh:kl=\ED:kr=\EC:ku=\EA:tc=hp2621:
 
 hp2621b-p|2621b-p|hp 2621b with printer:\
 	:tc=hp+printer:tc=hp2621b:
@@ -1832,26 +1955,21 @@ hp2622|hp2622a|2622|2622a|hp 2622:\
 hp2623|hp2623a|2623|2623a|hp 2623:\
 	:tc=hp2622:
 
-
 hp2624b-p|hp2624b-4p-p|hewlett packard 2624 B with printer:\
 	:tc=hp+printer:tc=hp2624:
 
-# The hewlett packard B can have an optional extra 6 pages of 
-# memory.
+# 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:\
-	:lm#240:\
-	:tc=hp2624:
+	:lm#240:\tc=hp2624:
 
 hp2624b-10p-p|hewlett packard 2624 B w/ extra memory & printer:\
-	:lm#240:\
-	:tc=hp2624b-p:
+	:lm#240:\tc=hp2624b-p:
 
 # Color manipulations for HP terminals
-
 hp+color|hp with colors:\
 	:
 
-# is2 set screen to be 80 columns wide
+# <is2> sets the screen to be 80 columns wide
 hp2397a|2397a|hp2397|2397|hewlett packard 2397A color terminal:\
 	:is=\E&w6f80X:tc=memhp:tc=hp+labels:tc=hp+color:
 
@@ -1865,10 +1983,9 @@ hp2397a|2397a|hp2397|2397|hewlett packard 2397A color terminal:\
 # Keycode Mode 		NO   or YES (sc)
 # Backspace Key		BS or BS/DEL
 #
-# is2	sets pcterm; autowrap; 25 lines; pc char set; prog DEL key; \E\\?
-# does not turn off keycode mode
-# smsc	sets alternate start/stop; keycode on
-#
+# <is2> 	sets pcterm; autowrap; 25 lines; pc char set; prog DEL key; 
+# \E\\? does not turn off keycode mode
+# <smsc>	sets alternate start/stop; keycode on
 hpansi|hp700|hewlett packard 700/44 in HP-PCterm mode:\
 	:am:eo:xn:xo:\
 	:co#80:li#25:\
@@ -1877,143 +1994,132 @@ hpansi|hp700|hewlett packard 700/44 in HP-PCterm mode:\
 	:ho=\E[H:ic=\E[@:im=:\
 	:is=\E[44"p\E[?7h\E[>10h\E[>12h\EP1;1|3/7F\E\\:\
 	:k1=\E[17~:k2=\E[18~:k3=\E[19~:k4=\E[20~:k5=\E[21~:\
-	:k6=\E[23~:k7=\E[24~:k8=\E[25~:k9=\E[26~:kb=^H:\
-	:kd=\E[B:kh=\E[1~:kl=\E[D:kr=\E[C:ku=\E[A:le=\E[D:\
-	:nd=\E[C:se=\E[m:sf=^J:so=\E[7m:ta=^I:ue=\E[m:\
-	:up=\E[A:us=\E[4m:ve=\E[?25h:vi=\E[?25l:
+	:k6=\E[23~:k7=\E[24~:k8=\E[25~:k9=\E[26~:kN=\E[6~:\
+	:kP=\E[5~:kb=^H:kd=\E[B:kh=\E[1~:kl=\E[D:kr=\E[C:\
+	:ku=\E[A:le=\E[D:nd=\E[C:se=\E[m:sf=^J:so=\E[7m:\
+	:ta=^I:ue=\E[m:up=\E[A:us=\E[4m:ve=\E[?25h:\
+	:vi=\E[?25l:
 #
 hp2392|2392|2393|239x series:\
 	:co#80:\
-	:bt=\Ei:cm=\E&a%dy%dC:cv=\E&a%dY:im=\EQ:k1=\Ep\r:\
-	:k2=\Eq\r:k3=\Er\r:k4=\Es\r:k5=\Et\r:k6=\Eu\r:\
-	:k7=\Ev\r:k8=\Ew\r:kh=\Eh:ue=\E&d@:us=\E&dD:tc=hpsub:
-
-2392nam|hp2392nam|HP 239x series with no auto margins:\
-	:am@:\
-	:tc=hp2392:
+	:bt=\Ei:cm=\E&a%dy%dC:im=\EQ:k1=\Ep\r:k2=\Eq\r:\
+	:k3=\Er\r:k4=\Es\r:k5=\Et\r:k6=\Eu\r:k7=\Ev\r:\
+	:k8=\Ew\r:kN=\Eu:kP=\Ev:kh=\Eh:ue=\E&d@:us=\E&dD:tc=hpsub:
 
 hpsub|hp terminals -- capability subset:\
 	:am:da:db:mi:xo:xs:\
 	:li#24:\
-	:al=\EL:bl=^G:cd=\EJ:ce=\EK:ch=\E&a%dC:cl=\EH\EJ:\
-	:cr=^M:dc=\EP:dl=\EM:do=\EB:ei=\ER:\
-	:if=/usr/share/tabset/stdcrt:is=\E&s1A\E<\E&k0\\:kb=^H:\
-	:kd=\EB:ke=\E&s0A:kh=\Eh:kl=\ED:kr=\EC:ks=\E&s1A:\
-	:ku=\EA:le=^H:nd=\EC:se=\E&d@:sf=^J:so=\E&dB:ta=^I:\
-	:up=\EA:
+	:al=\EL:bl=^G:cd=\EJ:ce=\EK:cl=\EH\EJ:cr=^M:dc=\EP:\
+	:dl=\EM:do=\EB:ei=\ER:if=/usr/share/tabset/stdcrt:\
+	:is=\E&s1A\E<\E&k0\\:kb=^H:kd=\EB:ke=\E&s0A:kh=\Eh:\
+	:kl=\ED:kr=\EC:ks=\E&s1A:ku=\EA:le=^H:nd=\EC:\
+	:se=\E&d@:sf=^J:so=\E&dB:ta=^I:up=\EA:
+
+# 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.  
+# 	Adds xy-cursor addressing, vertical cursor addressing, home, 
+# last line, and underline capabilities.
+#
+# (hpex: removed memory-lock capabilities ":ml=\El:mu=\Em:" -- esr)
+hpex|hp extended capabilites:\
+	:cm=\E&a%dy%dC:cr=^M:do=^J:im=\EQ:kb=^H:kd=^J:kl=^H:\
+	:nw=^M^J:sf=^J:ta=^I:ue=\E&d@:us=\E&dD:tc=hpsub:
 
 # HP 236 console
 # From: <ddavis@ic.berkeley.edu>
 hp236|hp236 internal terminal emulator:\
-	:am:bs:\
+	:am:\
 	:co#80:li#24:\
 	:al=\EG:ce=\EK:cl=\EF:cm=\EE%+ %+ :dc=\EJ:dl=\EH:ei=:\
-	:ic=\EI:im=:se=\ECI:so=\EBI:up=^K:ve=\EDE:vs=\EDB:
+	:ic=\EI:im=:le=^H:se=\ECI:so=\EBI:up=^K:ve=\EDE:\
+	:vs=\EDB:
 
 # This works on a hp300 console running Utah 4.3 BSD
 # From: Craig Leres <leres@okeeffe.berkeley.edu>
 hp300h|HP Catseye console:\
-	:am:bs:da:db:mi:xs:\
+	:am:da:db:mi:xs:\
 	:co#128:li#51:lm#0:sg#0:\
-	:al=\EL:bl=^G:bt=\Ei:cd=\EJ:ce=\EK:ch=\E&a%dC:\
-	:cl=\E&a0y0C\EJ:cm=\E&a%dy%dC:cr=^M:ct=\E3:\
-	:cv=\E&a%dY:dc=\EP:dl=\EM:do=\EB:ei=\ER:\
-	:if=/usr/share/tabset/stdcrt:im=\EQ:kb=^H:kd=\EB:\
-	:ke=\E&s0A:kh=\Eh:kl=\ED:kr=\EC:ks=\E&s1A:ku=\EA:\
-	:le=^H:me=\E&d@:nd=\EC:se=\E&d@:sf=^J:so=\E&dB:ta=^I:\
-	:ue=\E&d@:up=\EA:us=\E&dD:
+	:al=\EL:bl=^G:bt=\Ei:cd=\EJ:ce=\EK:cl=\E&a0y0C\EJ:\
+	:cm=\E&a%dy%dC:cr=^M:ct=\E3:dc=\EP:dl=\EM:do=\EB:\
+	:ei=\ER:if=/usr/share/tabset/stdcrt:im=\EQ:kb=^H:\
+	:kd=\EB:ke=\E&s0A:kh=\Eh:kl=\ED:kr=\EC:ks=\E&s1A:\
+	:ku=\EA:le=^H:me=\E&d@:nd=\EC:se=\E&d@:sf=^J:\
+	:so=\E&dB:ta=^I:ue=\E&d@:up=\EA:us=\E&dD:
 # From: Greg Couch <gregc@ernie.berkeley.edu>
-# (hp9837: removed obsolete ":ko=ce,cd,al,im,dl,dc:";
-# mapped ":pt:" to ":it#8:" -- esr)
 hp9837|hp98720|hp98721|HP 9000/300 workstations:\
-	:am:bs:da:db:mi:pt:xs:\
+	:am:da:db:mi:xs:\
 	:co#128:it#8:li#46:lm#0:\
-	:al=\EL:bl=^G:bt=\Ei:cd=\EJ:ce=\EK:ch=\E&a%dC:\
-	:cl=\E&a0y0C\EJ:cm=\E&a%dy%dC:ct=\E3:cv=\E&a%dY:\
-	:dc=\EP:dl=\EM:do=\EB:ei=\ER:im=\EQ:is=\E&v0m1b0i&j@:\
+	:al=\EL:bl=^G:bt=\Ei:cd=\EJ:ce=\EK:cl=\E&a0y0C\EJ:\
+	:cm=\E&a%dy%dC:ct=\E3:dc=\EP:dl=\EM:do=\EB:ei=\ER:\
+	:im=\EQ:is=\E&v0m1b0i&j@:kD=\EP:kI=\EQ:kN=\EU:kP=\EV:\
 	:kb=^H:kd=\EB:ke=\E&s0A:kh=\Eh:kl=\ED:kr=\EC:\
 	:ks=\E&s1A:ku=\EA:le=^H:me=\E&d@:nd=\EC:se=\E&v0S:\
-	:sf=^J:so=\E&v5S:st=\E1:ue=\E&d@:up=\EA:us=\E&dD:
+	:sf=^J:so=\E&v5S:st=\E1:ta=^I:ue=\E&d@:up=\EA:\
+	:us=\E&dD:
 # From: Charles A. Finnell of MITRE <finnell@mitre.org>, developed 07SEP90
-# (hp98550: removed obsolete ":kn#12:ko=al,cd,ce,ct,dc,dl,do,ei,im,nd,st,up:";
-# mapped ":pt:" to ":it#8:" -- esr)
 hp98550|hp98550a|HP 9000 Series 300 color console:\
-	:am:bs:da:db:mi:pt:xs:\
+	:am:da:db:mi:xs:\
 	:co#128:it#8:li#49:lm#0:\
 	:ae=^O:al=\EL:as=^N:bl=^G:bt=\Ei:cd=\EJ:ce=\EK:\
-	:ch=\E&a%dC:cl=\EH\EJ:cm=\E&a%dy%dC:cr=^M:ct=\E3:\
-	:cv=\E&a%dY:dc=\EP:dl=\EM:do=^J:ei=\ER:\
-	:if=/usr/share/tabset/9837:im=\EQ:k1=\Ep:k2=\Eq:\
-	:k3=\Er:k4=\Es:k5=\Et:k6=\Eu:k7=\Ev:k8=\Ew:kb=^H:\
+	:cl=\EH\EJ:cm=\E&a%dy%dC:cr=^M:ct=\E3:dc=\EP:dl=\EM:\
+	:do=^J:ei=\ER:if=/usr/share/tabset/9837:im=\EQ:\
+	:k1=\Ep:k2=\Eq:k3=\Er:k4=\Es:k5=\Et:k6=\Eu:k7=\Ev:\
+	:k8=\Ew:kD=\EP:kH=\EF:kI=\EQ:kN=\EU:kP=\EV:kb=^H:\
 	:kd=\EB:ke=\E&s0A:kh=\Eh:kl=\ED:kr=\EC:ks=\E&s1A:\
 	:ku=\EA:le=^H:mb=\E&dA:md=\E&dJ:me=\E&d@:mh=\E&dH:\
-	:mk=\E&ds:mr=\E&dJ:nd=\EC:se=\E&d@:sf=^J:so=\E&dJ:\
-	:st=\E1:ta=^I:ue=\E&d@:up=\EA:us=\E&dD:ve=\E*dQ:\
-	:vi=\E*dR:
+	:mr=\E&dJ:nd=\EC:se=\E&d@:sf=^J:so=\E&dJ:st=\E1:\
+	:ta=^I:ue=\E&d@:up=\EA:us=\E&dD:ve=\E*dQ:vi=\E*dR:
 # From: Victor Duchovni <vic@fine.princeton.edu>
-# (hp700-wy: removed obsolete ":ko=cl,ho,ce,bt,ta,im,ei,ce,cd:nl=^J:";
-# mapped ":pt:" to ":it#8:" -- esr)
+# (hp700-wy: removed obsolete ":nl=^J:" -- esr)
 hp700-wy|HP700/41 emulating wyse30:\
-	:am:bs:bw:mi:ms:pt:\
+	:am:bw:mi:ms:\
 	:co#80:it#8:li#24:sg#1:ug#1:\
-	:al=0.7*\EE:bl=^G:bt=\EI:cd=\EY:ce=10\ET:cl=^Z:\
-	:cm=\E=%+ %+ :cr=^M:ct=\E0:cv=\E[%+ :dc=\EW:dl=\ER:\
-	:do=^V:ei=\Er:ho=^^:if=/usr/share/tabset/hp700-wy:\
-	:im=\Eq:is=\E~"\EC\Er\E(\EG0\003\E`9\E`1:kb=\177:\
+	:al=0.7*\EE:bt=\EI:cd=\EY:ce=10\ET:cl=^Z:\
+	:cm=\E=%+ %+ :cr=^M:ct=\E0:dc=\EW:dl=\ER:do=^V:\
+	:ei=\Er:ho=^^:i1=\E~"\EC\Er\E(\EG0\003\E`9\E`1:\
+	:if=/usr/share/tabset/hp700-wy:im=\Eq:kI=\Eq:kb=\177:\
 	:kd=^V:kh=^^:kl=^H:kr=^L:ku=^K:le=^H:ll=^^^K:nd=^L:\
-	:rs=\E~"\EC\Er\E(\EG0\003\E`9\E`1:se=10\EG0:\
-	:so=10\EG4:sr=\Ej:st=\E1:ue=10\EG0:up=^K:us=10\EG8:
-hp70092|70092a|70092A|hp70092a|hp70092A|HP 70092:\
+	:se=10\EG0:so=10\EG4:sr=\Ej:ta=\011\nhts=\E1:\
+	:ue=10\EG0:up=^K:us=10\EG8:
+hp70092|70092a|70092A|hp70092a|hp70092A|HP 700/92:\
 	:am:da:db:xs:\
 	:co#80:li#24:lm#0:\
-	:ae=^O:al=\EL:as=^N:bl=^G:bt=\Ei:ce=\EK:ch=\E&a%dC:\
-	:cl=\E&a0y0C\EJ:cm=\E&a%dy%dC:cr=^M:ct=\E3:\
-	:cv=\E&a%dY:dc=\EP:dl=\EM:do=\EB:ei=\ER:im=\EQ:\
-	:k1=\Ep:k2=\Eq:k3=\Er:k4=\Es:k5=\Et:k6=\Eu:k7=\Ev:\
-	:k8=\Ew:kb=^H:kd=\EB:ke=\E&s0A:kh=\Eh:kl=\ED:kr=\EC:\
-	:ks=\E&s1A:ku=\EA:le=^H:mb=\E&dA:md=\E&dB:me=\E&d@:\
-	:mh=\E&dH:mr=\E&dB:nd=\EC:se=\E&d@:so=\E&dJ:sr=\ET:\
-	:st=\E1:ta=^I:ue=\E&d@:up=\EA:us=\E&dD:
+	:ae=^O:al=\EL:as=^N:bl=^G:bt=\Ei:ce=\EK:\
+	:cl=\E&a0y0C\EJ:cm=\E&a%dy%dC:cr=^M:ct=\E3:dc=\EP:\
+	:dl=\EM:do=\EB:ei=\ER:im=\EQ:k1=\Ep:k2=\Eq:k3=\Er:\
+	:k4=\Es:k5=\Et:k6=\Eu:k7=\Ev:k8=\Ew:kD=\EP:kH=\EF:\
+	:kI=\EQ:kN=\EU:kP=\EV:kb=^H:kd=\EB:ke=\E&s0A:kh=\Eh:\
+	:kl=\ED:kr=\EC:ks=\E&s1A:ku=\EA:le=^H:mb=\E&dA:\
+	:md=\E&dB:me=\E&d@:mh=\E&dH:mr=\E&dB:nd=\EC:se=\E&d@:\
+	:so=\E&dJ:sr=\ET:st=\E1:ta=^I:ue=\E&d@:up=\EA:\
+	:us=\E&dD:
 
 bobcat|sbobcat|HP 9000 model 300 console:\
 	:am:da:db:mi:xs:\
 	:co#128:it#8:li#47:sg#0:\
-	:al=10*\EL:bt=\Ei:cd=\EJ:ce=\EK:ch=6\E&a%dC:\
-	:cl=\EH\EJ:cm=6\E&a%dy%dC:cr=^M:cv=6\E&a%dY:dc=\EP:\
-	:dl=10*\EM:do=\EB:ei=\ER:im=\EQ:kb=^H:kd=\EB:\
-	:ke=\E&s0A:kh=\Eh:kl=\ED:kr=\EC:ks=\E&s1A:ku=\EA:\
-	:le=^H:nd=\EC:nw=^M^J:se=\E&d@:sf=^J:so=\E&dB:ta=^I:\
-	:ue=\E&d@:up=\EA:us=\E&dD:
+	:al=10*\EL:bt=\Ei:cd=\EJ:ce=\EK:cl=\EH\EJ:\
+	:cm=6\E&a%dy%dC:cr=^M:dc=\EP:dl=10*\EM:do=\EB:ei=\ER:\
+	:im=\EQ:kb=^H:kd=\EB:ke=\E&s0A:kh=\Eh:kl=\ED:kr=\EC:\
+	:ks=\E&s1A:ku=\EA:le=^H:nd=\EC:nw=^M^J:se=\E&d@:\
+	:sf=^J:so=\E&dB:ta=^I:ue=\E&d@:up=\EA:us=\E&dD:
 gator-t|HP 9000 model 237 emulating extra-tall AAA:\
-	:bw:km:mi:ul:\
-	:co#128:it#8:li#94:\
-	:AL=1*\E[%dL:DC=4\E[%dP:DL=1*\E[%dM:IC=4\E[%d@:\
-	:al=\E[L:bl=^G:bt=\E[Z:cd=\E[J:ce=\E[K:ch=\E[%i%d`:\
-	:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:dc=\E[P:dl=\E[M:\
-	:do=^J:ei=:ho=\E[H:ic=\E[@:im=:kb=^H:kd=^J:kl=^H:\
-	:le=^H:me=\E[m:mr=\E[7m:nd=\E[C:nw=^M^J:\
-	:..rp=%.\E[%db:se=\E[m:so=\E[7m:ta=^I:ue=\E[m:up=\EM:\
-	:us=\E[4m:
+	:li#94:\tc=gator:
 gator|HP 9000 model 237 emulating AAA:\
 	:bw:km:mi:ul:\
 	:co#128:it#8:li#47:\
 	:AL=1*\E[%dL:DC=4\E[%dP:DL=1*\E[%dM:IC=4\E[%d@:\
-	:al=\E[L:bl=^G:bt=\E[Z:cd=\E[J:ce=\E[K:ch=\E[%i%d`:\
-	:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:dc=\E[P:dl=\E[M:\
-	:do=^J:ei=:ho=\E[H:ic=\E[@:im=:kb=^H:kd=^J:kl=^H:\
-	:le=^H:me=\E[m:mr=\E[7m:nd=\E[C:nw=^M^J:\
-	:..rp=%.\E[%db:se=\E[m:so=\E[7m:ta=^I:ue=\E[m:up=\EM:\
-	:us=\E[4m:
+	:al=\E[L:bl=^G:bt=\E[Z:cd=\E[J:ce=\E[K:cl=\E[H\E[J:\
+	:cm=\E[%i%d;%dH:cr=^M:dc=\E[P:dl=\E[M:do=^J:ei=:\
+	:ho=\E[H:ic=\E[@:im=:kb=^H:kd=^J:kl=^H:le=^H:me=\E[m:\
+	:mr=\E[7m:nd=\E[C:nw=^M^J:rp=1*%.\E[%db:se=\E[m:\
+	:so=\E[7m:ta=^I:ue=\E[m:up=\EM:us=\E[4m:
 gator-52|HP 9000 model 237 emulating VT52:\
-	:co#128:it#8:li#47:\
-	:bl=^G:cd=\EJ:ce=\EK:cl=\EH\EJ:..cm=\EY%+ %+ :cr=^M:\
-	:do=^J:ho=\EH:kb=^H:kd=\EB:kl=\ED:kr=\EC:ku=\EA:\
-	:le=^H:nd=\EC:nw=^M^J:sr=\EI:ta=^I:up=\EA:
+	:co#128:li#47:\tc=vt52:
 gator-52t|HP 9000 model 237 emulating extra-tall VT52:\
-	:co#128:it#8:li#94:\
-	:bl=^G:cd=\EJ:ce=\EK:cl=\EH\EJ:..cm=\EY%+ %+ :cr=^M:\
-	:do=^J:ho=\EH:kb=^H:kd=\EB:kl=\ED:kr=\EC:ku=\EA:\
-	:le=^H:nd=\EC:nw=^M^J:sr=\EI:ta=^I:up=\EA:
+	:li#94:\tc=gator-52:
 
 #### Honeywell-Bull
 #
@@ -2022,26 +2128,18 @@ gator-52t|HP 9000 model 237 emulating extra-tall VT52:\
 
 # Honeywell Bull terminal.  Its cursor and function keys send single
 # control characters and it has standout/underline glitch.  Most programs
-# do not like these features/bugs.  This is a dumb mode for this terminal.
-# Visual bell is realized by flashing the "keyboard locked" LED.
-dku7003-dumb|Honeywell Bull DKU 7003, dumb mode:\
+# do not like these features/bugs.  Visual bell is realized by flashing the
+# "keyboard locked" LED.
+dku7003-dumb|Honeywell Bull DKU 7003 dumb mode:\
 	:co#80:li#25:\
 	:cd=^_:ce=\E[K:cl=^]^_:cm=\E[%i%d;%dH:cr=^M:do=^K:\
 	:ho=^]:kb=^H:kd=^K:kh=^]:kl=^Y:kr=^X:ku=^Z:le=^Y:\
 	:nd=^X:nw=^M^J:sf=^J:ta=^I:up=^Z:vb=\E[2h\E[2l:
-# Honeywell Bull terminal.  Its cursor and function keys send single
-# control characters and it has standout/underline glitch.  Most programs
-# do not like these features/bugs.  The following entry may cause problems
-# with some programs.  Visual bell is realized by flashing the "keyboard 
-# locked" LED.
-dku7003|Honeywell Bull DKU 7003, all features described:\
+dku7003|Honeywell Bull DKU 7003 all features described:\
 	:ms:\
-	:co#80:li#25:sg#1:ug#1:\
-	:cd=^_:ce=\E[K:cl=^]^_:cm=\E[%i%d;%dH:cr=^M:do=^K:\
-	:ho=^]:kb=^H:kd=^K:kh=^]:kl=^Y:kr=^X:ku=^Z:le=^Y:\
-	:mb=\E[5m:md=\E[7m:me=\E[0m:mh=\E[2m:mr=\E[7m:nd=^X:\
-	:nw=^M^J:se=\E[0m:sf=^J:so=\E[7m:ta=^I:ue=\E[0m:\
-	:up=^Z:us=\E[4m:vb=\E[2h\E[2l:
+	:sg#1:ug#1:\
+	:mb=\E[5m:md=\E[7m:me=\E[m:mh=\E[2m:mr=\E[7m:se=\E[m:\
+	:so=\E[7m:ue=\E[m:us=\E[4m:tc=dku7003-dumb:
 
 #### Lear-Siegler (adm)
 #
@@ -2050,6 +2148,14 @@ dku7003|Honeywell Bull DKU 7003, all features described:\
 # emulations (usually their stupidest, and usually labelled adm3, though
 # these `adm3' emulations normally have adm3a+ capabilities).
 #
+# WARNING: Some early ADM terminals (including the ADM3 and ADM5) are 
+# reputed to have had the weird `feature' that sending them a ^G would trigger
+# a diagnostic dump to screen if one of the more obscure RS-232 pins
+# (variously reported as 22 or as `Ring Indicator') was being held high during
+# receipt of the ^G.  If you have a real ADM and think you've run into this,
+# check it out with a breakout box and tell us if this rumor is correct!
+# A quick fix might be to drop back to a cheesy 4-wire cable.
+#
 
 adm1a|adm1|lsi adm1a:\
 	:am:\
@@ -2057,7 +2163,7 @@ adm1a|adm1|lsi adm1a:\
 	:bl=^G:cl=\E;:cm=\E=%+ %+ :cr=^M:do=^J:ho=^^:le=^H:\
 	:nd=^L:sf=^J:up=^K:
 adm2|lsi adm2:\
-	:am:bs:\
+	:am:\
 	:co#80:li#24:\
 	:al=\EE:bl=^G:cd=\EY:ce=\ET:cl=\E;:cm=\E=%+ %+ :\
 	:cr=^M:dc=\EW:dl=\ER:do=^J:ei=:ho=^^:ic=\EQ:im=:\
@@ -2065,7 +2171,7 @@ adm2|lsi adm2:\
 	:up=^K:
 # (adm3: removed obsolete ":ma=^K^P:" -- esr)
 adm3|lsi adm3:\
-	:am:bs:\
+	:am:\
 	:co#80:li#24:\
 	:bl=^G:cl=^Z:cr=^M:do=^J:le=^H:sf=^J:
 # The following ADM-3A switch settings are assumed for normal operation:
@@ -2075,15 +2181,19 @@ adm3|lsi adm3:\
 # requirements.  I recommend
 #	DISABLE_KB_LOCK	LOCAL_OFF	103		202_OFF
 #	ETX_OFF		EOT_OFF
+# Most of these terminals required an option ROM to support lower case display.
+# 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|lsi adm3a:\
-	:am:bs:\
+	:am:\
 	:co#80:li#24:\
 	:bl=^G:cl=\032:cm=\E=%+ %+ :cr=^M:do=^J:ho=^^:le=^H:\
 	:nd=^L:sf=^J:up=^K:
-adm3a+|adm3aplus:\
+adm3a+|adm3a plus:\
 	:kd=^J:kl=^H:kr=^L:ku=^K:tc=adm3a:
-# (adm5: removed obsolete ":ma=^Hh^Jj^Kk^Ll^^H:" & duplicate ":do+^J:" -- esr)
+# (adm5: removed obsolete ":ma=^Hh^Jj^Kk^Ll^^H:" & duplicate ":do=^J:" -- esr)
 adm5|lsi adm5:\
 	:sg#1:\
 	:bl=^G:cd=\EY:ce=\ET:cr=^M:do=^J:kb=^H:kh=^^:se=\EG:\
@@ -2091,31 +2201,31 @@ adm5|lsi adm5:\
 # From: <stephen%comp.lancs.ac.uk@ucl-cs.arpa>
 # (adm11: removed obsolete ":ma=^Hh^Jj^Kk^Ll^^H:" -- esr)
 adm11|lsi adm11:\
-	:am:bs:hs:\
+	:am:hs:\
 	:co#80:li#24:\
 	:bl=^G:cd=\EY:ce=\ET:cl=^Z:cm=\E=%+ %+ :cr=^M:do=^J:\
 	:ds=\Eh:fs=\E(\r:kb=^H:kd=^J:kh=^^:kl=^H:kr=^L:ku=^K:\
-	:nd=^L:se=\E(:so=\E):ts=\EF\E):up=^K:
+	:le=^H:nd=^L:se=\E(:so=\E):ts=\EF\E):up=^K:
 # From: Andrew Scott Beals <bandy@lll-crg.ARPA>
 # 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 :" -- esr)
 adm12|lsi adm12:\
-	:am:bs:mi:\
+	:am:mi:\
 	:co#80:li#24:\
 	:al=\EE:bl=^G:cd=\EY:ce=\ET:cl=^Z:cm=\E=%+ %+ :cr=^M:\
 	:dc=\EW:dl=\ER:do=^J:ei=\Er:ho=^^:im=\Eq:is=\Eq:\
 	:k0=^A0\r:k1=^A1\r:k2=^A2\r:k3=^A3\r:k4=^A4\r:\
 	:k5=^A5\r:k6=^A6\r:k7=^A7\r:k8=^A8\r:k9=^A9\r:kd=^J:\
-	:kl=^H:kr=^L:ku=^K:le=^H:mk=\EG1:nd=^L:se=\EG0:\
-	:so=\EG4:ue=\EG0:up=^K:us=\EG8:
-# (adm20: removed obsolete ":kn#7:"; mapped ":pt:" to ":it#8:" -- esr)
+	:kl=^H:kr=^L:ku=^K:le=^H:nd=^L:se=\EG0:so=\EG4:\
+	:ue=\EG0:up=^K:us=\EG8:
+# (adm20: removed obsolete ":kn#7:" -- esr)
 adm20|lear siegler adm20:\
-	:am:bs:pt:\
+	:am:\
 	:co#80:it#8:li#24:\
 	:al=\EE:bl=^G:bt=\EI:cd=\EY:ce=\ET:cl=^Z:\
 	:cm=\E=%i%r%+^_%+^_:cr=^M:dc=\EW:dl=\ER:ei=:ho=^^:\
 	:ic=\EQ:im=:k1=^A:k2=^B:k3=^W:k4=^D:k5=^E:k6=^X:\
-	:k7=^Z:nd=^L:se=\E(:so=\E):up=^K:
+	:k7=^Z:le=^H:nd=^L:se=\E(:so=\E):ta=^I:up=^K:
 adm21|lear siegler adm21:\
 	:sg#1:ug#1:\
 	:al=30*\EE:bl=^G:cd=\EY:ce=\ET:cr=^M:dc=\EW:\
@@ -2123,23 +2233,162 @@ adm21|lear siegler adm21:\
 	:kl=^H:kr=^L:ku=^K:se=\EG0:sf=^J:so=\EG4:ue=\EG0:\
 	:us=\EG8:tc=adm3a:
 # (adm22: ":em=:" was an obvious typo for ":ei=:"; also,
-# removed obsolete ":kn#7:ko=ho:ma=j^Jk^P^K^Pl ^R^L^L :" -- esr)
+# removed obsolete ":kn#7:ma=j^Jk^P^K^Pl ^R^L^L :";
+# removed bogus-looking \200 from before <cup>. -- esr)
 adm22|lsi adm22:\
-	:am:bs:\
+	:am:\
 	:co#80:li#24:\
 	:al=\EE:bl=^G:bt=\EI:cd=\Ey:ce=\Et:cl=\E+:\
-	:cm=\200\E=%+ %+ :cr=^M:dc=\EW:dl=\ER:do=^J:ei=:\
-	:ho=^^:ic=\EQ:im=:\
-	:is=\E%\014\014\014\016\003\200\003\002\003\002\200\200\200\200\200\200\200\200\200\200\200:\
+	:cm=\E=%+ %+ :cr=^M:dc=\EW:dl=\ER:do=^J:ei=:ho=^^:\
+	:ic=\EQ:im=:\
+	:is=\E%\014\014\014\016^C\200\003\002\003^B\200\200\200\200\200\200\200\200\200\200\200:\
 	:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:\
 	:k6=^AE\r:k7=^AF\r:kb=^H:kd=^J:kh=^^:kl=^H:kr=^L:\
-	:ku=^K:nd=^L:se=\E(:so=\E):ta=\Ei:up=^K:
+	:ku=^K:le=^H:nd=^L:se=\E(:so=\E):ta=\Ei:up=^K:
+# ADM 31 DIP Switches
+#
+# This information comes from two versions of the manual for the
+# Lear-Siegler ADM 31.
+#
+# Main board:
+#                  rear of case
+#   +-||||-------------------------------------+
+#   + S1S2                              ||S    +
+#   +                                   ||3    +
+#   +                                          +
+#   +                                ||S       +
+#   +                                ||4       +
+#   +                                          +
+#   +                                          +
+#   +                                          +
+#   +                                          +
+#   +                                          +
+# +-+                                          +-+
+# +                                              +
+# +                               S5 S6 S7       +   
+# +                               == == ==       +
+# +----------------------------------------------+
+#            front of case (keyboard)
+#
+#  S1 - Data Rate - Modem
+#  S2 - Data Rate - Printer
+# ------------------------
+# Data Rate   Setting
+# -------------------
+# 50          0 0 0 0
+# 75          1 0 0 0
+# 110         0 1 0 0
+# 134.5       1 1 0 0
+# 150         0 0 1 0
+# 300         1 0 1 0
+# 600         0 1 1 0
+# 1200        1 1 1 0
+# 1800        0 0 0 1
+# 2000        1 0 0 1
+# 2400        0 1 0 1
+# 3600        1 1 0 1
+# 4800        0 0 1 1
+# 7200        1 0 1 1
+# 9600        0 1 1 1
+# x           1 1 1 1
+#
+# S3 - Interface/Printer/Attributes
+# ---------------------------------
+# Printer Busy Control
+# sw1   sw2   sw3
+# ---------------
+# off   off   off   Busy not active, CD disabled
+# off   off   on    Busy not active, CD enabled
+# off   on    off   Busy active on J5-20, CD disabled
+# on    off   off   Busy active on J5-19, CD disabled - Factory Set.
+# on    off   on    Busy active on J5-19, CD enabled
+#
+# sw4   Used in conjuction with S4 for comm interface control - Fact 0
+#
+# sw5   Secondary Channel Control (Hardware implementation only) - Fact 0
+#
+# sw6   ON enables printer BUSY active LOW - Factory Setting
+#       OFF enables printer BUSY active HIGH - If set to this, ADM31 senses
+#
+# sw7   ON - steady cursor - Factory Setting
+#       OFF - blinking cursor
+#
+# sw8   ON causes selected attribute character to be displayed
+#       OFF causes SPACE to be displayed instead - Factory Setting
+#
+# S4 - Interface
+# --------------
+# Modem Interface
+# S3    S4    S4    S4    S4
+# sw4   sw1   sw2   sw3   sw4
+# ---------------------------
+# OFF   ON    OFF   ON    OFF   Enable RS-232C interface, Direct Connect and
+#                               Current Loop disabled - Factory Setting
+# ON    ON    OFF   ON    OFF   Enable Current Loop interface, Direct Connect
+#                               disabled
+# OFF   OFF   ON    OFF   ON    Enable Direct Connect interface, RS-232C and
+#                               Current Loop Disabled
+#
+# sw5   ON disables dot stretching mode - Factory Setting
+#       OFF enables dot stretching mode
+# sw6   ON enables blanking function
+#       OFF enables underline function - Factory Setting
+# sw7   ON causes NULLS to be displayed as NULLS
+#       OFF causes NULLS to be displayed as SPACES - Factory Setting
+#
+# S5 - Word Structure
+# -------------------
+# sw1   ON enables BREAK key - Factory Setting
+#       OFF disables BREAK key
+# sw2   ON selects 50Hz monitor refresh rate
+#       OFF selects 60Hz monitor refresh rate - Factory Setting
+#
+# Modem Port Selection
+# sw3   sw4   sw5
+# ---------------
+# ON    ON    ON    Selects 7 DATA bits, even parity, 2 STOP bits
+# OFF   ON    ON    Selects 7 DATA bits, odd  parity, 2 STOP bits
+# ON    OFF   ON    Selects 7 DATA bits, even parity, 1 STOP bit - Factory Set.
+# OFF   OFF   ON    Selects 7 DATA bits, odd  parity, 1 STOP bit
+# ON    ON    OFF   Selects 8 DATA bits, no   parity, 2 STOP bits
+# OFF   ON    OFF   Selects 8 DATA bits, no   parity, 1 STOP bit
+# ON    OFF   OFF   Selects 8 DATA bits, even parity, 1 STOP bit
+# OFF   OFF   OFF   Selects 8 DATA bits, odd  parity, 1 STOP bit
+#
+# sw6   ON  sends bit 8 a 1 (mark)
+#       OFF sends bit 8 as 0 (space) - Factory Setting
+# sw7   ON  selects Block Mode
+#       OFF selects Conversation Mode - Factory Setting
+# sw8   ON  selects Full Duplex operation
+#       OFF selects Half Duplex operation - Factory Setting
+#
+# S6 - Printer
+# ------------
+# sw1, sw2, sw6, sw7   Reserved - Factory 0
+#
+# Printer Port Selection
+# same as Modem above, bit 8 (when 8 DATA bits) is always = 0
+#
+# sw8   ON   enables Printer Port
+#       OFF disables Printer Port - Factory Setting
+#
+# S7 - Polling Address
+# --------------------
+# sw1-7 Establish ASCII character which designates terminal polling address
+#       ON  = logic 0
+#       OFF = logic 1 - Factory Setting
+# sw8   ON   enables Polling Option
+#       OFF disables Polling Option - Factory Setting
+#
+#
+# On some older ADM 31s, S4 does not exist, and S5-sw6 is not defined.
+#
 # If the adm31 gives you trouble with standout mode, check the DIP switch in
 # position 6, bank @c11, 25% from back end of the circuit board.  Should be
 # OFF.  If there is no such switch, you have an old adm31 and must use oadm31.
 # (adm31: removed obsolete ":ma=j^Jk^P^K^Pl ^R^L^L :" -- esr)
 adm31|lsi adm31:\
-	:am:bs:mi:\
+	:am:mi:\
 	:co#80:li#24:\
 	:al=\EE:bl=^G:cd=\EY:ce=\ET:cl=\E*:cm=\E=%+ %+ :\
 	:cr=^M:dc=\EW:dl=\ER:do=^J:ei=\Er:ho=^^:im=\Eq:\
@@ -2147,9 +2396,13 @@ adm31|lsi adm31:\
 	:k4=^A4\r:k5=^A5\r:k6=^A6\r:k7=^A7\r:k8=^A8\r:\
 	:k9=^A9\r:kd=^J:kl=^H:kr=^L:ku=^K:le=^H:nd=^L:\
 	:se=\EG0:sf=^J:so=\EG1:ue=\EG0:up=^K:us=\EG1:
-oadm31|o31|old adm31:\
+adm31-old|o31|old adm31:\
 	:so=\EG4:ue@:us@:tc=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 -- esr)
 adm36|lsi adm36:\
 	:am:mi:\
 	:co#80:li#24:\
@@ -2159,7 +2412,7 @@ adm36|lsi adm36:\
 	:kl=\ED:kr=\EC:ku=\E[A:le=^H:nd=\E[D:up=\E[A:
 # (adm42: removed obsolete ":ma=^K^P:" -- esr)
 adm42|lsi adm42:\
-	:am:bs:\
+	:am:\
 	:co#80:li#24:\
 	:al=\EE:bl=^G:bt=\EI:cd=\EY:ce=\ET:cl=\E;:\
 	:cm=\E=%+ %+ :cr=^M:dc=\EW:dl=\ER:do=^J:ei=\Er:\
@@ -2169,7 +2422,7 @@ adm42|lsi adm42:\
 # The following termcap for the Lear Siegler ADM-42 leaves the 
 # "system line" at the bottom of the screen blank (for those who 
 # find it distracting otherwise)
-adm42-nl|lsi adm-42 with no system line:\
+adm42-ns|lsi adm-42 with no system line:\
 	:al=\EE\EF \011:bt=\EI\EF \011:cd=\EY\EF \011:\
 	:ce=\ET\EF \011:cl=\E;\EF \011:cm=\E=%+ %+ \EF \011:\
 	:dc=\EW\EF \011:dl=\ER\EF \011:ei=\Er\EF \011:\
@@ -2191,8 +2444,7 @@ pt100|pt200|wren|fenix|prime pt100/pt200:\
 	:ku=\E[A:le=^H:nd=\E[C:nw=^M^J:se=\E[m:sf=^J:\
 	:so=\E[2;7m:ta=^I:\
 	:ti=\E[>1l\E[>2l\E[>16l\E[4l\E[>9l\E[20l\E[>3l\E[>7h\E[>12l\E[1Q:\
-	:ue=\E[m:up=\EM:us=\E[4m:\
-	:vb=\E$E\200\200\200\200\200\200\200\200\200\200\200\200\200\200\E$P:
+	:ue=\E[m:up=\EM:us=\E[4m:vb=\E$\E$P:
 pt100w|pt200w|wrenw|fenixw|prime pt100/pt200 in 132-column mode:\
 	:co#132:\
 	:cm=\E[%i%d;%dH:tc=pt100:
@@ -2242,12 +2494,13 @@ qvt101+|qvt101p|qume qvt 101 PLUS product:\
 	:cm=\E=%+ %+ :cr=^M:ct=\E3:dc=\EW:dl=\ER:do=^J:\
 	:ds=\Eg\Ef\r:ei=:fs=^M:ho=^^:ic=\EQ:im=:k1=^A@\r:\
 	:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:k6=^AE\r:\
-	:k7=^AF\r:k8=^AG\r:k9=^AH\r:kb=^H:kd=^J:kh=^^:kl=^H:\
-	:kr=^L:ku=^K:le=^H:nd=^L:pf=\EA:po=\E@:se=\E(:sf=^J:\
+	:k7=^AF\r:k8=^AG\r:k9=^AH\r:kI=\EQ:kb=^H:kd=^J:kh=^^:\
+	:kl=^H:kr=^L:ku=^K:le=^H:nd=^L:se=\E(:sf=^J:\
 	:so=\E0P\E):st=\E1:ta=^I:ts=\Eg\Ef:ue=\EG0:up=^K:\
 	:us=\EG8:vb=\Eb\Ed:ve=\E.4:vs=\E.2:
-qvt102|qume qvt 102 product:\
+qvt102|qume qvt 102:\
 	:ve=\E.:tc=qvt101:
+# (qvt103: added <rmam>/<smam> based on init string -- esr)
 qvt103|qume qvt 103:\
 	:am:xn:xo:\
 	:co#80:it#8:li#24:vt#3:\
@@ -2261,8 +2514,7 @@ qvt103|qume qvt 103:\
 	:sc=\E7:se=\E[m:sf=^J:so=\E[7m:sr=\EM:st=\EH:ta=^I:\
 	:ue=\E[m:up=\E[A:us=\E[4m:
 qvt103-w|qume qvt103 132 cols:\
-	:co#132:li#24:\
-	:tc=qvt103:
+	:co#132:li#24:\tc=qvt103:
 qvt119+|qvt119p|qvt119|qume qvt 119 and 119PLUS terminals:\
 	:am:hs:mi:ms:\
 	:co#80:li#24:sg#0:\
@@ -2272,36 +2524,23 @@ qvt119+|qvt119p|qvt119|qume qvt 119 and 119PLUS terminals:\
 	:is=\EDF\EC\EG0\Er\E(\E%EX:k0=^AI\r:k1=^A@\r:\
 	:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:k6=^AE\r:\
 	:k7=^AF\r:k8=^AG\r:k9=^AH\r:kb=^H:kd=^J:kh=^^:kl=^H:\
-	:kr=^L:ku=^K:le=^H:nd=^L:pf=\EA:po=\E@:se=\EG0:sf=^J:\
-	:so=\EG4:sr=\EJ:st=\E1:ta=^I:ts=\Eg\Ef:ue=\EG0:up=^K:\
-	:us=\EG8:vb=\En0\En1:ve=\E.4:vs=\E.2:
+	:kr=^L:ku=^K:le=^H:nd=^L:se=\EG0:sf=^J:so=\EG4:\
+	:sr=\EJ:st=\E1:ta=^I:ts=\Eg\Ef:ue=\EG0:up=^K:us=\EG8:\
+	:vb=\En0\En1:ve=\E.4:vs=\E.2:
 qvt119+-25|qvt119p-25|QVT 119 PLUS with 25 data lines:\
-	:li#25:\
-	:tc=qvt119+:
+	:li#25:\tc=qvt119+:
 qvt119+-w|qvt119p-w|qvt119-w|QVT 119 and 119 PLUS in 132 column mode:\
 	:co#132:\
 	:is=\EDF\EC\EG0\Er\E(\E%\EX\En4:tc=qvt119+:
 qvt119+-25-w|qvt119p-25-w|qvt119-25-w|QVT 119 and 119 PLUS 132 by 25:\
-	:li#25:\
-	:tc=qvt119+:
+	:li#25:\tc=qvt119+:
 qvt203|qvt203+|qume qvt 203 Plus:\
-	:am:xn:xo:\
-	:co#80:it#8:li#24:vt#3:\
-	:DO=\E[%dB:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:al=\E[L:\
-	:bl=^G:cd=\E[J:ce=\E[K:cl=\E[H\E[2J:cm=\E[%i%d;%dH:\
-	:cr=^M:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:dl=\E[M:do=^J:\
-	:ei=\E[4l:ho=\E[H:im=\E[4h:ip=:k0=\E[29~:k1=\E[17~:\
-	:k2=\E[18~:k3=\E[19~:k4=\E[20~:k5=\E[21~:k6=\E[23~:\
-	:k7=\E[24~:k8=\E[25~:k9=\E[28~:kb=^H:kd=\EOB:\
-	:ke=\E[?1l\E>:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:ku=\EOA:\
-	:le=^H:mb=\E[5m:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:\
-	:rc=\E8:\
-	:..sa=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;m:\
-	:sc=\E7:se=\E[m:sf=\n:so=\E[7m:sr=\EM:st=\EH:ta=^I:\
-	:ue=\E[m:up=\E[A:us=\E[4m:
+	:al=\E[L:dc=\E[P:dl=\E[M:ei=\E[4l:im=\E[4h:ip=:\
+	:k0=\E[29~:k1=\E[17~:k2=\E[18~:k3=\E[19~:k4=\E[20~:\
+	:k5=\E[21~:k6=\E[23~:k7=\E[24~:k8=\E[25~:k9=\E[28~:\
+	:sf=\n:tc=qvt103:
 qvt203-w|qvt203-w-am|qume qvt 203 PLUS in 132 cols (w/advanced video):\
-	:co#132:li#24:\
-	:tc=qvt203:
+	:co#132:li#24:\tc=qvt203:
 #
 #	Since a command is present for enabling 25 data lines,
 #	a specific terminfo entry may be generated for the 203.
@@ -2312,8 +2551,7 @@ qvt203-25|QVT 203 PLUS with 25 by 80 column mode:\
 	:co#80:li#25:\
 	:is=\E[=40h\E[?3l:tc=qvt203:
 qvt203-25-w|QVT 203 PLUS with 25 by 132 columns:\
-	:co#132:li#25:\
-	:tc=qvt203:
+	:co#132:li#25:\tc=qvt203:
 
 #### Televideo (tvi)
 #
@@ -2336,39 +2574,135 @@ tvi803|televideo 803:\
 	:cl=\E*:tc=tvi950:
 
 # Vanilla tvi910 -- W. Gish <cswarren@violet> 10/29/86
-# (tvi910: removed obsolete ":ma=^Kk^Ll^R^L:";
-# mapped ":pt:" to ":it#8:"; added ":ug#0:" for terminfo translation;
-# added khome, cub1, cud1, ind, hpa, vpa, am, msgr from SCO entry -- esr)
+# Switch settings are:
+# 
+# S1  1 2 3 4
+#     D D D D  9600
+#     D D D U    50
+#     D D U D    75
+#     D D U U   110
+#     D U D D   135
+#     D U D U   150
+#     D U U D   300
+#     D U U U   600
+#     U D D D  1200
+#     U D D U  1800
+#     U D U D  2400
+#     U D U U  3600
+#     U U D D  4800
+#     U U D U  7200
+#     U U U D  9600
+#     U U U U 19200
+# 
+# S1  5 6 7 8
+#     U D X D  7N1 (data bits, parity, stop bits) (X means ignored)
+#     U D X U  7N2
+#     U U D D  7O1
+#     U U D U  7O2
+#     U U U D  7E1
+#     U U U U  7E2
+#     D D X D  8N1
+#     D D X U  8N2
+#     D U D D  8O1
+#     D U U U  8E2
+# 
+# S1  9  Autowrap
+#     U  on
+#     D  off
+# 
+# S1 10  CR/LF
+#     U  do CR/LF when CR received
+#     D  do CR when CR received
+# 
+# S2  1  Mode
+#     U  block
+#     D  conversational
+# 
+# S2  2  Duplex
+#     U  half
+#     D  full
+# 
+# S2  3  Hertz
+#     U  50
+#     D  60
+# 
+# S2  4  Edit mode
+#     U  local
+#     D  duplex
+# 
+# S2  5  Cursor type
+#     U  underline
+#     D  block
+# 
+# S2  6  Cursor down key
+#     U  send ^J
+#     D  send ^V
+# 
+# S2  7  Screen colour
+#     U  green on black
+#     D  black on green
+# 
+# S2  8  DSR status (pin 6)
+#     U  disconnected
+#     D  connected
+# 
+# S2  9  DCD status (pin 8)
+#     U  disconnected
+#     D  duplex
+# 
+# S2 10  DTR status (pin 20)
+#     U  disconnected
+#     D  duplex
+# (tvi910: removed obsolete ":ma=^Kk^Ll^R^L:"; added <khome>, <cub1>, <cud1>,
+# <ind>, <hpa>, <vpa>, <am>, <msgr> from SCO entry -- esr)
 tvi910|televideo model 910:\
-	:am:bs:ms:pt:\
-	:co#80:it#8:li#24:sg#1:ug#0:\
-	:bl=^G:bt=\EI:cd=\EY:ce=\ET:ch=\E]%+ :cl=^Z:\
-	:cm=\E=%+ %+ :cr=^M:cv=\E[%+ :do=^J:ho=\E=\001\001:\
-	:if=/usr/share/tabset/stdcrt:k0=^AI\r:k1=^A@\r:\
-	:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:k6=^AE\r:\
-	:k7=^AF\r:k8=^AG\r:k9=^AH\r:kb=^H:kd=^J:kh=^^:kl=^H:\
-	:kr=^L:ku=^K:le=^H:nd=^L:se=\EG0:sf=^J:so=\EG4:\
-	:ue=\EG0:up=^K:us=\EG8:
+	:am:ms:\
+	:co#80:it#8:li#24:sg#1:ug#1:\
+	:bl=^G:bt=\EI:cd=\EY:ce=\ET:cl=^Z:cm=\E=%+ %+ :cr=^M:\
+	:do=^J:ho=\E=\001\001:if=/usr/share/tabset/stdcrt:\
+	:k0=^AI\r:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:\
+	:k5=^AD\r:k6=^AE\r:k7=^AF\r:k8=^AG\r:k9=^AH\r:kb=^H:\
+	:kd=^J:kh=^^:kl=^H:kr=^L:ku=^K:le=^H:nd=^L:se=\EG0:\
+	:sf=^J:so=\EG4:ta=^I:ue=\EG0:up=^K:us=\EG8:
 # From: Alan R. Rogers <rogers%albany@csnet-relay>
 # as subsequently hacked over by someone at SCO
-# (tvi910+: removed obsolete ":ma=^K^P^L :"; mapped ":pt:" to ":it#8:";
-# added ":ug#0:" for terminfo translation -- esr)
+# (tvi910+: removed obsolete ":ma=^K^P^L :" -- esr)
+#
+# Here are the 910+'s DIP switches (U = up, D = down, X = don't care):
+#
+# S1  1 2 3 4:
+#     D D D D  9600     D D D U    50     D D U D    75     D D U U   110
+#     D U D D   135     D U D U   150     D U U D   300     D U U U   600
+#     U D D D  1200     U D D U  1800     U D U D  2400     U D U U  3600
+#     U U D D  4800     U U D U  7200     U U U D  9600     U U U U 19200
+#
+# S1  5 6 7 8:
+#     U D X D  7N1     U D X U  7N2     U U D D  7O1     U U D U  7O2
+#     U U U D  7E1     U U U U  7E2     D D X D  8N1     D D X U  8N2
+#     D U D D  8O1     D U U U  8E2
+# 
+# S1  9  Autowrap            (U = on, D = off)
+# S1 10  CR/LF               (U = CR/LF on CR received, D = CR on CR received)
+# S2  1  Mode                (U = block, D = conversational)
+# S2  2  Duplex              (U =  half, D = full)
+# S2  3  Hertz               (U = 50, D = 60)
+# S2  4  Edit mode           (U = local, D = duplex)
+# S2  5  Cursor type         (U = underline, D = block)
+# S2  6  Cursor down key     (U = send ^J, D = send ^V)
+# S2  7  Screen colour       (U = green on black, D = black on green)
+# S2  8  DSR status (pin 6)  (U = disconnected, D = connected)
+# S2  9  DCD status (pin 8)  (U = disconnected, D = connected)
+# S2 10  DTR status (pin 20) (U = disconnected, D = connected)
+#
 tvi910+|910+|televideo 910+:\
-	:am:bs:ms:pt:\
-	:co#80:it#8:li#24:sg#1:ug#0:\
-	:al=\EE:bl=^G:bt=\EI:cd=\EY:ce=\ET:ch=\E]%+ :cl=^Z:\
-	:cm=\E=%+ %+ :cr=^M:cv=\E[%+ :dc=\EW:dl=\ER:do=^J:\
-	:ei=:ho=^^:ic=\EQ:if=/usr/share/tabset/stdcrt:im=:\
-	:k0=^A@\r:k1=^AA\r:k2=^AB\r:k3=^AC\r:k4=^AD\r:\
-	:k5=^AE\r:k6=^AF\r:k7=^AG\r:k8=^AH\r:k9=^AI\r:kb=^H:\
-	:kd=^J:kh=^^:kl=^H:kr=^L:ku=^K:le=^M:ll=\E=7 :nd=^L:\
-	:se=\EG0:sf=^J:so=\EG4:ue=\EG0:up=^K:us=\EG8:
-
-# (tvi912: removed obsolete ":ma=^K^P^L :";
-# mapped ":pt:" to default tabs -- esr)
-tvi912|tvi920|old televideo 912:\
-	:am:bs:pt:\
-	:co#80:li#24:sg#1:ug#1:\
+	:al=\EE:dc=\EW:dl=\ER:ei=:ho=^^:ic=\EQ:im=:k0=^A@\r:\
+	:k1=^AA\r:k2=^AB\r:k3=^AC\r:k4=^AD\r:k5=^AE\r:\
+	:k6=^AF\r:k7=^AG\r:k8=^AH\r:k9=^AI\r:ll=\E=7 :tc=tvi910:
+
+# (tvi912: removed obsolete ":ma=^K^P^L :" -- esr)
+tvi912|tvi914|tvi920|old televideo 912/914/920:\
+	:am:\
+	:co#80:it#8:li#24:sg#1:ug#1:\
 	:al=\EE:bl=^G:cd=\Ey:ce=\ET:cl=^Z:cm=\E=%+ %+ :cr=^M:\
 	:ct=\E3:dc=\EW:dl=\ER:do=^J:ei=:ho=^^:ic=\EQ:\
 	:if=/usr/share/tabset/stdcrt:im=:k0=^AI\r:k1=^A@\r:\
@@ -2381,8 +2715,8 @@ tvi912|tvi920|old televideo 912:\
 # 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:\
 	:al=\EE:dl=\ER:tc=tvi912:
-# set to page 1 when entering ex (\E-17 )
-# reset to page 0 when exiting ex (\E-07 )
+# 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:\
 	:te=\E-07 :ti=\E-17 :tc=tvi912:
 # We got some new tvi912c terminals that act really weird on the regular 
@@ -2391,11 +2725,94 @@ tvi912-2p|tvi920-2p|912-2p|920-2p|tvi-2p|televideo w/2 pages:\
 tvi912cc|tvi912 at cowell college:\
 	:cm@:tc=tvi912c:
 
+# Here are the switch settings for the TVI 920c:
+#
+# S1 (Line), and S3 (Printer) baud rates -- put one, and only one, switch down:
+# 2: 9600	3: 4800		4: 2400		5: 1200
+# 6:  600	7:  300		8:  150		9:   75
+# 10: 110
+#
+# S2 UART/Terminal options:
+# 		Up			Down
+# 1:		Not used		Not allowed
+# 2:	Alternate character set	  Standard character set
+# 3:	    Full duplex		    Half duplex
+# 4:	    50 Hz refresh	    60 Hz refresh
+# 5:	      No parity		     Send parity
+# 6:	     2 stop bits	     1 stop bit
+# 7:	     8 data bits	     7 data bits
+# 8:		Not used		Not allowed on Rev E or lower
+# 9:	     Even parity	     Odd parity
+# 10:	    Steady cursor	    Blinking cursor
+# 	(On Rev E or lower, use W25 instead of switch 10.)
+# 
+# S5 UART/Terminal options:
+# 		Open			Closed
+# 1:	P3-6 Not connected	DSR received on P3-6
+# 2:	P3-8 Not connected	DCD received on P3-8
+#
+# 3 Open, 4 Open:		P3-20 Not connected
+# 3 Open, 4 Closed:	DTR on when terminal is on
+# 3 Closed, 4 Open:	DTR is connected to RTS
+# 3 Closed, 4 Closed:	Not allowed
+#
+# 5 Closed:	HDX printer (hardware control) Rev. K with extension port off,
+# 		all data transmitted out of the modem port (P3) will also be
+# 		transmitted out of the printer port (P4).
+#
+# 6 Open, 7 Open:		Not allowed
+# 6 Open, 7 Closed:	20ma current loop input
+# 6 Closed, 7 Open:	RS232 input
+# 6 Closed, 7 Closed:	Not allowed
+#
+# Jumper options:
+# If the jumper is installed, the effect will occur (the next time the terminal
+# is switched on).
+#
+# S4/W31:	Enables automatic LF upon receipt of CR from
+# 		remote or keyboard.
+# S4/W32:	Enables transmission of EOT at the end of Send.  If not 
+# 		installed, a carriage return is sent.
+# S4/W33:	Disables automatic carriage return in column 80.
+# S4/W34:	Selects Page Print Mode as initial condition.  If not 
+# 		installed, Extension Mode is selected.
+#
 tvi920b|tvi920c|new televideo 920:\
 	:al=\EE:dl=\ER:k0=^AI\r:k1=^A@\r:k2=^AA\r:k3=^AB\r:\
 	:k4=^AC\r:k5=^AD\r:k6=^AE\r:k7=^AF\r:k8=^AG\r:\
 	:k9=^AH\r:tc=tvi912:
 
+# Televideo 921 and variants
+# From: Tim Theisen <tim@cs.wisc.edu> 22 Sept 1995
+# (tvi921: removed :ko=bt: before translation, I see no backtab cap -- esr)
+tvi921|televideo model 921 with sysline same as page & real vi function:\
+	:am:hs:xn:xs:\
+	:co#80:li#24:sg#0:\
+	:ae=\E%:al=\EE:as=\E$:cd=\EY:ce=\ET:cl=^Z:\
+	:cm=3\E=%+ %+ :cr=^M:dc=\EW:dl=1*\ER:do=^V:\
+	:ds=\Ef\r\Eg:ei=:fs=\Eg:ho=^^:ic=\EQ:\
+	:if=/usr/share/tabset/stdcrt:im=:\
+	:is=\El\E"\EF1\E.3\017\EA\E<:kD=\EW:kI=\EQ:kb=^H:\
+	:kd=^V:kl=^H:kr=^L:ku=^K:le=^H:nd=^L:nw=^M^J:se=\EG0:\
+	:sf=^J:so=\EG4:ta=^I:ts=\Ef\EG0:ue=\EG0:up=^K:\
+	:us=\EG8:ve=\E.3:vs=\E.2:
+# without the beeper
+# (tvi92B: removed :ko=bt: before translation, I see no backtab cap -- esr)
+tvi92B|televideo model 921 with sysline same as page & real vi function:\
+	:am:hs:xn:xs:\
+	:co#80:li#24:sg#0:\
+	:ae=\E%:al=\EE:as=\E$:cd=\EY:ce=\ET:cl=^Z:\
+	:cm=3\E=%+ %+ :cr=^M:dc=\EW:dl=1*\ER:do=^V:\
+	:ds=\Ef\r\Eg:ei=:fs=\Eg:ho=^^:ic=\EQ:\
+	:if=/usr/share/tabset/stdcrt:im=:\
+	:is=\El\E"\EF1\E.3\017\EA\E<:kD=\EW:kI=\EQ:kb=^H:\
+	:kd=^V:kl=^H:kr=^L:ku=^K:le=^H:nd=^L:nw=^M^J:se=\EG0:\
+	:sf=^J:so=\EG4:ta=^I:ts=\Ef\EG0:ue=\EG0:up=^K:\
+	:us=\EG8:vb=\Eb\Ed:ve=\E.3:vs=\E.2:
+# (tvi92D: removed :ko=bt: before translation, I see no backtab cap -- esr)
+tvi92D|tvi92B with DTR instead of XON/XOFF & better padding:\
+	:al=2*\EE:dl=2*\ER:is=\El\E"\EF1\E.3\016\EA\E<:tc=tvi92B:
+
 tvi924|televideo tvi924:\
 	:am:bw:hs:in:mi:ms:xn:xo:\
 	:co#80:it#8:li#24:sg#0:ws#80:\
@@ -2405,14 +2822,143 @@ tvi924|televideo tvi924:\
 	:i1=\017\E%\E'\E(\EDF\EC\EG0\EN0\Es0\Ev0:ic=\EQ:\
 	:if=/usr/share/tabset/stdcrt:im=:k0=^A@\r:k1=^AA\r:\
 	:k2=^AB\r:k3=^AC\r:k4=^AD\r:k5=^AE\r:k6=^AF\r:\
-	:k7=^AG\r:k8=^AH\r:k9=^AI\r:kb=^H:kd=^V:kh=^^:kl=^H:\
-	:kr=^L:ku=^K:le=^H:mb=\EG2:me=\EG0:mk=\EG1:nd=^L:\
-	:se=\EG0:sf=^J:so=\EG4:sr=\Ej:st=\E1:ta=^I:ts=\Ef:\
-	:ue=\EG0:up=^K:us=\EG8:vb=\Eb\Ed:ve=\E.3:vi=\E.0:\
-	:vs=\E.1:
-tvi924vb|924vb|televideo model 924 visual bells:\
-	:vb=\Eb\200\200\200\200\200\200\200\200\200\200\200\200\200\200\200\Ed:tc=tvi924:
-
+	:k7=^AG\r:k8=^AH\r:k9=^AI\r:kD=\EW:kI=\EQ:kb=^H:\
+	:kd=^V:kh=^^:kl=^H:kr=^L:ku=^K:le=^H:mb=\EG2:me=\EG0:\
+	:nd=^L:se=\EG0:sf=^J:so=\EG4:sr=\Ej:st=\E1:ta=^I:\
+	:ts=\Ef:ue=\EG0:up=^K:us=\EG8:vb=\Eb\Ed:ve=\E.3:\
+	:vi=\E.0:vs=\E.1:
+
+# TVI925 DIP switches.  In each of these, D = Down and U = Up,
+#
+# Here are the settings for the external (baud) switches (S1):
+#
+#             Position		Baud
+# 7	8	9	10		[Printer]
+# 1	2	3	4		[Main RS232]
+# -----------------------------------------------------
+# D	D	D	D	9600
+# D	D	D	U	  50
+# D	D	U	D	  75
+# D	D	U	U	 110
+# D	U	D	D	 135
+# D	U	D	U	 150
+# D	U	U	D	 300
+# D	U	U	U	 600
+# U	D	D	D	1200
+# U	D	D	U	1800
+# U	D	U	D	2400
+# U	D	U	U	3600
+# U	U	D	D	4800
+# U	U	D	U	7200
+# U	U	U	D	9600
+# U	U	U	U	19200
+# 
+# 
+# Settings for word length and stop-bits (S1)
+#
+#  Position	Description
+# 5	6	
+# ---------------------------
+# U	-	7-bit word
+# D	-	8-bit word
+# -	U	2 stop bits
+# -	D	1 stop bit
+# 
+# 
+# S2 (external) settings
+#
+# Position	Up	Dn	Description
+# --------------------------------------------
+# 1		X		Local edit
+# 			X	Duplex edit (transmit editing keys)
+# --------------------------------------------
+# 2		X		912/920 emulation
+# 			X	925
+# --------------------------------------------
+# 3			X
+# 4			X	No parity
+# 5			X	
+# --------------------------------------------
+# 3			X
+# 4			X	Odd parity
+# 5		X	
+# --------------------------------------------
+# 3			X
+# 4		X		Even parity
+# 5		X	
+# --------------------------------------------
+# 3		X	
+# 4			X	Mark parity
+# 5		X		
+# --------------------------------------------
+# 3		X
+# 4		X		Space parity
+# 5		X
+# --------------------------------------------
+# 6		X		White on black display
+# 			X	Black on white display
+# --------------------------------------------
+# 7			X	Half Duplex
+# 8			X
+# --------------------------------------------
+# 7		X		Full Duplex
+# 8			X	
+# --------------------------------------------
+# 7			X	Block mode
+# 8		X	
+# --------------------------------------------
+# 9			X	50 Hz
+# 		X		60 Hz
+# --------------------------------------------
+# 10		X		CR/LF (Auto LF)
+# 			X	CR only
+# 
+# S3 (internal switch) settings:
+# 
+# Position	Up	Dn	Description
+# --------------------------------------------
+# 1		X		Keyclick off 
+# 			X	Keyclick on
+# --------------------------------------------
+# 2			X	English
+# 3			X	
+# --------------------------------------------
+# 2			X	German
+# 3		X		
+# --------------------------------------------
+# 2		X		French
+# 3			X	
+# --------------------------------------------
+# 2		X		Spanish
+# 3		X	
+# --------------------------------------------
+# 4			X	Blinking block cursor
+# 5			X	
+# --------------------------------------------
+# 4			X	Blinking underline cursor
+# 5		X		
+# --------------------------------------------
+# 4		X		Steady block cursor
+# 5			X	
+# --------------------------------------------
+# 4		X		Steady underline cursor
+# 5		X	
+# --------------------------------------------
+# 6		X		Screen blanking timer (ON)
+# 			X	Screen blanking timer (OFF)
+# --------------------------------------------
+# 7		X		Page attributes
+# 			X	Line attributes
+# --------------------------------------------
+# 8		X		DCD disconnected
+# 			X	DCD connected
+# --------------------------------------------
+# 9		X		DSR disconnected
+# 			X	DSR connected
+# --------------------------------------------
+# 10		X		DTR Disconnected
+# 			X	DTR connected
+# --------------------------------------------
 tvi925|925|televideo 925:\
 	:am:bw:hs:ul:\
 	:co#80:li#24:sg#1:ug#1:\
@@ -2420,32 +2966,10 @@ tvi925|925|televideo 925:\
 	:cm=\E=%+ %+ :cr=^M:ct=\E3:dc=\EW:dl=\ER:do=^V:\
 	:ds=\Eh:ei=:fs=^M\Eg:ho=^^:ic=\EQ:im=:k0=^AI\r:\
 	:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:\
-	:k6=^AE\r:k7=^AF\r:k8=^AG\r:k9=^AH\r:kb=^H:kd=^V:\
-	:kh=^^:kl=^H:kr=^L:ku=^K:le=^H:se=\EG0:sf=^J:so=\EG4:\
-	:st=\E1:ta=^I:ts=\Eh\Ef:ue=\EG0:up=^K:us=\EG8:\
-	:vb=\Eb\Ed:ve=\E.4:vs=\E.2:
-tvi925vb|925vb|televideo model 925 visual bells:\
-	:vb=\Eb\200\200\200\200\200\200\200\200\200\200\200\200\200\200\200\Ed:tc=tvi925:
-# Since the 925 uses a character position to store the escape sequences to go
-# in and out of both stand out and underline modes, screen positioning is
-# difficult.  The following 925 entries don't use these modes.
-tvi925n|925n|televideo model 925 no standout or underline:\
-	:se@:so@:ue@:us@:tc=tvi925:
-tvi925vbn|925vbn|televideo model 925 visual bells no so or ul:\
-	:vb=\Eb\200\200\200\200\200\200\200\200\200\200\200\200\200\200\200\Ed:tc=tvi925n:
-
-# From: Tim Curry, Univ. of Central Fla. <duke!ucf-cs!tim> 5/21/82 
-# (tvi925a: removed obsolete ":kn#12:"; mapped ":pt:" to ":it#8:" --esr)
-tvi925a|925a|TeleVideo Model 925:\
-	:am:bs:bw:pt:\
-	:co#80:it#8:li#24:sg#1:ug#1:\
-	:al=\EE:bt=\EI:cd=\EY:ce=\ET:cl=^Z:cm=\E=%+ %+ :\
-	:dc=\EW:dl=\ER:do=^V:ei=:ic=\EQ:\
-	:if=/usr/share/tabset/std:im=:is=\El:kb=^H:kd=^V:\
-	:kh=^^:kl=^H:kr=^L:ku=^K:nd=^L:se=\EG0:so=\EG4:\
-	:ue=\EG0:up=^K:us=\EG8:\
-	:vb=\Eb\200\200\200\200\200\200\200\200\200\200\200\200\200\200\Ed:\
-	:ve=\E.4:vs=\E.2:
+	:k6=^AE\r:k7=^AF\r:k8=^AG\r:k9=^AH\r:kD=\EW:kI=\EQ:\
+	:kb=^H:kd=^V:kh=^^:kl=^H:kr=^L:ku=^K:le=^H:nd=^L:\
+	:se=\EG0:sf=^J:so=\EG4:st=\E1:ta=^I:ts=\Eh\Ef:\
+	:ue=\EG0:up=^K:us=\EG8:vb=\Eb\Ed:ve=\E.4:vs=\E.2:
 
 # 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
@@ -2468,22 +2992,94 @@ tvi925a|925a|TeleVideo Model 925:\
 #	start-protected field delimiter (\Ex2\200\200)
 #	end-protected field delimiter (\Ex3\200\200)
 # set end of text delimiter to carriage return/null (\Ex4\r\200)
-# (tvi950: early versions had ":ko=ic,dc,al,dl,cl,bt,ce,cd:"
-# and ":ma=^Vj^Kk^Hh^Ll^^H:". I mapped ":pt:" to ":it#8:";
-#
-tvi950|950|televideo950:\
-	:am:bs:hs:mi:ms:pt:xn:xo:\
-	:co#80:li#24:sg#1:ug#1:\
+# 
+#                     TVI 950 Switch Setting Reference Charts
+# 
+#                                     TABLE 1:
+# 
+#      S1     1     2     3     4     5     6     7     8     9    10
+#          +-----------------------+-----+-----+-----------------------+
+#          | Computer Baud Rate    |Data |Stop | Printer Baud Rate     |
+#          |                       |Bits |Bits |                       |
+#   +------+-----------------------+-----+-----+-----------------------+
+#   |  Up  |        See            |  7  |  2  |        See            |
+#   +------+-----------------------+-----+-----+-----------------------+
+#   | Down |      TABLE 2          |  8  |  1  |      TABLE 2          |
+#   +------+-----------------------+-----+-----+-----------------------+
+# 
+# 
+#      S2     1     2     3     4     5     6     7     8     9    10
+#          +-----+-----+-----------------+-----+-----------+-----+-----+
+#          |Edit |Cursr|    Parity       |Video|Transmiss'n| Hz  |Click|
+#   +------+-----+-----+-----------------+-----+-----------+-----+-----+
+#   |  Up  | Dplx|Blink|      See        |GonBk|   See     | 60  | Off |
+#   +------+-----+-----+-----------------+-----+-----------+-----+-----+
+#   | Down |Local|St'dy|    TABLE 3      |BkonG|  CHART    | 50  | On  |
+#   +------+-----+-----+-----------------+-----+-----------+-----+-----+
+#  
+#                                    TABLE 2:
+# 
+#             +-----------+-----+-----+-----+-----+-----------+
+#             | Display   |  1  |  2  |  3  |  4  |   Baud    |
+#             +-----------+-----+-----+-----+-----+           |
+#             | Printer   |  7  |  8  |  9  | 10  |   Rate    |
+#             +-----------+-----+-----+-----+-----+-----------+
+#                         |  D  |  D  |  D  |  D  |   9600    |
+#                         |  U  |  D  |  D  |  D  |     50    |
+#                         |  D  |  U  |  D  |  D  |     75    |
+#                         |  U  |  U  |  D  |  D  |    110    |
+#                         |  D  |  D  |  U  |  D  |    135    |
+#                         |  U  |  D  |  U  |  D  |    150    |
+#                         |  D  |  U  |  U  |  D  |    300    |
+#                         |  U  |  U  |  U  |  D  |    600    |
+#                         |  D  |  D  |  D  |  U  |   1200    |
+#                         |  U  |  D  |  D  |  U  |   1800    |
+#                         |  D  |  U  |  D  |  U  |   2400    |
+#                         |  U  |  U  |  D  |  U  |   3600    |
+#                         |  D  |  D  |  U  |  U  |   4800    |
+#                         |  U  |  D  |  U  |  U  |   7200    |
+#                         |  D  |  U  |  U  |  U  |   9600    |
+#                         |  U  |  U  |  U  |  U  |  19200    |
+#                         +-----+-----+-----+-----+-----------+
+# 
+#                                    TABLE 3:
+#                         +-----+-----+-----+-----------+
+#                         |  3  |  4  |  5  |   Parity  |
+#                         +-----+-----+-----+-----------+
+#                         |  X  |  X  |  D  |    None   |
+#                         |  D  |  D  |  U  |     Odd   |
+#                         |  D  |  U  |  U  |    Even   |
+#                         |  U  |  D  |  U  |    Mark   |
+#                         |  U  |  U  |  U  |   Space   |
+#                         +-----+-----+-----+-----------+
+#                                 X = don't care
+# 
+#                                     CHART:
+#                         +-----+-----+-----------------+
+#                         |  7  |  8  | Communication   |
+#                         +-----+-----+-----------------+
+#                         |  D  |  D  |  Half Duplex    |
+#                         |  D  |  U  |  Full Duplex    |
+#                         |  U  |  D  |     Block       |
+#                         |  U  |  U  |     Local       |
+#                         +-----+-----+-----------------+
+# 
+# (tvi950: early versions had obsolete ":ma=^Vj^Kk^Hh^Ll^^H:". 
+# 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
+# -- esr) 
+tvi950|950|televideo 950:\
+	:am:hs:mi:ms:xn:xo:\
+	:co#80:it#8:li#24:sg#1:ug#1:\
 	:ae=^X:al=\EE:as=^U:bl=^G:bt=\EI:cd=\Ey:ce=\Et:\
 	:cl=\E*:cm=\E=%+ %+ :cr=^M:ct=\E3:dc=\EW:dl=\ER:\
-	:do=^J:ds=\Eg\Ef\r:ei=\Er:fs=^M:ho=^^:im=\Eq:\
+	:do=^J:ds=\Eg\Ef\r:ei=\Er:fs=^M:ho=^^:ic=\EQ:im=\Eq:\
 	:is=\EDF\EC\Ed\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\Ef\r:\
 	:k0=^A0\r:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:\
-	:k5=^AD\r:k6=^AE\r:k7=^AF\r:k8=^AG\r:k9=^AH\r:kb=^H:\
-	:kd=^V:kh=^^:kl=^H:kr=^L:ku=^K:le=^H:nd=^L:pf=\Ea:\
-	:po=\E`:se=\EG0:sf=^J:so=\EG4:sr=\Ej:st=\E1:ta=^I:\
-	:ts=\Eg\Ef:ue=\EG0:up=^K:us=\EG8:\
-	:vb=\Eb\200\200\200\200\200\200\200\200\200\200\200\200\200\200\200\Ed:
+	:k5=^AD\r:k6=^AE\r:k7=^AF\r:k8=^AG\r:k9=^AH\r:kD=\EW:\
+	:kI=\EQ:kb=^H:kd=^V:kh=^^:kl=^H:kr=^L:ku=^K:le=^H:\
+	:nd=^L:se=\EG0:sf=^J:so=\EG4:sr=\Ej:st=\E1:ta=^I:\
+	:ts=\Eg\Ef:ue=\EG0:up=^K:us=\EG8:vb=\Eb\Ed:
 #
 # is for 950 with two pages adds the following:
 #	set 48 line page (\E\\2)
@@ -2514,59 +3110,52 @@ tvi950-4p|950-4p|televideo950 w/4 pages:\
 	:is=\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:\
 	:ke=\Ek:ks=\El:te=\E\\3\E-07 :ti=\E\\1\E-07 :tc=tvi950:
 #
-# is for reverse video 950 changes the following:
+# <is2> for reverse video 950 changes the following:
 #	set reverse video (\Ed)
 #
-# set vb accordingly (\Ed ...nulls... \Eb)
+# set vb accordingly (\Ed ...delay... \Eb)
 #
 tvi950-rv|950-rv|televideo950 rev video:\
 	:is=\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:\
-	:vb=\Ed\200\200\200\200\200\200\200\200\200\200\200\200\200\200\200\Eb:tc=tvi950:
-#
-# uses the appropriate entries from 950-2p and 950-rv
-#
+	:vb=\Ed\Eb:tc=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:\
 	:is=\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 :\
 	:ke=\Ek:ks=\El:te=\E\\2\E-07 :ti=\E\\1\E-07 :\
-	:vb=\Ed\200\200\200\200\200\200\200\200\200\200\200\200\200\200\200\Eb:tc=tvi950:
-#
-# uses the appropriate entries from 950-4p and 950-rv
-#
+	:vb=\Ed\Eb:tc=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:\
 	:is=\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 :\
 	:ke=\Ek:ks=\El:te=\E\\3\E-07 :ti=\E\\1\E-07 :\
-	:vb=\Ed\200\200\200\200\200\200\200\200\200\200\200\200\200\200\200\Eb:tc=tvi950:
+	:vb=\Ed\Eb:tc=tvi950:
 # From: Andreas Stolcke <stolcke@icsi.berkeley.edu>
-# (tvi955: removed obsolete ":ko=ic,dc,al,dl,cl,bt,ce,cd:ma:=^Vj^Kk^Hh^Ll^^H";
-# mapped ":pt:" to ":it#8:"; removed incorrect (and overridden) ":do=^J:";
-# fixed broken continuations in the :rs: string -- esr)
-tvi955|televideo955:\
-	:am:bs:hs:mi:pt:xn:xo:\
-	:co#80:it#8:li#24:\
-	:ae=\E%:al=\EE:as=\E$:bt=\EI:cd=\Ey:ce=\Et:cl=\E*:\
-	:cm=\E=%+ %+ :ct=\E3:dc=\EW:dl=\ER:do=^V:ds=\Eg\Ef\r:\
-	:ei=\Er:fs=^M:ho=^^:im=\Eq:\
-	:is=\E[=3l\EF1\Ed\EG0\E[=5l\E%\El:k0=^A0\r:k1=^A@\r:\
-	:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:k6=^AE\r:\
-	:k7=^AF\r:k8=^AG\r:k9=^AH\r:kb=^H:kd=^V:kh=^^:kl=^H:\
-	:kr=^L:ku=^K:le=^H:mb=\EG2:me=\EG0\E[=5l:mh=\E[=5h:\
-	:mk=\EG1:mr=\EG4:nd=^L:pf=\Ea:po=\E`:ps=\EP:\
-	:rs=\EDF\EC\Eg\Er\EO\E'\E(\Ew\EX\Ee \017\E0P\E6\200\E0p\E4\200\Ef\r:\
-	:se=\EG0:so=\EG4:sr=\Ej:st=\E1:ts=\Eg\Ef:ue=\EG0:\
-	:up=^K:us=\EG8:\
-	:vb=\Eb\200\200\200\200\200\200\200\200\200\200\200\200\200\200\200\Ed:\
-	:ve=\E.2:vi=\E.0:vs=\E.1:
+# (tvi955: removed obsolete ":ma:=^Vj^Kk^Hh^Ll^^H";
+# removed incorrect (and overridden) ":do=^J:"; fixed broken continuations in
+# the :rs: string, inserted the <ich> implied by the termcap :ko: string.  Note
+# the :ko: string had :cl: in it, which means that one of the original
+# <clear>=\E*, <kclr>=\EY had to be wrong; set <kclr>=\E* because that's what
+# the 950 has.   Finally, corrected the <kel> string to match the 950 and what
+# ko implies -- esr)
+tvi955|televideo 955:\
+	:ms@:\
+	:it#8:sg@:\
+	:ae=\E%:as=\E$:cm=\E[%i%d;%dH:do=^V:\
+	:is=\E[=3l\EF1\Ed\EG0\E[=5l\E%\El:kN=\EK:kP=\EJ:\
+	:mb=\EG2:me=\EG0\E[=5l:mh=\E[=5h:mr=\EG4:sf@:ve=\E.2:\
+	:vi=\E.0:vs=\E.1:tc=tvi950:
 tvi955-w|955-w|televideo955 w/132 cols:\
 	:co#132:\
-	:cm=\E[%i%d;%dH:is=\E[=3h\EF1\Ed\EG0\E[=5l\E%\El:tc=tvi955:
-# use half-intensity as normal mode, full intensity as bold (md)
+	:is=\E[=3h\EF1\Ed\EG0\E[=5l\E%\El:tc=tvi955:
+# use half-intensity as normal mode, full intensity as <bold>
 tvi955-hb|955-hb|televideo955 half-bright:\
 	:is=\E[=3l\EF1\Ed\EG0\E[=5h\E%\El:md=\E[=5l:\
 	:me=\EG0\E[=5h:mh@:tc=tvi955:
 # From: Humberto Appleton <beto@cs.utexas.edu>, 880521 UT Austin
-# (tvi970: removed ":sg#0:"; mapped ":pt:" to ":it#8:" -- esr)
-tvi970|televideo970:\
-	:bs:da:db:mi:ms:pt:\
+# (tvi970: removed ":sg#0:" -- esr)
+tvi970|televideo 970:\
+	:da:db:mi:ms:\
 	:co#80:it#8:li#24:\
 	:ae=\E(B:al=\E[L:as=\E(B:bt=\E[Z:cd=\E[0J:ce=\E[0K:\
 	:cl=\E[H\E[2J:cm=\E[%i%d;%df:dc=\E[P:dl=\E[M:do=\ED:\
@@ -2574,89 +3163,91 @@ tvi970|televideo970:\
 	:is=\E<\E[?21l\E[19h\E[1Q\E[10l\E[7l\E[H\E[2J:\
 	:k1=\E?a:k2=\E?b:k3=\E?c:k4=\E?d:k5=\E?e:k6=\E?f:\
 	:k7=\E?g:k8=\E?h:k9=\E?i:kb=^H:kd=\E[B:kh=\E[H:\
-	:kl=\E[D:kr=\E[C:ku=\E[A:nd=\E[C:se=\E[0m:so=\E[7m:\
-	:sr=\EM:ue=\E[0m:up=\EM:us=\E[4m:\
+	:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:nd=\E[C:se=\E[m:\
+	:so=\E[7m:sr=\EM:ta=^I:ue=\E[m:up=\EM:us=\E[4m:\
 	:vb=\E[5;m\200\200\200\200\200\200\200\200\200\E[0;m:\
 	:vs=\E[1Q:
-# From Gene Rochlin <armsis@amber> 9/19/84. 
 # 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 :so: and :us:
 # strings are klutzy, but at least use no screen space.
-# (tvipt: removed obsolete ":ma=^Kk^Ll^R^L:" -- esr)
-tvipt|televideopt:\
-	:am:bs:\
+# (tvipt: removed obsolete ":ma=^Kk^Ll^R^L:".  I wish we knew <rmam>. -- esr)
+# From: Gene Rochlin <armsis@amber.berkeley.edu> 9/19/84. 
+tvipt|televideo personal terminal:\
+	:am:\
 	:co#80:li#24:\
 	:al=\EE<5*>:bt=\EI:ce=\ET:cl=^Z:cm=\E=%+ %+ :\
 	:dl=\ER<5*>:ho=^^:if=/usr/share/tabset/stdcrt:\
-	:is=\Ev\Eu\EK:kb=^H:kd=^J:kl=^H:kr=^L:ku=^K:nd=^L:\
-	:se=\EF:so=\EG1@A\EH:ue=\EF:up=^K:us=\EG1B@\EH:
+	:is=\Ev\Eu\EK:kb=^H:kd=^J:kl=^H:kr=^L:ku=^K:le=^H:\
+	:nd=^L:se=\EF:so=\EG1@A\EH:ue=\EF:up=^K:us=\EG1B@\EH:
 
 #### Visual (vi)
 #
 
-# (vi50: mapped ":pt:" to default 8-char tabs -- esr)
+# 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.
 vi50|visual 50:\
-	:am:bs:ms:pt:\
-	:co#80:li#24:\
+	:am:ms:\
+	:co#80:it#8:li#24:\
+	:al=\EL:bt=4\Ez:cd=\Ek:ce=16\EK:cl=\Ev:cm=\EY%+ %+ :\
+	:cr=^M:dl=3*\EM:do=\EB:ho=\EH:k1=\EP:k2=\EQ:k3=\ER:\
+	:k4=\EV:k5=\EE:k6=\E]:k7=\EL:k8=\Ev:k9=\EM:kb=^H:\
+	:kd=\EB:kh=\EH:kl=\ED:kr=\EC:ku=\EA:le=^H:nd=\EC:\
+	:nw=^M^J:sf=^J:ta=^I:up=\EA:
+# this one was BSD & SCO's vi50
+vi50adm|visual 50 in adm3a mode:\
+	:am:ms:\
+	:co#80:it#8:li#24:\
 	:al=\EL:bl=^G:cd=\Ek:ce=\EK:cl=^Z:cm=\E=%+ %+ :cr=^M:\
 	:dl=\EM:do=^J:ho=\EH:kb=^H:kd=\EB:kh=\EH:kl=\ED:\
 	:kr=\EC:ku=\EA:le=^H:nd=^L:se=\ET:sf=^J:so=\EU:ta=^I:\
 	:up=^K:
 # From: Jeff Siegal <jbs@athena.mit.edu>
-# (vi55: mapped ":pt:" to ":it#8:" -- esr)
 vi55|Visual 55:\
-	:am:bs:mi:ms:pt:\
+	:am:mi:ms:\
 	:co#80:it#8:li#24:\
 	:al=\EL:cd=\EJ:ce=\EK:cl=\Ev:cm=\EY%+ %+ :\
 	:cs=\E_%+A%+A:dc=\Ew:dl=\EM:do=^J:ei=\Eb:ho=\EH:\
 	:im=\Ea:is=\Ev\E_AX\Eb\EW\E9P\ET:kb=^H:kd=\EB:kl=\ED:\
 	:kr=\EC:ku=\EA:le=^H:nd=\EC:se=\ET:so=\EU:sr=\EI:\
-	:up=\EA:
+	:ta=^I:up=\EA:
 
 # 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: mapped ":pt:" to default 8-char tabbing -- esr)
 vi200|vis200|visual 200 with function keys:\
-	:am:bs:pt:\
-	:co#80:li#24:\
+	:am:\
+	:co#80:it#8:li#24:\
 	:al=\EL:bl=^G:cd=\Ey:ce=\Ex:cl=\Ev:cm=\EY%+ %+ :\
-	:cr=^M:dc=\EO:dl=\EM:do=^J:ei=:ho=\EH:ic=\Ei \010\Ej:\
-	:im=:is=\E3\Eb\Ej\E\\\El\EG\Ec\Ek:k0=\EP:k1=\EQ:\
-	:k2=\ER:k3=\E :k4=\E!:k5=\E":k6=\E#:k7=\E$:k8=\E%:\
-	:k9=\E&:kd=\EB:kh=\EH:kl=\ED:kr=\EC:ku=\EA:le=^H:\
-	:nd=\EC:se=\E3:sf=^J:so=\E4:sr=\EI:ta=^I:up=\EA:\
-	:ve=\Ec:vs=\Ed:
-vi200-rv-ic|visual 200 reverse video using insert char:\
-	:ei=\Ej:ic@:im=\Ei:tc=vi200-rv:
+	:cr=^M:dc=\EO:dl=\EM:do=^J:ei=\Ej:ho=\EH:im=\Ei:\
+	:is=\E3\Eb\Ej\E\\\El\EG\Ec\Ek:k0=\EP:k1=\EQ:k2=\ER:\
+	:k3=\E :k4=\E!:k5=\E":k6=\E#:k7=\E$:k8=\E%:k9=\E&:\
+	:kd=\EB:kh=\EH:kl=\ED:kr=\EC:ku=\EA:le=^H:nd=\EC:\
+	:se=\E3:sf=^J:so=\E4:sr=\EI:ta=^I:up=\EA:ve=\Ec:\
+	:vs=\Ed:
 # The older Visuals didn't come with function keys. This entry uses
-# ks and ke so that the keypad keys can be used as function keys.
+# <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: mapped ":pt:" to ":it#8:" -- esr)
 vi200-f|visual|visual 200 no function keys:\
-	:am:bs:pt:\
-	:co#80:it#8:li#24:\
-	:al=\EL:bl=^G:cd=\Ey:ce=\Ex:cl=\Ev:cm=\EY%+ %+ :\
-	:cr=^M:dc=\EO:dl=\EM:do=^J:ei=:ho=\EH:ic=\Ei \010\Ej:\
-	:im=:is=\E3\Eb\Ej\E\\\El\EG\Ed\Ek:k0=\E?p:k1=\E?q:\
+	:is=\E3\Eb\Ej\E\\\El\EG\Ed\Ek:k0=\E?p:k1=\E?q:\
 	:k2=\E?r:k3=\E?s:k4=\E?t:k5=\E?u:k6=\E?v:k7=\E?w:\
-	:k8=\E?x:k9=\E?y:kd=\EB:ke=\E>:kh=\EH:kl=\ED:kr=\EC:\
-	:ks=\E=:ku=\EA:le=^H:nd=\EC:sf=^J:sr=\EI:ta=^I:\
-	:up=\EA:ve=\Ec:vs=\Ed:
+	:k8=\E?x:k9=\E?y:ke=\E>:ks=\E=:se@:so@:tc=vi200:
 vi200-rv|visual 200 reverse video:\
 	:se=\E3:so=\E4:sr@:ve@:vs@:tc=vi200:
-vi200-ic|visual 200 using insert char:\
-	:ei=\Ej:ic@:im=\Ei:tc=vi200:
 
-# the function keys are programmable but we don't reprogram
-# them to their default values with "is" because programming
-# them is very verbose. maybe an "if" file should be made for
-# the 300 and they could be stuck in it.
+# the function keys are programmable but we don't reprogram them to their
+# default values with <is2> because programming them is very verbose. maybe
+# an initialization file should be made for the 300 and they could be stuck
+# in it.
+# (vi300: added <rmam>/<smam> based on init string -- esr)
 vi300|visual 300 ansi x3.64:\
 	:am:bw:mi:xn:\
 	:co#80:li#24:\
@@ -2669,43 +3260,46 @@ vi300|visual 300 ansi x3.64:\
 	:k9=\E_I\E\\:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:\
 	:le=^H:nd=\E[C:se=\E[m:sf=^J:so=\E[1m:sr=\EM:ta=^I:\
 	:ue=\E[m:up=\E[A:us=\E[4m:
-vi300-rv|visual 300 reverse video:\
-	:bl=^G:cr=^M:do=^J:\
-	:is=\E[7s\E[2;3;4;20;?6l\E[12;?5;?7h\E[1Q\E[0;1(D\E[8s:\
-	:sf=^J:tc=vi300:
-# slow scroll doesn't work that well; if you type on the
-# keyboard while the terminal is scrolling it drops characters
-vi300-ss|visual 300 slow scroll:\
-	:bl=^G:cr=^M:do=^J:sf=^J:ve=\E[?4h:vs=\E[?4l:tc=vi300:
 # some of the vi300s have older firmware that has the command
 # sequence for setting editing extent reversed.
-ovi300|visual 300 old:\
-	:bl=^G:cr=^M:do=^J:\
-	:is=\E[7s\E[2;3;4;20;?5;?6l\E[12;?7h\E[2Q\E[0;1(D\E[8s:\
-	:sf=^J:tc=vi300:
-# if your version of ex/vi doesn't correctly implement xn
-# use this termcap for the vi300
-vi300-aw|visual 300 no autowrap:\
-	:am@:xn@:\
-	:ve=\E[?7h:vs=\E[?7l:tc=vi300:
-
-# the visual 550 is a visual 300 with tektronix graphics,
+vi300-old|visual 300 with old firmware (set edit extent reversed):\
+	:is=\E[7s\E[2;3;4;20;?5;?6l\E[12;?7h\E[2Q\E[0;1(D\E[8s:tc=vi300:
+
+# Visual 500 prototype entry from University of Wisconsin.
+# The best place to look for the escape sequences is page A1-1 of the
+# Visual 500 manual.  The initialization sequence given here may be
+# overkill, but it does leave out some of the initializations which can
+# be done with the menus in set-up mode.
+# The :xp: line below is so that emacs can understand the padding requirements
+# of this slow terminal.  :xp: is 10 time the padding factor.
+# (vi500: removed unknown :xp#4: termcap -- esr)
+vi500|visual 500:\
+	:am:mi:ms:\
+	:co#80:it#8:li#33:\
+	:ae=^O:al=3*\EL\Ex:as=^N:bt=4\Ez:cd=3*\Ey:ce=16\Ex:\
+	:cl=6*\Ev:cm=\EY%+ %+ :cr=^M:cs=\E(%+ %+ :dc=3*\EO:\
+	:dl=3*\EM:do=\EB:ei=\Ej:ho=\EH:im=\Ei:\
+	:is=\E3\E\001\E\007\E\003\Ek\EG\Ed\EX\El\E>\Eb\E\\:\
+	:kb=^H:kd=\EB:kh=\EH:kl=\ED:kr=\EC:ku=\EA:le=^H:\
+	:nd=\EC:nw=^M^J:se=\E^G:sf=^J:so=\E^H:ta=8\011:\
+	:ue=\E^C:up=\EA:us=\E^D:
+
+# The visual 550 is a visual 300 with tektronix graphics,
 # and with 33 lines. clear screen is modified here to
 # also clear the graphics.
 vi550|visual 550 ansi x3.64:\
 	:li#33:\
-	:bl=^G:cl=\030\E[H\E[2J:cr=^M:do=^J:sf=^J:tc=vi300:
+	:cl=\030\E[H\E[2J:tc=vi300:
 
-# (vi603: this had ":sb=\EM:"; sb is undefined, prob. an error for sr -- esr)
 vi603|visual603|visual 603:\
 	:hs:mi:\
 	:al=\E[L:bl=^G:cd=\E[J:ce=\E[K:cl=\E[H\E[J:\
 	:cm=\E[%i%d;%dH:cs=\E[%i%d;%dr:dc=\E[P:dl=\E[M:\
-	:ds=\EP2;1~\E\\:ei=\E[4l:fs=\E\\:im=\E[4h:\
-	:is=\E>\E[?3l\E[?4l\E[?7h\E[?8h\E[1;24r\E[24;1H:\
+	:ds=\EP2;1~\E\\:ei=\E[4l:fs=\E\\:\
+	:i1=\E>\E[?3l\E[?4l\E[?7h\E[?8h\E[1;24r:im=\E[4h:\
 	:mb=\E[5m:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:\
-	:rs=\E>\E[?3l\E[?4l\E[?7h\E[?8h:se=\E[27m:sf=\ED:\
-	:so=\E[7m:sr=\EM:ts=\EP2~:ue=\E[24m:up=\E[A:us=\E[4m:tc=vt100:
+	:se=\E[27m:sf=\ED:so=\E[7m:sr=\EM:ts=\EP2~:ue=\E[24m:\
+	:up=\E[A:us=\E[4m:tc=vt100:
 
 #### Wyse (wy)
 #
@@ -2720,9 +3314,8 @@ vi603|visual603|visual 603:\
 #
 # All the following entries until (but not including) wy100q are direct from
 # Wyse technical support and represent their best knowledge as of January 1995.
-# I made two trivial syntax fixes in the wyse30 entry, added OTbs everywhere
-# needed, and merged in OTug#1 entries (as indicated by the termcap version of
-# their descriptions).
+# I canceled the bel capacities in the vb entries.
+# I made two trivial syntax fixes in the wyse30 entry.
 #
 # Note: The wyse75, wyse85, and wyse99 have been discontinued.
 
@@ -2734,19 +3327,19 @@ vi603|visual603|visual 603:\
 #	should be used.
 #
 wy30|wyse30|Wyse 30:\
-	:am:bs:bw:hs:mi:ms:xo:\
-	:co#80:li#24:ma#1:ug#1:ws#45:\
+	:am:bw:hs:mi:ms:xo:\
+	:co#80:li#24:ma#1:ws#45:\
 	:ae=\EH^C:al=\EE:as=\EH^B:bl=^G:bt=\EI:cd=\EY:ce=\ET:\
 	:cl=\E+:cm=\E=%+ %+ :cr=^M:ct=\E0:dc=\EW:dl=\ER:\
 	:do=^J:ds=\EF\r:ei=\Er:fs=^M:ho=^^:im=\Eq:ip=:\
 	:is=\E'\E(\E^3\E`9\016\024:k1=^A@\r:k2=^AA\r:\
 	:k3=^AB\r:k4=^AC\r:k5=^AD\r:k6=^AE\r:k7=^AF\r:\
-	:k8=^AG\r:kb=^H:kd=^J:kh=^^:kl=^H:kr=^L:ku=^K:le=^H:\
-	:ll=^^^K:me=\E(\EH\003:mh=\E`7\E):mp=\E`7\E):nd=^L:\
-	:nw=^M^J:pf=^T:po=^X:ps=\EP:\
+	:k8=^AG\r:kD=\EW:kI=\EQ:kN=\EK:kP=\EJ:kb=^H:kd=^J:\
+	:kh=^^:kl=^H:kr=^L:ku=^K:le=^H:ll=^^^K:me=\E(\EH\003:\
+	:mh=\E`7\E):nd=^L:nw=^M^J:\
 	:..sa=%?%p1%p5%p8%|%|%t\E`7\E)%e\E(%;%?%p9%t\EH\002%e\EH\003%;:\
 	:se=\E(:sf=\n:so=\E`7\E):sr=\Ej:st=\E1:ta=\011:\
-	:ts=\EF:up=^K:ve=\E`1:vi=\E`0:
+	:ts=\EF:up=^K:vb=\E`8\E`9:ve=\E`1:vi=\E`0:
 #
 #	This terminal description uses the non-hidden attribute mode
 #	(with magic cookie).
@@ -2755,16 +3348,15 @@ wy30-mc|wyse30-mc|wyse 30 with magic cookies:\
 	:ms@:\
 	:ma@:sg#1:ug#1:\
 	:ae=\EG0\EH\003:as=\EG0\EH\002:mb=\EG2:\
-	:me=\EG0\E(\EH\003:mh=\EGp:mk=\EG1:mp=\EG0\E):\
-	:mr=\EG4:\
+	:me=\EG0\E(\EH\003:mh=\EGp:mr=\EG4:\
 	:..sa=\EG%'0'%?%p2%p6%|%t%{8}%|%;%?%p1%p3%|%p6%|%t%{4}%|%;%?%p4%t%{2}%|%;%?%p1%p5%|%t%{64}%|%;%?%p7%t%{1}%|%;%c%?%p8%t\E)%e\E(%;%?%p9%t\EH\002%e\EH\003%;:\
 	:se=\EG0:so=\EG4:te=\EG0:ue=\EG0:us=\EG8:tc=wy30:
-#	The manditorary pause used by flash does not work with
+#	The mandatory pause used by <flash> does not work with
 #	older versions of terminfo.  If you see this effect then
 #	unset xon and delete the / from the delay.
 #	i.e. change $<100/> to $<100>
 wy30-vb|wyse30-vb|wyse 30 visible bell:\
-	:vb=\E`8\E`9:tc=wy30:
+	:bl@:tc=wy30:
 #
 #	   The Wyse 50 can support one attribute (e.g. Dim, Inverse,
 #	Normal) without magic cookies by using the protect mode.
@@ -2776,43 +3368,41 @@ wy30-vb|wyse30-vb|wyse 30 visible bell:\
 #	to correctly handle multiple attributes on a screen.
 #
 wy50|wyse50|Wyse 50:\
-	:am:bs:bw:hs:mi:ms:xo:\
+	:am:bw:hs:mi:ms:xo:\
 	:co#80:li#24:ma#1:ws#45:\
 	:ae=\EH^C:al=\EE:as=\EH^B:bl=^G:bt=\EI:cd=\EY:ce=\ET:\
 	:cl=\E+:cm=\E=%+ %+ :cr=^M:ct=\E0:dc=\EW:dl=\ER:\
 	:do=^J:ds=\EF\r:ei=\Er:fs=^M:ho=^^:i1=\E`\072\E`9:\
 	:im=\Eq:ip=:is=\016\024\E'\E(:k1=^A@\r:k2=^AA\r:\
 	:k3=^AB\r:k4=^AC\r:k5=^AD\r:k6=^AE\r:k7=^AF\r:\
-	:k8=^AG\r:k9=^AH\r:kb=^H:kd=^J:kh=^^:kl=^H:kr=^L:\
-	:ku=^K:le=^H:ll=^^^K:me=\E(\EH\003:mh=\E`7\E):\
-	:mp=\E`7\E):mr=\E`6\E):nd=^L:nw=^M^J:pf=^T:po=^X:\
-	:ps=\EP:\
+	:k8=^AG\r:k9=^AH\r:kD=\EW:kI=\EQ:kN=\EK:kP=\EJ:kb=^H:\
+	:kd=^J:kh=^^:kl=^H:kr=^L:ku=^K:le=^H:ll=^^^K:\
+	:me=\E(\EH\003:mh=\E`7\E):mr=\E`6\E):nd=^L:nw=^M^J:\
 	:..sa=%?%p1%p3%|%t\E`6\E)\n%e%p5%p8%|%t\E`7\E)%e\E(%;\n%?%p9%t\EH\002%e\EH\003%;:\
 	:se=\E(:sf=\n:so=\E`6\E):sr=\Ej:st=\E1:ta=^I:ts=\EF:\
-	:up=^K:ve=\E`1:vi=\E`0:
+	:up=^K:vb=\E`8\E`9:ve=\E`1:vi=\E`0:
 #
 #	This terminal description uses the non-hidden attribute mode
 #	(with magic cookie).
 #
+#	The mandatory pause used by flash does not work with some
+#	older versions of terminfo.  If you see this effect then
+#	unset <xon> and delete the / from the delay.
+#	i.e. change $<100/> to $<100>
 wy50-mc|wyse50-mc|wyse 50 with magic cookies:\
 	:ms@:\
 	:ma@:sg#1:ug#1:\
 	:ae=\EG0\EH\003:as=\EG0\EH\002:mb=\EG2:\
-	:me=\EG0\E(\EH\003:mh=\EGp:mk=\EG1:mp=\EG0\E):\
-	:mr=\EG4:\
+	:me=\EG0\E(\EH\003:mh=\EGp:mr=\EG4:\
 	:..sa=\EG%'0'%?%p2%p6%|%t%{8}%|%;%?%p1%p3%|%p6%|%t%{4}%|%;%?%p4%t%{2}%|%;%?%p1%p5%|%t%{64}%|%;%?%p7%t%{1}%|%;%c%?%p8%t\E)%e\E(%;%?%p9%t\EH\002%e\EH\003%;:\
 	:se=\EG0:so=\EGt:te=\EG0:ue=\EG0:us=\EG8:tc=wy50:
-#	The mandatory pause used by flash does not work with
-#	older versions of terminfo.  If you see this effect then
-#	unset xon and delete the / from the delay.
-#	i.e. change $<100/> to $<100>
 wy50-vb|wyse50-vb|wyse 50 visible bell:\
-	:vb=\E`8\E`9:tc=wy50:
+	:bl@:tc=wy50:
 wy50-w|wyse50-w|wyse 50 132-column:\
 	:co#132:ws#97:\
 	:cm=\Ea%i%dR%dC:dc=\EW:i1=\E`;\E`9:tc=wy50:
 wy50-wvb|wyse50-wvb|wyse 50 132-column visible bell:\
-	:vb=\E`8\E`9:tc=wy50-w:
+	:bl@:tc=wy50-w:
 #
 #	The Wyse 350 is a Wyse 50 with color.
 #	Unfortunately this means that it has magic cookies.
@@ -2830,32 +3420,34 @@ wy50-wvb|wyse50-wvb|wyse 50 132-column visible bell:\
 #	sure that the wy350 runs better with this terminfo than it does
 #	with the wy50 terminfo (with user adjusted colors).
 #
+#	The mandatory pause used by flash does not work with
+#	older versions of terminfo.  If you see this effect then
+#	unset xon and delete the / from the delay.
+#	i.e. change $<100/> to $<100>
+#
 wy350|wyse350|Wyse 350:\
-	:am:bs:bw:hs:mi:xo:\
+	:am:bw:hs:mi:xo:\
 	:co#80:li#24:sg#1:ug#1:ws#45:\
 	:ae=\EG0\EH\003:al=\EE:as=\EG0\EH\002:bl=^G:bt=\EI:\
 	:cd=\EY:ce=\ET:cl=\E+:cm=\E=%+ %+ :cr=^M:ct=\E0:\
 	:dc=\EW:dl=\ER:do=^J:ds=\EF\r:ei=\Er:fs=^M:ho=^^:\
 	:i1=\E`\072\E`9:i2=\E%?:im=\Eq:ip=:is=\016\024\E'\E(:\
 	:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:\
-	:k6=^AE\r:k7=^AF\r:k8=^AG\r:k9=^AH\r:kb=^H:kd=^J:\
-	:kh=^^:kl=^H:kr=^L:ku=^K:le=^H:ll=^^^K:mb=\EG2:\
-	:me=\EG0\E(\EH\003%{0}%PA%{0}%PC:mh=\EGp:mk=\EG1:\
-	:mp=\EG0\E):mr=\EG4:nd=^L:nw=^M^J:pf=^T:po=^X:ps=\EP:\
+	:k6=^AE\r:k7=^AF\r:k8=^AG\r:k9=^AH\r:kD=\EW:kI=\EQ:\
+	:kN=\EK:kP=\EJ:kb=^H:kd=^J:kh=^^:kl=^H:kr=^L:ku=^K:\
+	:le=^H:ll=^^^K:mb=\EG2:\
+	:me=\EG0\E(\EH\003%{0}%PA%{0}%PC:mh=\EGp:mr=\EG4:\
+	:nd=^L:nw=^M^J:\
 	:..sa=%{0}%?%p4%t%{2}%|%;\n%?%p7%t%{1}%|%;%PA\n\EG%?%gC%t%gC%e\n%{0}%?%p1%t%{4}%|%;\n%?%p2%t%{8}%|%;\n%?%p3%t%{4}%|%;\n%?%p5%t%{64}%|%;\n%;%gA%+%'0'%+%c\n%?%p8%t\E)%e\E(%;%?%p9%t\EH\002%e\EH\003%;:\
 	:se=\EG0:sf=\n:so=\EG4:sr=\Ej:st=\E1:ta=^I:ts=\EF:\
-	:ue=\EG0:up=^K:us=\EG8:ve=\E`1:vi=\E`0:
-#	The manditorary pause used by flash does not work with
-#	older versions of terminfo.  If you see this effect then
-#	unset xon and delete the / from the delay.
-#	i.e. change $<100/> to $<100>
+	:ue=\EG0:up=^K:us=\EG8:vb=\E`8\E`9:ve=\E`1:vi=\E`0:
 wy350-vb|wyse350-vb|wyse 350 visible bell:\
-	:vb=\E`8\E`9:tc=wy350:
+	:bl@:tc=wy350:
 wy350-w|wyse350-w|wyse 350 132-column:\
 	:co#132:ws#97:\
 	:cm=\Ea%i%dR%dC:dc=\EW:i1=\E`;\E`9:tc=wy350:
 wy350-wvb|wyse350-wvb|wyse 350 132-column visible bell:\
-	:vb=\E`8\E`9:tc=wy350-w:
+	:bl@:tc=wy350-w:
 #
 #	This terminfo description is untested.
 #
@@ -2870,15 +3462,13 @@ wy100|wyse 100:\
 	:sf=^J:so=\EG4:ts=\EF:ue=\EG0:up=^K:us=\EG8:
 #
 #	The Wyse 120/150 has most of the features of the Wyse 60.
-#
 #	This terminal does not need padding up to 9600 baud!
-#
-#	(msgr) should be set but the clear screen fails when in
-#	alt-charset mode.  Try \EcE  \E+  if the screen is really clear
-#	then set msgr.
+#	<msgr> should be set but the clear screen fails when in
+#	alt-charset mode.  Try \EcE\s\s\E+\s if the screen is really clear
+#	then set <msgr>.
 #
 wy120|wyse120|wy150|wyse150|Wyse 120/150:\
-	:am:bs:bw:hs:km:mi:ms:xo:\
+	:am:bw:hs:km:mi:ms:xo:\
 	:co#80:it#8:li#24:pb#9601:ws#45:\
 	:ae=\EcD:al=\EE:as=\EcE:bl=^G:bt=\EI:cd=\EY:ce=\ET:\
 	:cl=\E+:cm=\E=%+ %+ :cr=^M:dc=\EW:dl=\ER:do=^J:\
@@ -2886,47 +3476,46 @@ wy120|wyse120|wy150|wyse150|Wyse 120/150:\
 	:i2=\EwJ\Ew1:im=\Eq:ip=:\
 	:is=\Ed$\EcD\E'\Er\EH\003\Ed/\EO\Ee1\Ed*\E`@\E`9\E`1\016\024\El:\
 	:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:\
-	:k6=^AE\r:k7=^AF\r:k8=^AG\r:k9=^AH\r:kb=^H:kd=^J:\
-	:kh=^^:kl=^H:kr=^L:ku=^K:le=^H:ll=^^^K:mb=\EG2:\
-	:me=\E(\EH\003\EG0\EcD:mh=\EGp:mk=\EG1:mp=\E):\
-	:mr=\EG4:nd=^L:nw=\r\n:pf=^T:po=\Ed#:ps=\EP:\
+	:k6=^AE\r:k7=^AF\r:k8=^AG\r:k9=^AH\r:kD=\EW:kI=\EQ:\
+	:kN=\EK:kP=\EJ:kb=^H:kd=^J:kh=^^:kl=^H:kr=^L:ku=^K:\
+	:le=^H:ll=^^^K:mb=\EG2:me=\E(\EH\003\EG0\EcD:mh=\EGp:\
+	:mr=\EG4:nd=^L:nw=\r\n:\
 	:..sa=%?%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:\
 	:se=\EG0:sf=\n:so=\EGt:sr=\Ej:st=\E1:ta=\011:te=\Ew1:\
-	:ti=\Ew0:ts=\EF:ue=\EG0:up=^K:us=\EG8:ve=\E`1:\
-	:vi=\E`0:
+	:ti=\Ew0:ts=\EF:ue=\EG0:up=^K:us=\EG8:vb=\E`8\E`9:\
+	:ve=\E`1:vi=\E`0:
 #
 wy120-w|wyse120-w|wy150-w|wyse150-w|wyse 120/150 132-column:\
 	:co#132:ws#97:\
 	:cm=\Ea%i%dR%dC:dc=\EW:ip=:tc=wy120:
 #
 wy120-25|wyse120-25|wy150-25|wyse150-25|wyse 120/150 80-column 25-lines:\
-	:li#25:\
-	:tc=wy120:
+	:li#25:\tc=wy120:
 #
 wy120-25-w|wyse120-25-w|wy150-25-w|wyse150-25-w|wyse 120/150 132-column 25-lines:\
-	:li#25:\
-	:tc=wy120-w:
+	:li#25:\tc=wy120-w:
 #
 wy120-vb|wyse120-vb|wy150-vb|wyse150-vb|Wyse 120/150 visible bell:\
-	:vb=\E`8\E`9:tc=wy120:
+	:bl@:tc=wy120:
 #
 wy120-w-vb|wy120-wvb|wyse120-wvb|wy150-w-vb|wyse150-w-vb|Wyse 120/150 132-column visible bell:\
-	:vb=\E`8\E`9:tc=wy120-w:
+	:bl@:tc=wy120-w:
 #
 #	The Wyse 60 is like the Wyse 50 but with more padding.
 #	The reset strings are slow and the pad times very depending
 #	on other parameters such as font loading.  I have tried
 #	to follow the following outline:
-#		rs1 -> set personality
-#		rs2 -> set number of columns
-#		rs3 -> set number of lines
-#		is1 -> select the proper font
-#		is2 -> do the initialization
-#		is3 -> set up display memory (2 pages)
+#
+#		<rs1> -> set personality
+#		<rs2> -> set number of columns
+#		<rs3> -> set number of lines
+#		<is1> -> select the proper font
+#		<is2> -> do the initialization
+#		<is3> -> set up display memory (2 pages)
 #
 #	The Wyse 60's that have vt100 emulation are slower than the
 #	older Wyse 60's.  This change happened mid-1987.
-#	The capabilities effected are (dch1) (dl1) (il1) (ind) (ri)
+#	The capabilities effected are <dch1> <dl1> <il1> <ind> <ri>
 #
 #	The meta key is only half right.  This terminal will return the
 #	high order bit set when you hit CTRL-function_key
@@ -2941,7 +3530,7 @@ wy120-w-vb|wy120-wvb|wyse120-wvb|wy150-w-vb|wyse150-w-vb|Wyse 120/150 132-column
 #	   handshake is turned off.
 #
 wy60|wyse60|Wyse 60:\
-	:am:bs:bw:hs:km:mi:ms:\
+	:am:bw:hs:km:mi:ms:\
 	:co#80:li#24:ws#45:\
 	:ae=\EcD:al=\EE:as=\EcE:bl=^G:bt=\EI:cd=\EY:ce=\ET:\
 	:cl=\E+:cm=\E=%+ %+ :cr=^M:ct=\E0:dc=\EW:dl=\ER:\
@@ -2949,25 +3538,23 @@ wy60|wyse60|Wyse 60:\
 	:i2=\EwJ\Ew1:im=\Eq:ip=:\
 	:is=\Ed$\EcD\E'\Er\EH\003\Ed/\EO\Ee1\Ed*\E`@\E`9\E`1\016\024\El:\
 	:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:\
-	:k6=^AE\r:k7=^AF\r:k8=^AG\r:k9=^AH\r:kb=^H:kd=^J:\
-	:kh=^^:kl=^H:kr=^L:ku=^K:le=^H:ll=^^^K:mb=\EG2:\
-	:me=\E(\EH\003\EG0\EcD:mh=\EGp:mk=\EG1:mp=\E):\
-	:mr=\EG4:nd=^L:nw=\r\n:pf=^T:po=\Ed#:ps=\EP:\
+	:k6=^AE\r:k7=^AF\r:k8=^AG\r:k9=^AH\r:kD=\EW:kI=\EQ:\
+	:kN=\EK:kP=\EJ:kb=^H:kd=^J:kh=^^:kl=^H:kr=^L:ku=^K:\
+	:le=^H:ll=^^^K:mb=\EG2:me=\E(\EH\003\EG0\EcD:mh=\EGp:\
+	:mr=\EG4:nd=^L:nw=\r\n:\
 	:..sa=%?%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:\
 	:se=\EG0:sf=\n:so=\EGt:sr=\Ej:st=\E1:ta=\011:te=\Ew1:\
-	:ti=\Ew0:ts=\EF:ue=\EG0:up=^K:us=\EG8:ve=\E`1:\
-	:vi=\E`0:
+	:ti=\Ew0:ts=\EF:ue=\EG0:up=^K:us=\EG8:vb=\E`8\E`9:\
+	:ve=\E`1:vi=\E`0:
 #
 wy60-w|wyse60-w|wyse 60 132-column:\
 	:co#132:ws#97:\
 	:cm=\Ea%i%dR%dC:dc=\EW:ip=:tc=wy60:
 #
 wy60-25|wyse60-25|wyse 60 80-column 25-lines:\
-	:li#25:\
-	:tc=wy60:
+	:li#25:\tc=wy60:
 wy60-25-w|wyse60-25-w|wyse 60 132-column 25-lines:\
-	:li#25:\
-	:tc=wy60-w:
+	:li#25:\tc=wy60-w:
 #
 wy60-42|wyse60-42|wyse 60 80-column 42-lines:\
 	:li#42:\
@@ -2979,16 +3566,14 @@ wy60-42-w|wyse60-42-w|wyse 60 132-column 42-lines:\
 	:nw=\r\n:tc=wy60-42:
 #
 wy60-43|wyse60-43|wyse 60 80-column 43-lines:\
-	:li#43:\
-	:tc=wy60-42:
+	:li#43:\tc=wy60-42:
 wy60-43-w|wyse60-43-w|wyse 60 132-column 43-lines:\
-	:li#43:\
-	:tc=wy60-42-w:
+	:li#43:\tc=wy60-42-w:
 #
 wy60-vb|wyse60-vb|Wyse 60 visible bell:\
-	:vb=\E`8\E`9:tc=wy60:
+	:bl@:tc=wy60:
 wy60-w-vb|wy60-wvb|wyse60-wvb|Wyse 60 132-column visible bell:\
-	:vb=\E`8\E`9:tc=wy60-w:
+	:bl@:tc=wy60-w:
 
 #	The Wyse-99GT looks at lot like the Wyse 60 except that it
 #	does not have the 42/43 line mode.  In the Wyse-60 the "lines"
@@ -2999,7 +3584,7 @@ wy60-w-vb|wy60-wvb|wyse60-wvb|Wyse 60 132-column visible bell:\
 #	Tektronix 4014.  But this has no bearing on the native mode.
 #
 #	(msgr) should be set but the clear screen fails when in
-#	alt-charset mode.  Try \EcE  \E+  if the screen is really clear
+#	alt-charset mode.  Try \EcE\s\s\E+\s if the screen is really clear
 #	then set msgr, else use msgr@.
 #
 #	u0 -> enter Tektronix mode
@@ -3008,36 +3593,36 @@ wy60-w-vb|wy60-wvb|wyse60-wvb|Wyse 60 132-column visible bell:\
 wy99gt|wyse99gt|Wyse 99gt:\
 	:ms@:\
 	:al=\EE:cd=\Ey:ce=\Et:cl=\E+:dc=\EW:dl=\ER:i2=\Ew0:\
-	:ip=:nw@:sf=\n:sr=\Ej:ta=\011:te=\Ew0:ti=\Ew1:tc=wy60:
+	:ip=:nw@:sf=\n:sr=\Ej:ta=\011:te=\Ew0:ti=\Ew1:\
+	:vb=\E`8\E`9:tc=wy60:
 #
 wy99gt-w|wyse99gt-w|wyse 99gt 132-column:\
 	:co#132:ws#97:\
 	:cd=\Ey:cl=\E+:cm=\Ea%i%dR%dC:dc=\EW:ip=:tc=wy99gt:
 #
 wy99gt-25|wyse99gt-25|wyse 99gt 80-column 25-lines:\
-	:li#25:\
-	:tc=wy99gt:
+	:li#25:\tc=wy99gt:
 #
 wy99gt-25-w|wyse99gt-25-w|wyse 99gt 132-column 25-lines:\
-	:li#25:\
-	:tc=wy99gt-w:
+	:li#25:\tc=wy99gt-w:
 #
 wy99gt-vb|wyse99gt-vb|Wyse 99gt visible bell:\
-	:vb=\E`8\E`9:tc=wy99gt:
+	:bl@:tc=wy99gt:
 #
 wy99gt-w-vb|wy99gt-wvb|wyse99gt-wvb|Wyse 99gt 132-column visible bell:\
-	:vb=\E`8\E`9:tc=wy99gt-w:
+	:bl@:tc=wy99gt-w:
 #
 #	The Wyse 160 is combination of the WY-60 and the WY-99gt.
 #	The reset strings are slow and the pad times very depending
 #	on other parameters such as font loading.  I have tried
 #	to follow the following outline:
-#		rs1 -> set personality
-#		rs2 -> set number of columns
-#		rs3 -> set number of lines
-#		is1 -> select the proper font
-#		is2 -> do the initialization
-#		is3 -> set up display memory (2 pages)
+#
+#		<rs1> -> set personality
+#		<rs2> -> set number of columns
+#		<rs3> -> set number of lines
+#		<is1> -> select the proper font
+#		<is2> -> do the initialization
+#		<is3> -> set up display memory (2 pages)
 #
 #	The display memory may be used for either text or graphics.
 #	When "Display Memory = Shared" the terminal will have more pages
@@ -3046,7 +3631,7 @@ wy99gt-w-vb|wy99gt-wvb|wyse99gt-wvb|Wyse 99gt 132-column visible bell:\
 #	text area will be only one page long.
 #
 wy160|wyse160|Wyse 160:\
-	:am:bs:bw:hs:km:mi:ms:\
+	:am:bw:hs:km:mi:ms:\
 	:co#80:li#24:ws#38:\
 	:ae=\EcD:al=\EE:as=\EcE:bl=^G:bt=\EI:cd=\EY:ce=\ET:\
 	:cl=\E+:cm=\E=%+ %+ :cr=^M:ct=\E0:dc=\EW:dl=\ER:\
@@ -3054,25 +3639,23 @@ wy160|wyse160|Wyse 160:\
 	:i2=\Ew0:im=\Eq:ip=:\
 	:is=\Ed$\EcD\E'\Er\EH\003\Ed/\EO\Ee1\Ed*\E`@\E`9\E`1\016\024\El:\
 	:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:\
-	:k6=^AE\r:k7=^AF\r:k8=^AG\r:k9=^AH\r:kb=^H:kd=^J:\
-	:kh=^^:kl=^H:kr=^L:ku=^K:le=^H:ll=^^^K:mb=\EG2:\
-	:me=\E(\EH\003\EG0\EcD:mh=\EGp:mk=\EG1:mp=\E):\
-	:mr=\EG4:nd=^L:nw=\r\n:pf=^T:po=\Ed#:ps=\EP:\
+	:k6=^AE\r:k7=^AF\r:k8=^AG\r:k9=^AH\r:kD=\EW:kI=\EQ:\
+	:kN=\EK:kP=\EJ:kb=^H:kd=^J:kh=^^:kl=^H:kr=^L:ku=^K:\
+	:le=^H:ll=^^^K:mb=\EG2:me=\E(\EH\003\EG0\EcD:mh=\EGp:\
+	:mr=\EG4:nd=^L:nw=\r\n:\
 	:..sa=%?%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:\
 	:se=\EG0:sf=\n:so=\EGt:sr=\Ej:st=\E1:ta=^I:te=\Ew0:\
-	:ti=\Ew1:ts=\EF:ue=\EG0:up=^K:us=\EG8:ve=\E`1:\
-	:vi=\E`0:
+	:ti=\Ew1:ts=\EF:ue=\EG0:up=^K:us=\EG8:vb=\E`8\E`9:\
+	:ve=\E`1:vi=\E`0:
 #
 wy160-w|wyse160-w|wyse 160 132-column:\
 	:co#132:ws#90:\
 	:cm=\Ea%i%dR%dC:dc=\EW:tc=wy160:
 #
 wy160-25|wyse160-25|wyse 160 80-column 25-lines:\
-	:li#25:\
-	:tc=wy160:
+	:li#25:\tc=wy160:
 wy160-25-w|wyse160-25-w|wyse 160 132-column 25-lines:\
-	:li#25:\
-	:tc=wy160-w:
+	:li#25:\tc=wy160-w:
 #
 wy160-42|wyse160-42|wyse 160 80-column 42-lines:\
 	:li#42:\
@@ -3083,16 +3666,14 @@ wy160-42-w|wyse160-42-w|wyse 160 132-column 42-lines:\
 	:cm=\Ea%i%dR%dC:dc=\EW:ip=:tc=wy160-42:
 #
 wy160-43|wyse160-43|wyse 160 80-column 43-lines:\
-	:li#43:\
-	:tc=wy160-42:
+	:li#43:\tc=wy160-42:
 wy160-43-w|wyse160-43-w|wyse 160 132-column 43-lines:\
-	:li#43:\
-	:tc=wy160-42-w:
+	:li#43:\tc=wy160-42-w:
 #
 wy160-vb|wyse160-vb|Wyse 160 visible bell:\
-	:vb=\E`8\E`9:tc=wy160:
+	:bl@:tc=wy160:
 wy160-w-vb|wy160-wvb|wyse160-wvb|Wyse 160 132-column visible bell:\
-	:vb=\E`8\E`9:tc=wy160-w:
+	:bl@:tc=wy160-w:
 #
 #	The Wyse 75 is a vt100 lookalike without advanced video.
 #
@@ -3107,26 +3688,25 @@ wy160-w-vb|wy160-wvb|wyse160-wvb|Wyse 160 132-column visible bell:\
 #
 # (untranslatable capabilities removed to fit entry within 1023 bytes)
 wy75|wyse75|wyse 75:\
-	:am:bs:hs:mi:ms:xn:xo:\
-	:co#80:li#24:ma#1:pb#1201:ug#1:ws#78:\
+	:am:hs:mi:ms:xn:xo:\
+	:co#80:li#24:ma#1:pb#1201:ws#78:\
 	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
 	:K1=\EOw:K2=\EOu:K3=\EOy:K4=\EOq:K5=\EOs:LE=\E[%dD:\
 	:RI=\E[%dC:UP=\E[%dA:ae=^O:al=\E[L:as=^N:bl=^G:\
-	:bt=\E[Z:cd=\E[J:ce=\E[K:ch=\E[%i%dG:cl=\E[H\E[J:\
-	:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:ct=\E[3g:\
-	:dc=\E[P:dl=\E[M:do=^J:\
+	:bt=\E[Z:cd=\E[J:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:\
+	:cr=^M:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:dl=\E[M:do=^J:\
 	:ds=\E[>\\\054\001\001\E[>-\001\001:ec=\E[%dX:\
 	:ei=\E[4l:fs=^A:ho=\E[H:\
 	:i1=\E[2;4;20;30l\E[?1;10l\E[12h\E[?7;8;25h:i2=\E[m:\
 	:im=\E[4h:ip=:is=\E>\E(B\E)0\017:k1=\E[?5i:k2=\E[?3i:\
 	:k3=\E[2i:k4=\E[@:k5=\E[M:k6=\E[17~:k7=\E[18~:\
-	:k8=\E[19~:k9=\E[20~:kb=^H:kd=\E[B:ke=\E>:kh=\E[H:\
-	:kl=\E[D:kr=\E[C:ks=\E[?1l\E[?7h\E=:ku=\E[A:le=^H:\
-	:me=\E[m\017:mh=\E[0t\E[2m:mr=\E[1t\E[7m:nd=\E[C:\
-	:pf=\E[4i:po=\E[5i:ps=\E[0i:rc=\E8:sc=\E7:se=\E[m:\
-	:sf=\n:so=\E[1t\E[7m:sr=\EM:st=\EH:ta=^I:\
+	:k8=\E[19~:k9=\E[20~:kI=\E[@:kN=\E[6~:kP=\E[5~:kb=^H:\
+	:kd=\E[B:ke=\E>:kh=\E[H:kl=\E[D:kr=\E[C:\
+	:ks=\E[?1l\E[?7h\E=:ku=\E[A:le=^H:me=\E[m\017:\
+	:mh=\E[0t\E[2m:mr=\E[1t\E[7m:nd=\E[C:rc=\E8:sc=\E7:\
+	:se=\E[m:sf=\n:so=\E[1t\E[7m:sr=\EM:st=\EH:ta=^I:\
 	:ts=\E[>\\\054\001:ue=\E[m:up=\E[A:us=\E[2t\E[4m:\
-	:ve=\E[?25h:vi=\E[?25l:
+	:vb=\E[30h\E\\\054\E[30l:ve=\E[?25h:vi=\E[?25l:
 #
 #	This terminal description uses the non-hidden attribute mode
 #	(with magic cookie).
@@ -3135,33 +3715,33 @@ wy75-mc|wyse75-mc|wyse 75 with magic cookies:\
 	:ms@:\
 	:ma@:sg#1:ug#1:\
 	:ae=\E[0p\017:as=\E[0p\016:i2=\E[m\E[p:mb=\E[2p:\
-	:me=\E[0p\017:mh=\E[1p:mk=\E[4p:mr=\E[16p:\
+	:me=\E[0p\017:mh=\E[1p:mr=\E[16p:\
 	:..sa=\E[%{0}%?%p2%p6%|%t%{8}%|%;%?%p1%p3%|%p6%|%t%{16}%|%;%?%p4%t%{2}%|%;%?%p1%p5%|%t%{1}%|%;%?%p7%t%{4}%|%;%dp%?%p9%t\016%e\017%;:\
 	:se=\E[0p:so=\E[17p:ue=\E[0p:us=\E[8p:tc=wy75:
 wy75-vb|wyse75-vb|wyse 75 with visible bell:\
 	:pb@:\
-	:vb=\E[30h\E\\\054\E[30l:tc=wy75:
+	:bl@:tc=wy75:
 wy75-w|wyse75-w|wyse 75 in 132 column mode:\
-	:co#132:ws#130:\
-	:tc=wy75:
+	:co#132:ws#130:\tc=wy75:
 wy75-wvb|wyse75-wvb|wyse 75 with visible bell 132 columns:\
 	:pb@:\
-	:vb=\E[30h\E\\\054\E[30l:tc=wy75-w:
+	:bl@:tc=wy75-w:
 #
 #	Wyse 85 emulating a vt220 7 bit mode.
 #		24 line screen with status line.
 #
 #	The vt220 mode permits more function keys but it wipes out
-#	the escape key.  I strongly reccomend that f11 be set to
+#	the escape key.  I strongly reccomend that <f11> be set to
 #	escape (esc).
 #	The terminal may have to be set for 8 data bits and 2 stop
 #	bits for the arrow keys to work.
 #	The Wyse 85 runs faster with XON/XOFF enabled.  Also the
-#	(dch) and (ich) work best when XON/XOFF is set.  (ich) and
-#	(dch) leave trash on the screen when used without XON/XOFF.
+#	<dch> and <ich> work best when XON/XOFF is set.  <ich> and
+#	<dch> leave trash on the screen when used without XON/XOFF.
 #
+# (untranslatable capabilities removed to fit entry within 1023 bytes)
 wy85|wyse85|wyse 85:\
-	:am:bs:hs:mi:ms:xn:xo:\
+	:am:hs:mi:ms:xn:xo:\
 	:co#80:it#8:li#24:ws#80:\
 	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
 	:K1=\EOw:K2=\EOu:K3=\EOy:K4=\EOq:K5=\EOs:LE=\E[%dD:\
@@ -3172,27 +3752,26 @@ wy85|wyse85|wyse 85:\
 	:i1=\E[62;1"p\E[?5W:i2=\E>\E(B\E)0\017\E[m:im=\E[4h:\
 	:ip=:is=\E[2;4;20;30l\E[?1;4;10;16l\E[12h\E[?7;8;25h:\
 	:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:k6=\E[17~:k7=\E[18~:\
-	:k8=\E[19~:k9=\E[20~:kb=^H:kd=\E[B:ke=\E>:kh=\E[26~:\
-	:kl=\E[D:kr=\E[C:ks=\E[?1l\E=:ku=\E[A:le=^H:mb=\E[5m:\
-	:md=\E[1m:me=\E[m\017:mh=\E[2m:mk=\E[8m:mr=\E[7m:\
-	:nd=\E[C:pf=\E[4i:po=\E[5i:ps=\E[0i:rc=\E8:\
-	:..sa=\E[0%?%p2%t;4%;%?%p3%p1%|%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p6%t;1%;%?%p7%t;8%;m%?%p9%t\016%e\017%;:\
-	:sc=\E7:se=\E[m:sf=\n:so=\E[7m:sr=\EM:st=\EH:ta=\011:\
-	:ts=\E[40h\E7\E[25;%i%p1%dH:ue=\E[m:up=\E[A:us=\E[4m:\
-	:ve=\E[?25h:vi=\E[?25l:
+	:k8=\E[19~:k9=\E[20~:kD=\E[3~:kI=\E[2~:kN=\E[6~:\
+	:kP=\E[5~:kb=^H:kd=\E[B:ke=\E>:kh=\E[26~:kl=\E[D:\
+	:kr=\E[C:ks=\E[?1l\E=:ku=\E[A:le=^H:mb=\E[5m:\
+	:md=\E[1m:me=\E[m\017:mh=\E[2m:mr=\E[7m:nd=\E[C:\
+	:rc=\E8:sc=\E7:se=\E[m:sf=\n:so=\E[7m:sr=\EM:st=\EH:\
+	:ta=\011:ts=\E[40h\E7\E[25;%i%p1%dH:ue=\E[m:up=\E[A:\
+	:us=\E[4m:vb=\E[30h\E\\\054\E[30l:ve=\E[?25h:\
+	:vi=\E[?25l:
 #
 #	Wyse 85 with visual bell.
 wy85-vb|wyse85-vb|wyse 85 with visible bell:\
-	:vb=\E[30h\E\\\054\E[30l:tc=wy85:
+	:bl@:vb=\E[30h\E\\\054\E[30l:tc=wy85:
 #
 #	Wyse 85 in 132-column mode.
 wy85-w|wyse85-w|wyse 85 in 132-column mode:\
-	:co#132:ws#132:\
-	:tc=wy85:
+	:co#132:ws#132:\tc=wy85:
 #
 #	Wyse 85 in 132-column mode with visual bell.
 wy85-wvb|wyse85-wvb|wyse 85 with visible bell 132-columns:\
-	:vb=\E[30h\E\\\054\E[30l:tc=wy85-w:
+	:bl@:tc=wy85-w:
 #
 #	Wyse 185 emulating a vt320 7 bit mode.
 #
@@ -3206,27 +3785,26 @@ wy85-wvb|wyse85-wvb|wyse 85 with visible bell 132-columns:\
 #
 # (untranslatable capabilities removed to fit entry within 1023 bytes)
 wy185|wyse185|wyse 185:\
-	:am:bs:hs:km:mi:ms:xn:xo:\
+	:am:hs:km:mi:ms:xn:xo:\
 	:co#80:it#8:li#24:ws#80:\
 	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
 	:K1=\EOw:K2=\EOu:K3=\EOy:K4=\EOq:K5=\EOs:LE=\E[%dD:\
 	:RI=\E[%dC:UP=\E[%dA:ae=^O:al=\E[L:as=^N:bl=^G:\
-	:bt=\E[Z:cd=\E[J:ce=\E[K:ch=\E[%i%d`:cl=\E[H\E[J:\
-	:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:ct=\E[3g:\
-	:cv=\E[%i%dd:dc=\E[P:dl=\E[M:do=^J:\
+	:bt=\E[Z:cd=\E[J:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:\
+	:cr=^M:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:dl=\E[M:do=^J:\
 	:ds=\E7\E[99;0H\E[K\E8:ec=\E[%dX:ei=\E[4l:\
 	:fs=\E[1;24r\E8:ho=\E[H:i1=\E[?5W:\
 	:i2=\E>\E(B\E)0\017\E[m:im=\E[4h:ip=:\
 	:is=\E[2;4;20;30l\E[?1;4;10;16l\E[12h\E[?7;8;25h:\
 	:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:k6=\E[17~:k7=\E[18~:\
-	:k8=\E[19~:k9=\E[20~:kb=^H:kd=\E[B:ke=\E>:kh=\E[26~:\
-	:kl=\E[D:kr=\E[C:ks=\E[?1l\E=:ku=\E[A:le=^H:mb=\E[5m:\
-	:md=\E[1m:me=\E[m\017:mh=\E[2m:mk=\E[8m:mr=\E[7m:\
-	:nd=\E[C:pf=\E[4i:po=\E[5i:ps=\E[0i:rc=\E8:sc=\E7:\
-	:se=\E[27m:sf=\n:so=\E[7m:sr=\EM:st=\EH:ta=^I:\
-	:te=\E[ R:ti=\E[ Q:ts=\E7\E[99;%i%p1%dH:ue=\E[24m:\
-	:up=\E[A:us=\E[4m:ve=\E[34h\E[?25h:vi=\E[?25l:\
-	:vs=\E[?25h\E[34l:
+	:k8=\E[19~:k9=\E[20~:kD=\E[3~:kI=\E[2~:kN=\E[6~:\
+	:kP=\E[5~:kb=^H:kd=\E[B:ke=\E>:kh=\E[26~:kl=\E[D:\
+	:kr=\E[C:ks=\E[?1l\E=:ku=\E[A:le=^H:mb=\E[5m:\
+	:md=\E[1m:me=\E[m\017:mh=\E[2m:mr=\E[7m:nd=\E[C:\
+	:rc=\E8:sc=\E7:se=\E[27m:sf=\n:so=\E[7m:sr=\EM:\
+	:st=\EH:ta=^I:te=\E[ R:ti=\E[ Q:ts=\E7\E[99;%i%p1%dH:\
+	:ue=\E[24m:up=\E[A:us=\E[4m:vb=\E[30h\E\\\054\E[30l:\
+	:ve=\E[34h\E[?25h:vi=\E[?25l:vs=\E[?25h\E[34l:
 #
 #	Wyse 185 with 24 data lines and top status (terminal status)
 wy185-24|wyse185-24|wyse 185 with 24 data lines:\
@@ -3235,7 +3813,7 @@ wy185-24|wyse185-24|wyse 185 with 24 data lines:\
 #
 #	Wyse 185 with visual bell.
 wy185-vb|wyse185-vb|wyse 185+flash:\
-	:vb=\E[30h\E\\\054\E[30l:tc=wy185:
+	:bl@:tc=wy185:
 #
 #	Wyse 185 in 132-column mode.
 wy185-w|wyse185-w|wyse 185 in 132-column mode:\
@@ -3244,15 +3822,15 @@ wy185-w|wyse185-w|wyse 185 in 132-column mode:\
 #
 #	Wyse 185 in 132-column mode with visual bell.
 wy185-wvb|wyse185-wvb|wyse 185+flash+132 cols:\
-	:vb=\E[30h\E\\\054\E[30l:tc=wy185-w:
+	:bl@:tc=wy185-w:
 
 # wy325 terminfo entries
 # Done by Joe H. Davis        3-9-92
 
 # lines 25  columns 80
 #
-wy325|wyse325|Wyse-epc:\
-	:am:bs:bw:hs:mi:\
+wy325|wyse325|Wyse epc:\
+	:am:bw:hs:mi:\
 	:co#80:li#24:pb#9601:ws#45:\
 	:ae=\EcD:al=\EE:as=\EcE:bl=^G:bt=\EI:cd=\EY:ce=\ET:\
 	:cl=\E+:cm=\E=%+ %+ :cr=^M:ct=\E0:dc=\EW:dl=\ER:\
@@ -3260,82 +3838,75 @@ wy325|wyse325|Wyse-epc:\
 	:i2=\Ew0:im=\Eq:ip=:\
 	:is=\EcD\E'\Er\EH\003\Ed/\EO\Ee1\Ed*\E`@\E`9\E`1\016\024\El:\
 	:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:\
-	:k6=^AE\r:k7=^AF\r:k8=^AG\r:k9=^AH\r:kb=^H:kd=^J:\
-	:kh=^^:kl=^H:kr=^L:ku=^K:le=^H:ll=^^^K:mb=\EG2:\
-	:me=\E(\EH\003\EG0\EcD:mh=\EGp:mk=\EG1:mp=\E):\
-	:mr=\EG4:nd=^L:pf=^T:po=\Ed#:ps=\EP:\
+	:k6=^AE\r:k7=^AF\r:k8=^AG\r:k9=^AH\r:kD=\EW:kI=\Eq:\
+	:kN=\EK:kP=\EJ:kb=^H:kd=^J:kh=^^:kl=^H:kr=^L:ku=^K:\
+	:le=^H:ll=^^^K:mb=\EG2:me=\E(\EH\003\EG0\EcD:mh=\EGp:\
+	:mr=\EG4:nd=^L:\
 	:..sa=%?%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:\
 	:se=\EG0:sf=\n:so=\EGt:sr=\Ej:st=\E1:ta=^I:te=\Ew0:\
-	:ti=\Ew1:ts=\EF:ue=\EG0:up=^K:us=\EG8:ve=\E`1:\
-	:vi=\E`0:
+	:ti=\Ew1:ts=\EF:ue=\EG0:up=^K:us=\EG8:vb=\E`8\E`9:\
+	:ve=\E`1:vi=\E`0:
 
 #
 # lines 24  columns 80  vb 
 #
-wy325-vb|wyse325-vb|wy325-vb:\
-	:vb=\E`8\E`9:tc=wy325:
+wy325-vb|wyse325-vb|wyse-325 with visual bell:\
+	:bl@:tc=wy325:
 
 #
 # lines 24  columns 132
 #
-wy325-w|wyse325-w|wy325w-24:\
+wy325-w|wyse325-w|wy325w-24|wyse-325 in wide mode:\
 	:co#132:ws#97:\
 	:cm=\Ea%i%dR%dC:dc=\EW:ip=:tc=wy325:
 #
 # lines 25  columns 80
 #
-wy325-25|wyse325-25|wy325-80:\
-	:li#25:\
-	:tc=wy325:
+wy325-25|wyse325-25|wy325-80|wyse-325|wyse-325 25 lines:\
+	:li#25:\tc=wy325:
 #
 # lines 25  columns 132
 #
 wy325-25w|wyse325-25w|wy325 132 columns:\
-	:li#25:\
-	:tc=wy325-w:
+	:li#25:\tc=wy325-w:
 #
 # lines 25  columns 132  vb 
 #
-wy325-w-vb|wy325-wvb|wyse325-wvb:\
-	:vb=\E`8\E`9:tc=wy325-w:
+wy325-w-vb|wy325-wvb|wyse325-wvb|wyse-325 wide mode reverse video:\
+	:bl@:tc=wy325-w:
 
 #
 # lines 42  columns 80
 #
-wy325-42|wyse325-42:\
-	:li#42:\
-	:tc=wy325:
+wy325-42|wyse325-42|wyse-325 42 lines:\
+	:li#42:\tc=wy325:
 #
 # lines 42  columns 132
 #
-wy325-42w|wyse325-42w:\
-	:li#42:\
-	:tc=wy325-w:
+wy325-42w|wyse325-42w|wyse-325 42 lines wide mode:\
+	:li#42:\tc=wy325-w:
 #
 # lines 42  columns 132  vb 
 #
-wy325-42w-vb|wy325-42wvb:\
-	:vb=\E`8\E`9:tc=wy325-w:
+wy325-42w-vb|wy325-42wvb|wyse-325 42 lines wide mode visual bell:\
+	:bl@:tc=wy325-w:
 #
 # lines 43  columns 80
 #
-wy325-43|wyse325-43:\
-	:li#43:\
-	:tc=wy325:
+wy325-43|wyse325-43|wyse-325 43 lines:\
+	:li#43:\tc=wy325:
 #
 # lines 43  columns 132
 #
-wy325-43w|wyse325-43w:\
-	:li#43:\
-	:tc=wy325-w:
+wy325-43w|wyse325-43w|wyse-325 43 lines wide mode:\
+	:li#43:\tc=wy325-w:
 #
 # lines 43  columns 132  vb 
 #
-wy325-43w-vb|wy325-43wvb:\
-	:vb=\E`8\E`9:tc=wy325-w:
-#	Wyse 370
-#
-#		24 line screen with status line.
+wy325-43w-vb|wy325-43wvb|wyse-325 43 lines wide mode visual bell:\
+	:bl@:tc=wy325-w:
+
+#	Wyse 370 -- 24 line screen with status line.
 #
 #	The terminal may have to be set for 8 data bits and 2 stop
 #	bits for the arrow keys to work.
@@ -3345,70 +3916,66 @@ wy325-43w-vb|wy325-43wvb:\
 #	The following definition is for the basic terminal without
 #	function keys.
 #
-#	u0 -> enter Tektronix 4010/4014 mode
-#	u1 -> exit  Tektronix 4010/4014 mode
-#	u2 -> enter ASCII mode (from any ANSI mode)
-#	u3 -> exit  ASCII mode (goto native ANSI mode)
-#	u4 -> enter Tek 4207 ANSI mode (from any ANSI mode)
-#	u5 -> exit  Tek 4207 mode (goto native ANSI mode)
+#	<u0> -> enter Tektronix 4010/4014 mode
+#	<u1> -> exit  Tektronix 4010/4014 mode
+#	<u2> -> enter ASCII mode (from any ANSI mode)
+#	<u3> -> exit  ASCII mode (goto native ANSI mode)
+#	<u4> -> enter Tek 4207 ANSI mode (from any ANSI mode)
+#	<u5> -> exit  Tek 4207 mode (goto native ANSI mode)
 #
 wy370-nk|wyse 370 without function keys:\
-	:am:bs:hs:mi:ms:xn:xo:\
+	:am:hs:mi:ms:xn:xo:\
 	:co#80:it#8:li#24:ws#80:\
 	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
 	:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:ae=^O:al=\E[L:as=^N:\
-	:bl=^G:bt=\E[Z:cd=\E[J:ce=\E[K:ch=\E[%i%d`:\
-	:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:\
-	:ct=\E[3g:cv=\E[%i%dd:dc=\E[P:dl=\E[M:do=^J:\
-	:ds=\E[40l:ec=\E[%dX:ei=\E[4l:fs=\E[1;24r\E8:ho=\E[H:\
-	:i1=\E[90;1"p\E[?5W:i2=\E>\017\E)0\E(B\E[63;0w\E[m:\
-	:im=\E[4h:ip=:\
+	:bl=^G:bt=\E[Z:cd=\E[J:ce=\E[K:cl=\E[H\E[J:\
+	:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:ct=\E[3g:\
+	:dc=\E[P:dl=\E[M:do=^J:ds=\E[40l:ec=\E[%dX:ei=\E[4l:\
+	:fs=\E[1;24r\E8:ho=\E[H:i1=\E[90;1"p\E[?5W:\
+	:i2=\E>\017\E)0\E(B\E[63;0w\E[m:im=\E[4h:ip=:\
 	:is=\E[2;4;20;30;40l\E[?1;10;16l\E[12h\E[?7;8;25h:\
 	:ke=\E>:ks=\E[?1l\E=:le=^H:mb=\E[5m:md=\E[1m:\
-	:me=\E[m\017:mh=\E[2m:mk=\E[8m:mr=\E[7m:nd=\E[C:\
-	:pf=\E[4i:po=\E[5i:ps=\E[0i:rc=\E8:\
+	:me=\E[m\017:mh=\E[2m:mr=\E[7m:nd=\E[C:rc=\E8:\
 	:..sa=\E[0%?%p2%t;4%;%?%p3%p1%|%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p6%t;1%;%?%p7%t;8%;m%?%p9%t\016%e\017%;:\
 	:sc=\E7:se=\E[27m:sf=\n:so=\E[7m:sr=\EM:st=\EH:\
 	:ta=\011:te=\E[ R:ti=\E[ Q:\
 	:ts=\E[40l\E[40h\E7\E[99;%i%p1%dH:ue=\E[24m:up=\E[A:\
-	:us=\E[4m:ve=\E[34h\E[?25h:vi=\E[?25l:\
-	:vs=\E[?25h\E[34l:
+	:us=\E[4m:vb=\E[30h\E\\\054\E[30l:ve=\E[34h\E[?25h:\
+	:vi=\E[?25l:vs=\E[?25h\E[34l:
 #
-#	Function key set for the ASCII (wy-50 compatable) keyboard
+#	Function key set for the ASCII (wy-50 compatible) keyboard
+#	This is the default 370.
 #
-wy370-101k|Wyse 370 with 101 key keyboard:\
+wy370|wyse370|wy370-101k|Wyse 370 with 101 key keyboard:\
 	:k1=\E[?4i:k2=\E[?3i:k3=\E[2i:k4=\E[@:k5=\E[M:\
-	:k6=\E[17~:k7=\E[18~:k8=\E[19~:k9=\E[20~:kb=^H:\
-	:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:tc=wy370-nk:
+	:k6=\E[17~:k7=\E[18~:k8=\E[19~:k9=\E[20~:kD=\EOQ:\
+	:kI=\EOP:kN=\E[U:kP=\E[V:kb=^H:kd=\E[B:kh=\E[H:\
+	:kl=\E[D:kr=\E[C:ku=\E[A:tc=wy370-nk:
 #
-#	Function key set for the VT-320 (and wy85) compatable keyboard
+#	Function key set for the VT-320 (and wy85) compatible keyboard
 #
 wy370-105k|Wyse 370 with 105 key keyboard:\
 	:K1=\EOw:K2=\EOu:K3=\EOy:K4=\EOq:K5=\EOs:k1=\EOP:\
 	:k2=\EOQ:k3=\EOR:k4=\EOS:k6=\E[17~:k7=\E[18~:\
-	:k8=\E[19~:k9=\E[20~:kb=^H:kd=\E[B:kh=\E[26~:kl=\E[D:\
-	:kr=\E[C:ku=\E[A:tc=wy370-nk:
+	:k8=\E[19~:k9=\E[20~:kD=\E[3~:kI=\E[2~:kN=\E[6~:\
+	:kP=\E[5~:kb=^H:kd=\E[B:kh=\E[26~:kl=\E[D:kr=\E[C:\
+	:ku=\E[A:tc=wy370-nk:
 #
-#	Function key set for the PC compatable keyboard
+#	Function key set for the PC compatible keyboard
 #
 wy370-EPC|Wyse 370 with 102 key keyboard:\
 	:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:k5=\E[M:k6=\E[17~:\
-	:k7=\E[18~:k8=\E[19~:k9=\E[20~:kb=^H:kd=\E[B:kh=\E[H:\
-	:kl=\E[D:kr=\E[C:ku=\E[A:tc=wy370-nk:
-#
-#	Set up the default WY-370.
-#
-wy370|wyse370|Wyse 370:\
-	:tc=wy370-101k:
+	:k7=\E[18~:k8=\E[19~:k9=\E[20~:kI=\E[2~:kN=\E[U:\
+	:kP=\E[V:kb=^H:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:\
+	:ku=\E[A:tc=wy370-nk:
 #
 #	Wyse 370 with visual bell.
 wy370-vb|Wyse 370 with visible bell:\
-	:vb=\E[30h\E\\\054\E[30l:tc=wy370:
+	:bl@:tc=wy370:
 #
 #	Wyse 370 in 132-column mode.
 wy370-w|Wyse 370 in 132-column mode:\
-	:co#132:ws#132:\
-	:tc=wy370:
+	:co#132:ws#132:\tc=wy370:
 #
 #	Wyse 370 in 132-column mode with visual bell.
 wy370-wvb|Wyse 370 with visible bell 132-columns:\
@@ -3419,7 +3986,7 @@ wy370-rv|Wyse 370 reverse video:\
 #	Wyse 99gt Tektronix 4010/4014 emulator,
 #
 wy99gt-tek|Wyse 99gt Tektronix 4010/4014 emulator:\
-	:am:bs:os:\
+	:am:os:\
 	:co#74:li#35:\
 	:bl=^G:cl=\E^L:\
 	:..cm=\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:\
@@ -3438,7 +4005,7 @@ wy160-tek|Wyse 160 Tektronix 4010/4014 emulator:\
 #	Wyse 370 Tektronix 4010/4014 emulator,
 #
 wy370-tek|Wyse 370 Tektronix 4010/4014 emulator:\
-	:am:bs:os:\
+	:am:os:\
 	:co#80:li#36:\
 	:bl=^G:cl=\E^L:\
 	:..cm=\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:\
@@ -3453,13 +4020,12 @@ wy370-tek|Wyse 370 Tektronix 4010/4014 emulator:\
 
 # From: Eric Freudenthal <freudent@eric.ultra.nyu.edu>
 wy100q|Wyse 100 for Quotron:\
-	:bs:\
 	:co#80:li#24:sg#1:ug#1:\
 	:al=\EE:bt=\EI:cd=\EY:ce=\ET:cl=^Z:cm=\E=%+ %+ :\
 	:dc=\EW:dl=\ER:do=^J:ei=\Er:ho=^^:im=\Eq:\
 	:is=\E`\072\200\EC\EDF\E0\E'\E(\EA21:kd=^J:kl=^H:\
-	:kr=^L:ku=^K:nd=^L:se=\EG0:so=\EG4:sr=\Ej:ue=\EG0:\
-	:up=^K:us=\EG8:
+	:kr=^L:ku=^K:le=^H:nd=^L:se=\EG0:so=\EG4:sr=\Ej:\
+	:ue=\EG0:up=^K:us=\EG8:
 
 #### Kermit terminal emulations
 #
@@ -3472,17 +4038,17 @@ wy100q|Wyse 100 for Quotron:\
 # (kermit: removed obsolete ":ma=^Hh^Jj^Kk^Ll^^H:" -- esr)
 # From: greg small <gts@populi.berkeley.edu> 9-25-84
 kermit|standard kermit:\
-	:bs:\
 	:co#80:li#24:\
 	:cd=\EJ:ce=\EK:cl=\EE:cm=\EY%+ %+ :ho=\EH:\
 	:is=K0 Standard Kermit  9-25-84\n:kd=^J:kh=^^:kl=^H:\
-	:kr=^L:ku=^K:nd=\EC:up=\EA:
-kermitam|standard kermit plus auto-margin:\
+	:kr=^L:ku=^K:le=^H:nd=\EC:up=\EA:
+kermit-am|standard kermit plus auto-margin:\
 	:am:\
 	:is=K1 Standard Kermit plus Automatic Margins\n:tc=kermit:
 # IBMPC Kermit 1.2.
-# Bugs :cd:ce: do not work except at beginning of line!  :cl: does not work,
-# but fake with :cl=\EH\EJ (since :cd=\EJ: works at beginning of line).
+# Bugs: <ed>, <el>: do not work except at beginning of line!  <clear> does
+# not work, but fake with :cl=\EH\EJ (since :cd=\EJ: works at beginning of
+# line).
 # From: greg small <gts@populi.berkeley.edu> 8-30-84
 pckermit|pckermit12|UCB IBMPC Kermit 1.2:\
 	:am:\
@@ -3493,32 +4059,29 @@ pckermit|pckermit12|UCB IBMPC Kermit 1.2:\
 # Cannot use line 25, now acts funny like ansi special scrolling region.
 # Initialization must escape from that region by cursor position to line 24.
 # Cannot use character insert because 1.20 goes crazy if insert at col 80.
-# Does not use am: because autowrap mode lost when kermit dropped and restarted.
-# (pckermit: mapped ":pt:" to ":it#8:" -- esr)
+# Does not use :am: because autowrap is lost when kermit dropped and restarted.
 # From: greg small <gts@populi.berkeley.edu> 12-19-84
 pckermit120|UCB IBMPC Kermit 1.20:\
-	:am@:pt:\
 	:it#8:li#24:\
 	:al=\EL:dc=\EN:dl=\EM:do=\EB:ei@:im@:\
 	:is=\EO\Eq\EJ\EY7 K3 UCB IBMPC Kermit 1.20  12-19-84\n:\
-	:se=\Eq:so=\Ep:vs=\EO\Eq\EEK3:tc=kermit:
+	:se=\Eq:so=\Ep:ta=^I:vs=\EO\Eq\EEK3:tc=kermit:
 # MS-DOS Kermit 2.27 for the IBMPC
 # Straight ascii keyboard. :sr=\EI: not avail. many versions + bug prone in vi.
 # Cannot use line 25, now acts funny like ansi special scrolling region.
 # Initialization must escape from that region by cursor position to line 24.
-# Does not use am: because autowrap mode lost when kermit dropped and restarted.
+# Does not use am: because autowrap is lost when kermit dropped and restarted.
 # Reverse video for standout like H19.
-# (msk227: removed obsolete ":ma=^Hh^Jj^Kk^Ll^^H:";
-# mapped ":pt:" to ":it#8:" -- esr)
+# (msk227: removed obsolete ":ma=^Hh^Jj^Kk^Ll^^H:" -- esr)
 # From: greg small <gts@populi.berkeley.edu> 3-17-85
 msk227|mskermit227|MS-DOS Kermit 2.27 for the IBMPC:\
-	:am@:bs:pt:\
+	:am@:\
 	:co#80:it#8:li#24:\
 	:al=\EL:cd=\EJ:ce=\EK:cl=\EE:cm=\EY%+ %+ :dc=\EN:\
 	:dl=\EM:do=\EB:ei=\EO:ho=\EH:im=\E@:\
 	:is=\EO\Eq\EG\Ew\EJ\EY7 K4 MS Kermit 2.27 for the IBMPC 3-17-85\n:\
-	:kd=^J:kh=^^:kl=^H:kr=^L:ku=^K:nd=\EC:rc=\Ek:sc=\Ej:\
-	:se=\Eq:so=\Ep:up=\EA:vs=\EO\Eq\EG\EwK4:
+	:kd=^J:kh=^^:kl=^H:kr=^L:ku=^K:le=^H:nd=\EC:rc=\Ek:\
+	:sc=\Ej:se=\Eq:so=\Ep:ta=^I:up=\EA:vs=\EO\Eq\EG\EwK4:
 # MS-DOS Kermit 2.27 with automatic margins
 # From:	greg small <gts@populi.berkeley.edu> 3-17-85
 msk227am|mskermit227am|UCB MS-DOS Kermit 2.27 with automatic margins:\
@@ -3526,8 +4089,8 @@ msk227am|mskermit227am|UCB MS-DOS Kermit 2.27 with automatic margins:\
 	:is=\EO\Eq\EG\Ev\EJ\EY7 K5 MS Kermit 2.27 +automatic margins 3-17-85\n:\
 	:vs=\EO\Eq\EG\EvK5:tc=msk227:
 # MS-DOS Kermit 2.27 UCB 227.14 for the IBM PC
-# Automatic margins now default.  Use ansi set graphic rendition for standout,
-# underline and ul codes (:md:,:me:,:mr:).  Define function keys.
+# Automatic margins now default.  Use ansi <sgr> for highlights.
+# Define function keys.
 # (msk22714: removed obsolete ":kn#10:" -- esr)
 # From: greg small <gts@populi.berkeley.edu> 3-17-85
 msk22714|mskermit22714|UCB MS-DOS Kermit 2.27 UCB 227.14 IBM PC:\
@@ -3539,25 +4102,83 @@ msk22714|mskermit22714|UCB MS-DOS Kermit 2.27 UCB 227.14 IBM PC:\
 # This was designed for a VT320 emulator, but it is probably a good start
 # at support for the VT320 itself.
 # Please send changes with explanations to bug-gnu-emacs@prep.ai.mit.edu.
+# (vt320-k3: I added <rmam>/<smam> based on the init string -- esr)
 vt320-k3|MS-Kermit 3.00's vt320 emulation:\
 	:am:es:hs:km:mi:ms:xn:\
 	:co#80:it#8:li#49:pb#9600:vt#3:\
 	:AL=\E[%dL:CC=\E:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:\
 	:IC=\E[%d@:LE=\E[%dD:RI=\E[%dC:SR=\E[%dL:UP=\E[%dA:\
 	:ae=\E(B:al=\E[L:as=\E(0:bl=^G:cd=\E[J:ce=\E[K:\
-	:ch=\E[%i%dG:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:\
-	:cs=\E[%i%d;%dr:ct=\E[3g:cv=\E[%i%dd:dc=\E[P:dl=\E[M:\
-	:do=^J:ds=\E[0$~:ec=\E[%dX:ei=\E[4l:fs=\E[0$}:\
-	:ho=\E[H:im=\E[4h:is=\E>\E F\E[?1l\E[?7h\E[r\E[2$~:\
-	:k0=\E[21~:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:k6=\E[17~:\
-	:k7=\E[18~:k8=\E[19~:k9=\E[20~:kb=^H:kd=\EOB:\
-	:ke=\E[?1l\E>:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:ku=\EOA:\
-	:le=^H:mb=\E[5m:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:\
-	:nw=^M^J:pf=\E[4i:po=\E[5i:ps=\E[0i:rc=\E8:sc=\E7:\
+	:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:\
+	:ct=\E[3g:dc=\E[P:dl=\E[M:do=^J:ds=\E[0$~:ec=\E[%dX:\
+	:ei=\E[4l:fs=\E[0$}:ho=\E[H:im=\E[4h:\
+	:is=\E>\E F\E[?1l\E[?7h\E[r\E[2$~:k0=\E[21~:k1=\EOP:\
+	:k2=\EOQ:k3=\EOR:k4=\EOS:k6=\E[17~:k7=\E[18~:\
+	:k8=\E[19~:k9=\E[20~:kI=\E[2~:kN=\E[6~:kP=\E[5~:\
+	:kb=^H:kd=\EOB:ke=\E[?1l\E>:kl=\EOD:kr=\EOC:\
+	:ks=\E[?1h\E=:ku=\EOA:le=^H:mb=\E[5m:md=\E[1m:\
+	:me=\E[m:mr=\E[7m:nd=\E[C:nw=^M^J:rc=\E8:sc=\E7:\
 	:se=\E[27m:sf=^J:so=\E[7m:sr=\EM:st=\EH:ta=^I:\
 	:ts=\E[1$}\r\E[K:ue=\E[24m:up=\E[A:us=\E[4m:\
 	:vb=\E[?5h\E[?5l\E[?5h\E[?5l\E[?5h\E[?5l:ve=\E[?25h:\
 	:vi=\E[?25l:
+# From: Joseph Gil <yogi@cs.ubc.ca> 13 Dec 1991
+# (I removed a bogus boolean :mo: and added <msgr>, <smam>, <rmam> -- esr)
+vt320-k311|dec vt320 series as defined by kermit 3.11:\
+	:am:es:hs:mi:ms:xn:xo:\
+	:co#80:it#8:li#24:vt#3:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
+	:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:al=3\E[L:bl=^G:\
+	:cd=\E[J:ce=\E[K:cl=\E[;H\E[2J:cm=\E[%i%d;%dH:cr=^M:\
+	:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:dl=\E[M:do=^J:\
+	:ds=\E[2$~\r\E[1$}\E[K\E[$}:ei=\E[4l:fs=\E[$}:\
+	:ho=\E[H:im=\E[4h:\
+	:is=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;24r\E[24;1H:\
+	:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:k6=\E[17~:k7=\E[18~:\
+	:k8=\E[19~:k9=\E[20~:kb=^H:kd=\EOB:ke=\E[?1l\E>:\
+	:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:ku=\EOA:le=^H:mb=\E[5m:\
+	:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:nw=^M\ED:rc=\E8:\
+	:sc=\E7:se=\E[27m:sf=\ED:so=\E[7m:sr=\EM:st=\EH:\
+	:ta=^I:ts=\E[2$~\E[1$}\E[1;%dH:ue=\E[24m:up=\E[A:\
+	:us=\E[4m:vb=\E[?5h\E[?5l:ve=\E[?25h:vi=\E[?25l:\
+	:vs=\E[?25h:
+
+######## NON-ANSI TERMINAL EMULATIONS
+#
+
+#### Avatar
+#
+# These entries attempt to describe Avatar, a terminal emulation used with
+# MS-DOS bulletin-board systems.  It was designed to give ANSI-like
+# capabilities, but with cheaper (shorter) control sequences.  Messy design,
+# excessively dependent on PC idiosyncracies, but apparently rather popular
+# in the BBS world.
+#
+# No color support.  Avatar doesn't fit either of the Tektronix or HP color
+# models that terminfo knows about.  An Avatar color attribute is the
+# low 7 bits of the IBM-PC display-memory attribute.  Bletch.
+#
+# I wrote these entries while looking at the Avatar spec.  I don't have
+# the facilities to test them.  Let me know if they work, or don't.
+#
+# From: Eric S. Raymond <esr@snark.thyrsus.com> 1 Nov 1995
+# (The <blink>/<bold>/<rev>/<smacs>/<smul>/<smso> capabilities exist only to
+# tell ncurses that the corresponding highlights exist; it should use <sgr>,
+# which is the only method that will actually work for multiple highlights.)
+avatar0|avatar terminal emulator level 0:\
+	:am:ms:\
+	:co#80:it#8:li#25:\
+	:as=:ce=^V^G:cm=\026\010%.%.:cr=^M:do=^V^D:le=^V^E:\
+	:mb=^A^V\177:md=^V^A^P:me=^V^A^G:mr=^A^Vp:nd=^V^F:\
+	:rp=\031%.%d:\
+	:..sa=\026\001%{0}%?%p1%t%{112}%|%;%?%p2%t%{1}%|%;%?%p3%t%{112}%|%;%?%p4%t{128}%|%;%?%p6%t%{16}%|%;:\
+	:sf=^J:so=^A^Vp:up=^V^C:us=^V^A:tc=klone+acs:
+# From: Eric S. Raymond <esr@snark.thyrsus.com> 1 Nov 1995
+avatar0+|avatar terminal emulator level 0+:\
+	:dc=^V^N:ei=\026\n\200\200\200\200:im=^V^I:tc=avatar0:
+# From: Eric S. Raymond <esr@snark.thyrsus.com> 1 Nov 1995
+avatar|avatar1|avatar terminal emulator level 1:\
+	:al=^V+:dl=^V-:ei=^V^P:ve=^V'^A:vi=^V'^B:vs=^V^C:tc=avatar0+:
 
 ######## OLDER TERMINAL TYPES
 #
@@ -3572,9 +4193,10 @@ vt320-k3|MS-Kermit 3.00's vt320 emulation:\
 # The AT&T/Teletype terminals group was sold to SunRiver Data Systems; for
 # details, see the header comment on the ADDS section.
 #
-# These are AT&T's official terminfo entries
+# These are AT&T's official terminfo entries.  All-caps aliases have been
+# removed.
 #
-att2300|ATT2300|sv80|AT&T 2300 Video Information Terminal 80 column mode:\
+att2300|sv80|AT&T 2300 Video Information Terminal 80 column mode:\
 	:am:eo:mi:ms:xo:\
 	:co#80:it#8:li#24:\
 	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
@@ -3582,18 +4204,12 @@ att2300|ATT2300|sv80|AT&T 2300 Video Information Terminal 80 column mode:\
 	:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:dc=\E[P:\
 	:dl=\E[M:do=^J:ei=\E[4l:ho=\E[H:im=\E[4h:k1=\E[1r:\
 	:k2=\E[2r:k3=\E[3r:k4=\E[4r:k5=\E[5r:k6=\E[6r:\
-	:k7=\E[7r:k8=\E[8r:k9=\E[9r:kb=^H:kd=\E[B:kh=\E[H:\
-	:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:me=\E[m:mr=\E[7m:\
-	:nd=\E[C:pf=\E[4i:po=\E[5i:ps=\E[0i:se=\E[0m:sf=^J:\
-	:so=\E[7m:ta=^I:up=\E[A:
+	:k7=\E[7r:k8=\E[8r:k9=\E[9r:kD=\E[P:kI=\E[@:kb=^H:\
+	:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:\
+	:me=\E[m:mr=\E[7m:nd=\E[C:se=\E[m:sf=^J:so=\E[7m:\
+	:ta=^I:up=\E[A:
 att2350|AT&T 2350 Video Information Terminal 80 column mode:\
-	:pf@:po@:ps@:tc=att2300:
-att2300-x40|sv40|AT&T 2300 Video Information Terminal 40 column mode:\
-	:co#40:it#5:li#23:\
-	:AL@:al@:tc=att2300:
-att2350-x40|ATT2350-x40|AT&T 2350 Video Information Terminal 40 column mode:\
-	:co#40:it#5:li#23:\
-	:AL@:al@:tc=att2350:
+	:tc=att2300:
 
 # Must setup RETURN KEY - CR, REC'VD LF - INDEX.
 # Seems upward compatible with vt100, plus ins/del line/char.
@@ -3612,9 +4228,9 @@ att5410v1|att4410v1|tty5410v1|AT&T 4410/5410 80 columns - version 1:\
 	:i1=\E[?3l\E)0:\
 	:i2=\E[1;03q   f1           \EOP\E[2;03q   f2           \EOQ\E[3;03q   f3           \EOR\E[4;03q   f4           \EOS\E[5;03q   f5           \EOT\E[6;03q   f6           \EOU\E[7;03q   f7           \EOV\E[8;03q   f8           \EOW:\
 	:ic=\E[@:im=:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:k5=\EOT:\
-	:k6=\EOU:k7=\EOV:k8=\EOW:kb=^H:kd=\E[B:kh=\E[H:\
-	:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:ll=\E[24H:mb=\E[5m:\
-	:md=\E[2;7m:me=\E[m\017:mh=\E[2m:mk=\E[8m:mr=\E[7m:\
+	:k6=\EOU:k7=\EOV:k8=\EOW:kH=\E[24;1H:kb=^H:kd=\E[B:\
+	:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:ll=\E[24H:\
+	:mb=\E[5m:md=\E[2;7m:me=\E[m\017:mh=\E[2m:mr=\E[7m:\
 	:nd=\E[C:nw=^M^J:rc=\E8:\
 	:..sa=\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%;:\
 	:sc=\E7:se=\E[m:sf=^J:so=\E[7m:sr=\EM:ta=^I:\
@@ -3627,20 +4243,12 @@ att4410v1-w|att5410v1-w|tty5410v1-w|AT&T 4410/5410 132 columns - version 1:\
 att4410|att5410|tty5410|AT&T 4410/5410 80 columns - version 2:\
 	:tc=att5410v1:
 
-att4410-nfk|att5410-nfk|4410-nfk|tty5410-nfk|5410-nfk|version 1 AT&T 4410/5410 entry without function keys:\
-	:i3@:k1@:k2@:k3@:k4@:k5@:k6@:k7@:k8@:tc=att4410:
-
 att5410-w|att4410-w|4410-w|tty5410-w|5410-w|AT&T 4410/5410 in 132 column mode:\
 	:co#132:ws#132:\
 	:i1=\E[?3h\E)0:tc=att4410:
 
-att5410-nsl|4410-nsl|att4410-nsl|ATT4410-nsl|tty5410-nsl|tty5410 entry without pln defined:\
-	:tc=att4410:
-
-otty5410|teletype 5410 for S5R2 curses:\
-	:ts=\E7\E[25;%p1%{1}%+%dH:tc=att4410:
-
 # 5410 in terms of a vt100
+# (v5410: added <rmam>/<smam> based on init string -- esr)
 v5410|5410 in terms of a vt100:\
 	:am:mi:ms:xo:\
 	:co#80:it#8:li#24:vt#3:\
@@ -3665,11 +4273,11 @@ v5410|5410 in terms of a vt100:\
 #
 # Has memory below (2 lines!)
 # 3 pages of memory (plus some spare)
-# The 5410 sequences for cup,cvvis,dch,dl,ech,flash,home,hpa,hts would work
-# for these, but these work in both scroll and window mode...
-# Unset insert character so insert mode works
-# is1 sets 80 column mode,
-# is2 escape sequence:
+# The 5410 sequences for <cup>, <cvvis>, <dch>, <dl>, <ech>, <flash>, <home>,
+# <hpa>, <hts> would work for these, but these work in both scroll and window
+# mode... Unset insert character so insert mode works
+# <is1> sets 80 column mode,
+# <is2> escape sequence:
 # 1) turn off all fonts
 # 2) function keys off, keyboard lock off, control display off,
 #    insert mode off, erasure mode off,
@@ -3682,30 +4290,31 @@ v5410|5410 in terms of a vt100:\
 # We use \212 to program the ^J because a bare ^J will get translated by
 # UNIX into a CR/LF. The enter key is needed for AT&T uOMS.
 #     1      2            3              4     5     6    7  8
-# is3 set screen color to black,
+# <is3> set screen color to black,
 # No representation in terminfo for the delete word key: kdw1=\Ed
 # Key capabilities assume the power-up send sequence...
-# This rmcup is not strictly necessary, but it helps maximize 
-# memory usefulness: rmcup=\Ez,
-# Alternate sgr0:	sgr0=\E[0m\EW^O,
-# Alternate sgr:	sgr=\E[%?%p1%t2;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p7%t;8%;m%?%p8%t\EV%;%?%p9%t^N%e^O%;,
+# This <rmcup> is not strictly necessary, but it helps maximize 
+# memory usefulness: <rmcup>=\Ez,
+# Alternate sgr0:	<sgr0>=\E[m\EW^O,
+# Alternate sgr:	<sgr>=\E[%?%p1%t2;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p7%t;8%;m%?%p8%t\EV%;%?%p9%t^N%e^O%;,
 # smkx programs the SYS PF keys to send a set sequence.
 # It also sets up labels f1, f2, ..., f8, and sends edit keys.
-# This string causes them to send the strings kf1-kf8
+# This string causes them to send the strings <kf1>-<kf8>
 # when pressed in SYS PF mode.
+# (att4415: I added <rmam>/<smam> based on the init string -- esr)
 att4415|tty5420|att5420|AT&T 4415/5420 80 cols:\
 	:db:mi:xo:\
 	:lm#78:ws#55:\
 	:AL=\E[%dL:CM=\E[%i%p1%d;%p2%dt:DC=\E[%dP:DL=\E[%dM:\
 	:DO=\E[%dB:IC=\E[%d@:LE=\E[%dD:RI=\E[%dC:SF=\E[%dE:\
-	:SR=\E[%dF:UP=\E[%dA:bt=\E[Z:ch=\E[%+^AG:cl=\E[x\E[J:\
-	:cm=\E[%i%d;%dx:ct=\E[3g:cv=\E[%+^Ad:ec=\E[%ds\E[%dD:\
-	:ei=\E[4l:ho=\E[x:i1=\E[?3l:i2=\E[?5l:ic@:im=\E[4h:\
-	:is=\E[0m\017\E[1;2;3;4;6l\E[12;13;14;20l\E[?6;97;99l\E[?7h\E[4i\Ex\E[21;1j\212:\
+	:SR=\E[%dF:UP=\E[%dA:bt=\E[Z:cl=\E[x\E[J:\
+	:cm=\E[%i%d;%dx:ct=\E[3g:ec=\E[%ds\E[%dD:ei=\E[4l:\
+	:ho=\E[x:i1=\E[?3l:i2=\E[?5l:ic@:im=\E[4h:\
+	:is=\E[m\017\E[1;2;3;4;6l\E[12;13;14;20l\E[?6;97;99l\E[?7h\E[4i\Ex\E[21;1j\212:\
 	:k1=\EOc:k2=\EOd:k3=\EOe:k4=\EOf:k5=\EOg:k6=\EOh:\
-	:k7=\EOi:k8=\EOj:ke=\E[19;0j\E[21;1j\212:\
-	:ks=\E[19;1j\E[21;4j\Eent:ll=\Ew:me=\E[0m\017:mp=\EV:\
-	:pf=\E[?9i:po=\E[?4i:ps=\E[?2i:\
+	:k7=\EOi:k8=\EOj:kD=\E[P:kH=\Eu:kI=\E[4h:kN=\E[U:\
+	:kP=\E[V:ke=\E[19;0j\E[21;1j\212:\
+	:ks=\E[19;1j\E[21;4j\Eent:ll=\Ew:me=\E[m\017:\
 	:..sa=\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%;:\
 	:st=\EH:ts=\E7\E[25;%p1%{8}%+%dH:vb=\E[?5h\E[?5l:\
 	:ve=\E[11;0j:vs=\E[11;1j:tc=att4410:
@@ -3739,9 +4348,6 @@ att4415-w-nl|tty5420-w-nl|att5420-w-nl|AT&T 4415/5420 132 cols without changing
 att4415-w-rv-n|tty5420-w-rv-n|att5420-w-rv-n|AT&T 4415/5420 132 cols reverse without changing labels:\
 	:k1@:k2@:k3@:k4@:k5@:k6@:k7@:k8@:tc=att4415+nl:tc=att4415-w-rv:
 
-otty5420|5420 for SVR2 curses on 3B20:\
-	:ch=\E[%+^AG:cv=\E[%+^Ad:tc=tty5420:
-
 # (untranslatable capabilities removed to fit entry within 1023 bytes)
 att5420_2|AT&T 5420 model 2 80 cols:\
 	:am:db:hs:mi:ms:xo:\
@@ -3749,24 +4355,23 @@ att5420_2|AT&T 5420 model 2 80 cols:\
 	:AL=\E[%dL:CM=\E[%i%p1%d;%p2%dt:DC=\E[%dP:DL=\E[%dM:\
 	:IC=\E[%d@:LE=\E[%dD:RI=\E[%dC:SF=\E[%dE:SR=\E[%dF:\
 	:UP=\E[%dA:ae=^O:al=\E[L:as=^N:bt=\E[1Z:cd=\E[0J:\
-	:ce=\E[0K:ch=\E[%+^AG:cl=\EH\EJ:cm=\E[%i%d;%dH:\
-	:cr=\EG:cs=\E[%i%d;%dr:ct=\E[3g:cv=\E[%+^Ad:dc=\E[P:\
-	:dl=\E[M:do=\E[1B:ec=\E[%ds\E[%dD:ei=:fs=\E8:ho=\E[H:\
+	:ce=\E[0K:cl=\EH\EJ:cm=\E[%i%d;%dH:cr=\EG:\
+	:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:dl=\E[M:do=\E[1B:\
+	:ec=\E[%ds\E[%dD:ei=:fs=\E8:ho=\E[H:\
 	:i1=\E[0;23r\Ex\Ey\E[2;0j\E[3;3j\E[4;0j\E[5;0j\E[6;0j\E[7;0j\E[8;0j\E[9;1j\E[10;0j\E[15;0j\E[16;1j\E[19;0j\E[20;1j\E[29;0j\E[1;24r:\
 	:ic=\E[@:im=:k1=\EOc:k2=\EOd:k3=\EOe:k4=\EOf:k5=\EOg:\
-	:k6=\EOh:k7=\EOi:k8=\EOj:kb=^H:kd=\E[B:ke=\E[19;0j:\
-	:kh=\E[H:kl=\E[D:kr=\E[C:ks=\E[19;1j:ku=\E[A:le=^H:\
-	:ll=\Ew:mb=\E[5m:me=\E[0m\017:mh=\E[2m:mk=\E[8m:\
-	:mp=\EV:mr=\E[7m:nd=\E[1C:nw=^M^J:pf=\E[4i:po=\E[5i:\
-	:ps=\E[?;2i:rc=\E8:sc=\E7:se=\E[m:sf=^J:so=\E[7m:\
-	:sr=\EM:st=\EH:ta=^I:ts=\E7\E[25;%p1%{8}%+%dH:\
-	:ue=\E[m:us=\E[4m:vb=\E[?5h\E[?5l:ve=\E[11;0j:\
-	:vs=\E[11;1j:
+	:k6=\EOh:k7=\EOi:k8=\EOj:kD=\E[P:kH=\Eu:kI=\E[4h:\
+	:kN=\E[U:kP=\E[V:kb=^H:kd=\E[B:ke=\E[19;0j:kh=\E[H:\
+	:kl=\E[D:kr=\E[C:ks=\E[19;1j:ku=\E[A:le=^H:ll=\Ew:\
+	:mb=\E[5m:me=\E[m\017:mh=\E[2m:mr=\E[7m:nd=\E[1C:\
+	:nw=^M^J:rc=\E8:sc=\E7:se=\E[m:sf=^J:so=\E[7m:sr=\EM:\
+	:st=\EH:ta=^I:ts=\E7\E[25;%p1%{8}%+%dH:ue=\E[m:\
+	:us=\E[4m:vb=\E[?5h\E[?5l:ve=\E[11;0j:vs=\E[11;1j:
 att5420_2-w|AT&T 5420 model 2 in 132 column mode:\
 	:co#132:\
 	:i1=\E[0;23r\Ex\Ey\E[2;0j\E[3;3j\E[4;0j\E[5;1j\E[6;0j\E[7;0j\E[8;0j\E[9;1j\E[10;0j\E[15;0j\E[16;1j\E[19;0j\E[20;1j\E[29;0j\E[1;24r:tc=att5420_2:
 
-att4418|att5418|ATT5418|AT&T 5418 80 cols:\
+att4418|att5418|AT&T 5418 80 cols:\
 	:am:xo:\
 	:co#80:li#24:\
 	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
@@ -3776,21 +4381,20 @@ att4418|att5418|ATT5418|AT&T 5418 80 cols:\
 	:i1=\E[?3l:ic=\E[1@:im=:is=\E)0\E?6l\E?5l:k1=\E[h:\
 	:k2=\E[i:k3=\E[j:k6=\E[k:k7=\E[l:k8=\E[f:k9=\E[w:\
 	:kd=\EU:kh=\Ec:kl=\E@:kr=\EA:ku=\ES:le=\E[D:mb=\E[5m:\
-	:me=\E[0m\017:mh=\E[2m:mr=\E[7m:nd=\E[C:rc=\E8:\
-	:sc=\E7:se=\E[0m:sf=^J:so=\E[7m:ue=\E[0m:up=\E[A:\
-	:us=\E[4m:
+	:me=\E[m\017:mh=\E[2m:mr=\E[7m:nd=\E[C:rc=\E8:sc=\E7:\
+	:se=\E[m:sf=^J:so=\E[7m:ue=\E[m:up=\E[A:us=\E[4m:
 att4418-w|att5418-w|AT&T 5418 132 cols:\
 	:co#132:\
 	:i1=\E[?3h:tc=att5418:
 
-tty4420|teletype 4420:\
+att4420|tty4420|teletype 4420:\
 	:da:db:eo:ms:ul:xo:\
 	:co#80:li#24:lm#72:\
 	:al=\EL:bl=^G:cd=\EJ:ce=\Ez:cl=\EH\EJ:cm=\EY%+ %+ :\
 	:cr=\EG:dc=\EP:dl=\EM:dm@:do=\EB:ed@:ho=\EH:k0=\EU:\
-	:k3=\E@:kd=\EB:kh=\EH:kl=^H:kr=\EC:ku=\EA:le=\ED:\
-	:nd=\EC:se=\E~:sf=\EH\EM\EY7 :so=\E}:ue=\EZ:up=\EA:\
-	:us=\E\\:
+	:k3=\E@:kD=\EP:kI=\E^:kd=\EB:kh=\EH:kl=^H:kr=\EC:\
+	:ku=\EA:le=\ED:nd=\EC:se=\E~:sf=\EH\EM\EY7 :so=\E}:\
+	:ue=\EZ:up=\EA:us=\E\\:
 
 #  The following is a termcap entry for the Teletype 4424
 #  asynchronous keyboard-display terminal.  It supports
@@ -3827,12 +4431,13 @@ att4424-1|tty4424-1|teletype 4424 in display function group I:\
 
 # The Teletype 5425 is really version 2 of the Teletype 5420. It 
 # is quite similar, except for some minor differences. No page 
-# mode, for example, so all of the cup sequences used above have 
+# mode, for example, so all of the <cup> sequences used above have 
 # to change back to what's being used for the 5410. Many of the 
 # option settings have changed their numbering as well.
 # 
 # This has been tested on a preliminary model.
 #
+# (att5425: added <rmam>/<smam> based on the init string -- esr)
 # (untranslatable capabilities removed to fit entry within 1023 bytes)
 att5425|tty5425|att4425|AT&T 4425/5425:\
 	:am:da:db:hs:mi:ms:xn:xo:\
@@ -3840,55 +4445,45 @@ att5425|tty5425|att4425|AT&T 4425/5425:\
 	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
 	:LE=\E[%dD:RI=\E[%dC:SF=\E[%dE:SR=\E[%dF:UP=\E[%dA:\
 	:ae=^O:al=\E[L:as=^N:bl=^G:bt=\E[Z:cd=\E[J:ce=\E[K:\
-	:ch=\E[%+^AG:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:\
-	:cs=\E[%i%d;%dr:ct=\E[3g:cv=\E[%+^Ad:dc=\E[P:dl=\E[M:\
-	:do=^J:ec=\E[%ds\E[%dD:ei=\E[4l:fs=\E8:ho=\E[H:\
-	:i1=\E<\E[?3l:i2=\E[?5l:im=\E[4h:\
-	:is=\E[0m\017\E[1;2;3;4;6l\E[12;13;14;20l\E[?6;97;99l\E[?7h\E[4i\Ex\E[25;1j\212:\
+	:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:\
+	:ct=\E[3g:dc=\E[P:dl=\E[M:do=^J:ec=\E[%ds\E[%dD:\
+	:ei=\E[4l:fs=\E8:ho=\E[H:i1=\E<\E[?3l:i2=\E[?5l:\
+	:im=\E[4h:\
+	:is=\E[m\017\E[1;2;3;4;6l\E[12;13;14;20l\E[?6;97;99l\E[?7h\E[4i\Ex\E[25;1j\212:\
 	:k1=\EOc:k2=\EOd:k3=\EOe:k4=\EOf:k5=\EOg:k6=\EOh:\
-	:k7=\EOi:k8=\EOj:kb=^H:kd=\E[B:\
+	:k7=\EOi:k8=\EOj:kD=\E[P:kI=\E[4h:kb=^H:kd=\E[B:\
 	:ke=\E[21;0j\E[25;1j\212:kh=\E[H:kl=\E[D:kr=\E[C:\
 	:ks=\E[21;1j\E[25;4j\Eent\E~:ku=\E[A:le=^H:ll=\E[24H:\
-	:mb=\E[5m:md=\E[2;7m:me=\E[m\017:mh=\E[2m:mk=\E[8m:\
-	:mp=\EV:mr=\E[7m:nd=\E[C:nw=^M^J:pf=\E[?9i:po=\E[?4i:\
-	:ps=\E[?2i:rc=\E8:sc=\E7:se=\E[m:sf=^J:so=\E[7m:\
-	:sr=\EM:st=\EH:ta=^I:ts=\E7\E[25;%p1%{8}%+%dH:\
-	:ue=\E[m:up=\E[A:us=\E[4m:vb=\E[?5h\E[?5l:\
-	:ve=\E[12;0j:vs=\E[12;1j:
+	:mb=\E[5m:md=\E[2;7m:me=\E[m\017:mh=\E[2m:mr=\E[7m:\
+	:nd=\E[C:nw=^M^J:rc=\E8:sc=\E7:se=\E[m:sf=^J:\
+	:so=\E[7m:sr=\EM:st=\EH:ta=^I:\
+	:ts=\E7\E[25;%p1%{8}%+%dH:ue=\E[m:up=\E[A:us=\E[4m:\
+	:vb=\E[?5h\E[?5l:ve=\E[12;0j:vs=\E[12;1j:
 
 att5425-nl|tty5425-nl|att4425-nl|AT&T 4425/5425 80 columns no labels:\
 	:ks=\E[21;1j\E[25;4j\Eent:tc=att4425:
 
-att5425-nl-w|tty5425-nl-w|att4425-nl-w|AT&T 4425/5425 132 columns no labels:\
-	:ks=\E[21;1j\E[25;4j\Eent:tc=att4425-w:
-
-tty5425-fk|att4425-fk|AT&T 4425/5425 without function keys:\
-	:ke@:ks@:tc=att5425:
-
 att5425-w|att4425-w|tty5425-w|teletype 4425/5425 in 132 column mode:\
 	:co#132:lm#54:ws#97:\
 	:i1=\E[?3h:tc=tty5425:
 
-tty5425-w-fk|att4425-w-fk|att5425-w-fk|AT&T 4425/5425 without function keys in wide mode:\
-	:ke@:ks@:tc=att5425-w:
-
-	
-# This had bogus capabilities: ri=\EM, ri=\E[1U, 
+# (att4426: his had bogus capabilities: :ri=\EM:, :ri=\E[1U:. 
+# I also added <rmam>/<smam> -- esr)
 att4426|tty4426|teletype 4426S:\
 	:am:da:db:xo:\
 	:co#80:li#24:lm#48:\
 	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
 	:LE=\E[%dD:RI=\E[%dC:SF=\E[%dS:SR=\E[%dT:UP=\E[%dA:\
 	:ae=\E(B:al=\EL:as=\E(0:bl=^G:cd=\E[J:ce=\E[0K:\
-	:ch=\E[%dG:cl=\E[H\E[2J\E[1U\E[H\E[2J\E[1V:\
-	:cm=\E[%i%d;%dH:cr=^M:ct=\E[3g:cv=\E[%dd:dc=\EP:\
-	:dl=\E[M:do=\E[B:ei=:ho=\E[H:i1=\Ec\E[?7h:ic=\E^:im=:\
-	:is=\E[m\E[1;24r:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:\
-	:k5=\EOT:k6=\EOU:k7=\EOV:k8=\EOW:kb=^H:kd=\EB:\
-	:kh=\E[H:kl=\ED:kr=\EC:ku=\EA:le=\E[D:ll=\E[24H:\
-	:md=\E[5m:me=\E[0m\E(B:mr=\E[7m:nd=\E[C:nw=^M^J:\
-	:rc=\E8:sc=\E7:se=\E[0m:sf=^J:so=\E[5m:sr=\ET:st=\E1:\
-	:ta=^I:ue=\E[m:up=\EA:us=\E[4m:
+	:cl=\E[H\E[2J\E[1U\E[H\E[2J\E[1V:cm=\E[%i%d;%dH:\
+	:cr=^M:ct=\E[3g:dc=\EP:dl=\E[M:do=\E[B:ei=:ho=\E[H:\
+	:i1=\Ec\E[?7h:ic=\E^:im=:is=\E[m\E[1;24r:k1=\EOP:\
+	:k2=\EOQ:k3=\EOR:k4=\EOS:k5=\EOT:k6=\EOU:k7=\EOV:\
+	:k8=\EOW:kH=\E[24;1H:kb=^H:kd=\EB:kh=\E[H:kl=\ED:\
+	:kr=\EC:ku=\EA:le=\E[D:ll=\E[24H:md=\E[5m:\
+	:me=\E[m\E(B:mr=\E[7m:nd=\E[C:nw=^M^J:rc=\E8:sc=\E7:\
+	:se=\E[m:sf=^J:so=\E[5m:sr=\ET:st=\E1:ta=^I:ue=\E[m:\
+	:up=\EA:us=\E[4m:
 
 # Terminfo entry for the AT&T 510 A Personal Terminal
 # Function keys 9 - 16 are available only after the 
@@ -3910,8 +4505,7 @@ att510a|510a|bct510a|510A|AT&T 510A Personal Terminal:\
 	:k5=\ENe:k6=\ENf:k7=\ENh:k8=\E[H:k9=\EOc:kb=^H:\
 	:kd=\E[B:ke=\E[19;0|:kl=\E[D:kr=\E[C:ks=\E[19;1|:\
 	:ku=\E[A:le=^H:mb=\E[5m:md=\E[2;7m:me=\E[m\017:\
-	:mh=\E[2m:mr=\E[7m:nd=\E[C:nw=\EE:pf=\E[?8i:\
-	:po=\E[?4i:ps=\E[0i:rc=\E8:\
+	:mh=\E[2m:mr=\E[7m:nd=\E[C:nw=\EE:rc=\E8:\
 	:..sa=\E[0%?%p5%p6%|%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1%|%p6%|%t;7%;m%?%p9%t\016%e\017%;:\
 	:sc=\E7:se=\E[m:sf=^J:so=\E[7m:sr=\EM:st=\EH:ta=^I:\
 	:ue=\E[m:up=\E[A:us=\E[4m:ve=\E[11;3|:vi=\E[11;0|:\
@@ -3932,85 +4526,73 @@ att510d|510d|bct510d|510D|AT&T 510D Personal Terminal:\
 	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
 	:LE=\E[%dD:RI=\E[%dC:SF=\E[%dS:SR=\E[%dT:UP=\E[%dA:\
 	:ae=^O:al=\E[L:as=^N:bl=^G:bt=\E[Z:cd=\E[0J:ce=\E[0K:\
-	:ch=\E[%+^AG:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:\
-	:ct=\E[3g:cv=\E[%+^Ad:dc=\E[P:dl=\E[M:do=\E[1B:\
-	:ei=\E[4l:ff=^L:ho=\E[H:i1=\E(B\E)1\E[5;0|:\
-	:i2=\E[21;1|\212:im=\E[4h:k1=\EOm:k2=\EOV:k3=\EOu:\
-	:k4=\ENj:k5=\ENe:k6=\ENf:k7=\ENh:k8=\E[H:k9=\EOc:\
-	:kb=^H:kd=\E[B:ke=\E[19;0|:kl=\E[D:kr=\E[C:\
-	:ks=\E[19;1|:ku=\E[A:le=^H:ll=\E#2:mb=\E[5m:\
-	:md=\E[2;7m:me=\E[m\017:mh=\E[2m:mk=\E[8m:mr=\E[7m:\
-	:nd=\E[C:nw=\EE:pf=\E[?8i:po=\E[?4i:ps=\E[0i:rc=\E8:\
-	:..rp=%p1%c\E[%p2%{1}%-%db:\
+	:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:ct=\E[3g:dc=\E[P:\
+	:dl=\E[M:do=\E[1B:ei=\E[4l:ff=^L:ho=\E[H:\
+	:i1=\E(B\E)1\E[5;0|:i2=\E[21;1|\212:im=\E[4h:k1=\EOm:\
+	:k2=\EOV:k3=\EOu:k4=\ENj:k5=\ENe:k6=\ENf:k7=\ENh:\
+	:k8=\E[H:k9=\EOc:kb=^H:kd=\E[B:ke=\E[19;0|:kl=\E[D:\
+	:kr=\E[C:ks=\E[19;1|:ku=\E[A:le=^H:ll=\E#2:mb=\E[5m:\
+	:md=\E[2;7m:me=\E[m\017:mh=\E[2m:mr=\E[7m:nd=\E[C:\
+	:nw=\EE:rc=\E8:..rp=%p1%c\E[%p2%{1}%-%db:\
 	:..sa=\E[0%?%p5%p6%|%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1%|%p6%|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;:\
 	:sc=\E7:se=\E[m:sf=^J:so=\E[7m:sr=\EM:st=\EH:ta=^I:\
 	:ue=\E[m:up=\E[A:us=\E[4m:ve=\E[11;3|:vs=\E[11;2|:
 
-# (untranslatable capabilities removed to fit entry within 1023 bytes)
-att513|att513-page|513-page|attis513-pfk|513bct|AT&T 513 using page mode:\
+# (att500: I merged this with the att513 entry, att500 just used att513 -- esr)
+att500|att513|500bct|513bct|AT&T 513 using page mode:\
 	:am:mi:ms:xn:xo:\
 	:co#80:li#24:\
 	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
 	:LE=\E[%dD:RI=\E[%dC:SF=\E[%dE:SR=\E[%dF:UP=\E[%dA:\
 	:ae=^O:al=\E[L:as=^N:bl=^G:bt=\E[Z:cd=\E[J:ce=\E[K:\
-	:ch=\E[%+^AG:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:\
-	:cs=%i\E[%d;%dr:ct=\E[3g:cv=\E[%+^Ad:dc=\E[P:dl=\E[M:\
-	:do=^J:ei=\E[4l:ho=\E[H:\
+	:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:cs=%i\E[%d;%dr:\
+	:ct=\E[3g:dc=\E[P:dl=\E[M:do=^J:ei=\E[4l:ho=\E[H:\
 	:i1=\E?\E[3;3|\E[10;0|\E[21;1|\212\E[6;1|\E[1{\E[?99l:\
 	:im=\E[4h:k1=\EOc:k2=\EOd:k3=\EOe:k4=\EOf:k5=\EOg:\
-	:k6=\EOh:k7=\EOi:k8=\EOj:kb=^H:kd=\E[B:\
-	:ke=\E[19;0|\E[21;1|\212:kh=\E[H:kl=\E[D:kr=\E[C:\
-	:ks=\E[19;1|\E[21;4|\Eent:ku=\E[A:le=^H:ll=\E#2:\
-	:mb=\E[5m:md=\E[2;7m:me=\E[m\017:mh=\E[2m:mk=\E[8m:\
-	:mr=\E[7m:nd=\E[C:nw=\EE:pf=\E[?98l\E[?8i:\
-	:po=\E[?98l\E[?4i:ps=\E[?98l\E[0i:rc=\E8:sc=\E7:\
-	:se=\E[m:sf=^J:so=\E[7m:sr=\EM:st=\EH:ta=^I:ue=\E[m:\
-	:up=\E[A:us=\E[4m:ve=\E[11;0|:vs=\E[11;1|:
-
-att500|bct500|500|AT&T-IS 500 terminal:\
-	:tc=att513:
+	:k6=\EOh:k7=\EOi:k8=\EOj:kD=\ENf:kI=\ENj:kN=\E[U:\
+	:kP=\E[V:kb=^H:kd=\E[B:ke=\E[19;0|\E[21;1|\212:\
+	:kh=\E[H:kl=\E[D:kr=\E[C:ks=\E[19;1|\E[21;4|\Eent:\
+	:ku=\E[A:le=^H:ll=\E#2:mb=\E[5m:md=\E[2;7m:\
+	:me=\E[m\017:mh=\E[2m:mr=\E[7m:nd=\E[C:nw=\EE:rc=\E8:\
+	:..rp=%p1%c\E[%p2%{1}%-%db:\
+	:..sa=\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%;:\
+	:sc=\E7:se=\E[m:sf=^J:so=\E[7m:sr=\EM:st=\EH:ta=^I:\
+	:ue=\E[m:up=\E[A:us=\E[4m:ve=\E[11;0|:vs=\E[11;1|:
 
 # 01-07-88
 # printer must be set to EMUL ANSI to accept ESC codes
-# cuu1 stops at top margin
-# is1 sets cpi 10,lpi 6,form 66,left 1,right 132,top 1,bottom 66,font
+# <cuu1> stops at top margin
+# <is1> sets cpi 10,lpi 6,form 66,left 1,right 132,top 1,bottom 66,font
 #	and alt font ascii,wrap on,tabs cleared
-# is2 disables newline on LF,Emphasized off
-# The u0 capability sets form length
-att5320|AT&T Model 5320 matrix printer:\
+# <is2> disables newline on LF,Emphasized off
+# The <u0> capability sets form length
+att5310|att5320|AT&T Model 53210 or 5320 matrix printer:\
 	:co#132:it#8:li#66:\
-	:DO=\E[%de:RI=\E[%da:ch=\E[%d`:cr=^M:cv=\E[%dd:do=^J:\
-	:ff=^L:i1=\Ec:is=\E[20l\r:nd= :ta=^I:up=\EM:
-
-att5310|AT&T 5310 matrix printer:\
-	:co#80:\
-	:tc=att5320:
+	:DO=\E[%de:RI=\E[%da:cr=^M:do=^J:ff=^L:i1=\Ec:\
+	:is=\E[20l\r:nd= :ta=^I:up=\EM:
 
 # 5620 terminfo  (2.0 or later ROMS with char attributes)
-# assumptions: ind (scroll forward one line) is only done at screen bottom
+# assumptions: <ind> (scroll forward one line) is only done at screen bottom
+# For more, see the 5620 FAQ maintained by David Breneman <daveb@dgtl.com>.
 att5620|dmd|tty5620|ttydmd|5620|5620 terminal 88 columns:\
 	:NL:am:xo:\
 	:co#88:it#8:li#70:\
 	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:IC=\E[%d@:SF=\E[%dS:\
 	:SR=\E[%dT:al=\E[L:bl=^G:cd=\E[J:ce=\E[K:cl=\E[H\E[J:\
 	:cm=\E[%i%d;%dH:cr=^M:dc=\E[P:dl=\E[M:do=\E[B:ei=:\
-	:ho=\E[H:ic=\E[@:im=:kb=^H:kd=\E[B:kh=\E[H:kl=\E[D:\
-	:kr=\E[C:ku=\E[A:le=^H:md=\E[2m:me=\E[0m:mh=\E[2m:\
-	:mr=\E[7m:nd=\E[C:nw=^J:rc=\E8:sc=\E7:se=\E[0m:\
-	:sf=\E[S:so=\E[7m:sr=\E[T:ta=^I:ue=\E[0m:up=\E[A:\
-	:us=\E[4m:
-
+	:ho=\E[H:ic=\E[@:im=:kH=\E[70;1H:kb=^H:kd=\E[B:\
+	:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:md=\E[2m:\
+	:me=\E[m:mh=\E[2m:mr=\E[7m:nd=\E[C:nw=^J:rc=\E8:\
+	:sc=\E7:se=\E[m:sf=\E[S:so=\E[7m:sr=\E[T:ta=^I:\
+	:ue=\E[m:up=\E[A:us=\E[4m:
 att5620-24|dmd-24|teletype dmd 5620 in a 24x80 layer:\
-	:li#24:\
-	:tc=att5620:
-
+	:li#24:\tc=att5620:
 att5620-34|dmd-34|teletype dmd 5620 in a 34x80 layer:\
-	:li#34:\
-	:tc=att5620:
+	:li#34:\tc=att5620:
 
-# Entries for kf15 thru kf28 refer to the shifted system pf keys.
+# Entries for <kf15> thru <kf28> refer to the shifted system pf keys.
 #
-# Entries for kf29 thru kf46 refer to the alternate keypad mode
+# 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:\
 	:am:eo:xo:\
@@ -4020,21 +4602,23 @@ att605|605bct|AT&T 605  80 column  102key keyboard:\
 	:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:dc=\E[P:dl=\E[M:\
 	:do=\E[B:ei=\E[4l:fs=\E8:\
 	:i1=\E[8;0|\E[?\E[13;20l\E[?\E[12h:ic=\E[@:im=\E[4h:\
-	:is=\E[0m\017:k1=\EOc:k2=\EOd:k3=\EOe:k4=\EOf:\
-	:k5=\EOg:k6=\EOh:k7=\EOi:k8=\EOj:k9=\ENo:kb=^H:\
-	:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:\
-	:ll=\E[24H:mb=\E[5m:md=\E[1m:me=\E[m\017:mh=\E[2m:\
-	:mk=\E[8m:mr=\E[7m:nd=\E[C:nw=\EE:pf=\E[?4i:\
-	:po=\E[?5i:rc=\E8:sc=\E7:se=\E[m:sf=^J:so=\E[7m:\
-	:ta=^I:ts=\E7\E[25;%i%p1%dx:ue=\E[m:up=\E[A:us=\E[4m:
+	:is=\E[m\017:k1=\EOc:k2=\EOd:k3=\EOe:k4=\EOf:k5=\EOg:\
+	:k6=\EOh:k7=\EOi:k8=\EOj:k9=\ENo:kD=\E[P:kI=\E[@:\
+	:kN=\E[U:kP=\E[V:kb=^H:kd=\E[B:kh=\E[H:kl=\E[D:\
+	:kr=\E[C:ku=\E[A:le=^H:ll=\E[24H:mb=\E[5m:md=\E[1m:\
+	:me=\E[m\017:mh=\E[2m:mr=\E[7m:nd=\E[C:nw=\EE:rc=\E8:\
+	:sc=\E7:se=\E[m:sf=^J:so=\E[7m:ta=^I:\
+	:ts=\E7\E[25;%i%p1%dx:ue=\E[m:up=\E[A:us=\E[4m:
 att605-pc|605bct-pc|ATT 605 in pc term mode:\
 	:AL=\E[L:al=\E[L:bt=\E[Z:dc=\E[P:dl=\E[M:do=\E[B:ei=:\
 	:ic=\E[@:im=:k1=\E[M:k2=\E[N:k3=\E[O:k4=\E[P:k5=\E[Q:\
-	:k6=\E[R:k7=\E[S:k8=\E[T:k9=\E[U:kd=\E[B:kh=\E[H:\
-	:kl=\E[D:kr=\E[C:ku=\E[A:le=\E[D:nd=\E[C:up=\E[A:tc=att605:
+	:k6=\E[R:k7=\E[S:k8=\E[T:k9=\E[U:kD=\E[P:kI=\E[@:\
+	:kN=\E[G:kP=\E[I:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:\
+	:ku=\E[A:le=\E[D:nd=\E[C:up=\E[A:tc=att605:
 att605-w|605bct-w|AT&T 605-w 132 column 102 key keyboard:\
 	:co#132:ws#132:\
 	:i1=\E[8;0|\E[?4;5;13;15l\E[13;20l\E[?3;7h\E[12h\E(B\E)0:tc=att605:
+# (att610: I added <rmam>/<smam> based on the init string -- esr)
 att610|610bct|AT&T 610; 80 column; 98key keyboard:\
 	:am:es:hs:mi:ms:xn:xo:\
 	:co#80:it#8:li#24:ws#80:\
@@ -4044,12 +4628,11 @@ att610|610bct|AT&T 610; 80 column; 98key keyboard:\
 	:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:dc=\E[P:dl=\E[M:\
 	:do=\E[B:ei=\E[4l:fs=\E8:ho=\E[H:\
 	:i1=\E[8;0|\E[?3;4;5;13;15l\E[13;20l\E[?7h\E[12h\E(B\E)0:\
-	:i2=\E(B\E)0:im=\E[4h:is=\E[0m\017:k1=\EOc:k2=\EOd:\
+	:i2=\E(B\E)0:im=\E[4h:is=\E[m\017:k1=\EOc:k2=\EOd:\
 	:k3=\EOe:k4=\EOf:k5=\EOg:k6=\EOh:k7=\EOi:k8=\EOj:\
 	:k9=\ENo:kb=^H:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:\
 	:ku=\E[A:le=^H:ll=\E[24H:mb=\E[5m:md=\E[1m:\
-	:me=\E[m\017:mh=\E[2m:mk=\E[8m:mr=\E[7m:nd=\E[C:\
-	:nw=\EE:pf=\E[?4i:po=\E[?5i:rc=\E8:\
+	:me=\E[m\017:mh=\E[2m:mr=\E[7m:nd=\E[C:nw=\EE:rc=\E8:\
 	:..sa=\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%;:\
 	:sc=\E7:se=\E[m:sf=\ED:so=\E[7m:sr=\EM:ta=^I:\
 	:ts=\E7\E[25;%i%p1%dx:ue=\E[m:up=\E[A:us=\E[4m:\
@@ -4060,7 +4643,7 @@ att610-w|610bct-w|AT&T 610; 132 column; 98key keyboard:\
 	:i1=\E[8;0|\E[?4;5;13;15l\E[13;20l\E[?3;7h\E[12h:tc=att610:
 
 att610-103k|610-103k|610bct-103k|AT&T 610; 80 column; 103key keyboard:\
-	:k9@:tc=att610:
+	:k9@:kD=\ENf:kI=\ENj:kN=\E[U:kP=\E[V:tc=att610:
 att610-103k-w|610-103k-w|610bct-103k-w|AT&T 610; 132 column; 103key keyboard:\
 	:co#132:ws#132:\
 	:i1=\E[8;0|\E[?4;5;13;15l\E[13;20l\E[?3;7h\E[12h:tc=att610-103k:
@@ -4072,6 +4655,7 @@ att615-103k|615-103k|615mt-103k|AT&T 615; 80 column; 103key keyboard:\
 	:tc=att610-103k:
 att615-103k-w|615-103k-w|615mt-103k-w|AT&T 615; 132 column; 103key keyboard:\
 	:tc=att610-103k-w:
+# (att620: I added <rmam>/<smam> based on the init string -- esr)
 att620|620mtg|AT&T 620; 80 column; 98key keyboard:\
 	:am:es:hs:mi:ms:xn:xo:\
 	:co#80:it#8:li#24:ws#80:\
@@ -4081,12 +4665,12 @@ att620|620mtg|AT&T 620; 80 column; 98key keyboard:\
 	:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:\
 	:dc=\E[P:dl=\E[M:do=\E[B:ei=\E[4l:fs=\E8:ho=\E[H:\
 	:i1=\E[8;0|\E[?3;4;5;13;15l\E[13;20l\E[?7h\E[12h:\
-	:i2=\E(B\E)0:im=\E[4h:is=\E[0m\017:k1=\EOc:k2=\EOd:\
+	:i2=\E(B\E)0:im=\E[4h:is=\E[m\017:k1=\EOc:k2=\EOd:\
 	:k3=\EOe:k4=\EOf:k5=\EOg:k6=\EOh:k7=\EOi:k8=\EOj:\
 	:k9=\ENo:kb=^H:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:\
 	:ku=\E[A:le=^H:ll=\E[24H:mb=\E[5m:md=\E[1m:\
-	:me=\E[m\E(B\017:mh=\E[2m:mk=\E[8m:mr=\E[7m:nd=\E[C:\
-	:nw=\EE:pf=\E[?4i:po=\E[?5i:rc=\E8:\
+	:me=\E[m\E(B\017:mh=\E[2m:mr=\E[7m:nd=\E[C:nw=\EE:\
+	:rc=\E8:\
 	:..sa=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1%|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;:\
 	:sc=\E7:se=\E[m:sf=\ED:so=\E[7m:sr=\EM:ta=^I:\
 	:ts=\E7\E[25;%i%p1%dx:ue=\E[m:up=\E[A:us=\E[4m:\
@@ -4096,7 +4680,7 @@ att620-w|620-w|620mtg-w|AT&T 620; 132 column; 98key keyboard:\
 	:co#132:ws#132:\
 	:i1=\E[8;0|\E[?4;5;13;15l\E[13;20l\E[?3;7h\E[12h:tc=att620:
 att620-103k|620-103k|620mtg-103k|AT&T 620; 80 column; 103key keyboard:\
-	:k9@:tc=att620:
+	:k9@:kD=\ENf:kI=\ENj:kN=\E[U:kP=\E[V:tc=att620:
 
 att620-103k-w|620-103k-w|620mtg-103k-w|AT&T 620; 132 column; 103key keyboard:\
 	:co#132:ws#132:\
@@ -4110,32 +4694,30 @@ att630|5630|5630DMD|630MTG|AT&T 630 windowing terminal:\
 	:LE=\E[%dD:RI=\E[%dC:SF=\E[%dS:SR=\E[%dT:UP=\E[%dA:\
 	:al=\E[L:bl=^G:bt=\E[Z:cd=\E[J:ce=\E[K:cl=\E[H\E[J:\
 	:cm=\E[%i%d;%dH:cr=^M:dc=\E[P:dl=\E[M:do=\E[B:\
-	:ei=\E[4l:ho=\E[H:im=\E[4h:is=\E[m:k9=\ENo:kb=^H:\
-	:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:\
-	:me=\E[m:mr=\E[7m:nd=\E[C:nw=^M^J:pf=\E[?4i:\
-	:po=\E[?5i:rc=\E8:\
+	:ei=\E[4l:ho=\E[H:im=\E[4h:is=\E[m:k9=\ENo:kD=\E[P:\
+	:kI=\E[@:kb=^H:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:\
+	:ku=\E[A:le=^H:me=\E[m:mr=\E[7m:nd=\E[C:nw=^M^J:\
+	:rc=\E8:\
 	:..sa=\E[0%?%p2%t;4%;%?%p1%p3%|%p4%|%p5%|%t;7%;m:\
 	:sc=\E7:se=\E[m:sf=\ED:so=\E[7m:sr=\EM:ta=^I:ue=\E[m:\
 	:up=\E[A:us=\E[4m:
-
-
 att630-24|5630-24|5630DMD-24|630MTG-24|AT&T 630 windowing terminal 24 lines:\
-	:li#24:\
-	:tc=att630:
+	:li#24:\tc=att630:
 
 # This entry was modified 3/13/90 by JWE.
-# fixes include additions of enacs, correcting rep, and modification
-# of kHOM.  (See comments below)
-# has status line of 80 chars
-# These were commented out: indn=\E[%p1%dS, rin=\E[%p1%dT,
-# the k25 and up keys are used for shifted system Fkeys
+# fixes include additions of <enacs>, correcting <rep>, and modification
+# of <kHOM>.  (See comments below)
+# att730 has status line of 80 chars
+# These were commented out: <indn>=\E[%p1%dS, <rin>=\E[%p1%dT,
+# the <kf25> and up keys are used for shifted system Fkeys
 # NOTE: JWE 3/13/90 The 98 key keyboard translation for shift/HOME is 
-# currently the same as khome (unshifted HOME or \E[H).  On the 102, 102+1
+# currently the same as <khome> (unshifted HOME or \E[H).  On the 102, 102+1
 # and 122 key keyboards, the 730's translation is \E[2J.  For consistency
-# kHOM has been commented out.  The user can uncomment kHOM if using the
+# <kHOM> has been commented out.  The user can uncomment <kHOM> if using the
 # 102, 102+1, or 122 key keyboards
 #       kHOM=\E[2J,
-att730|730MTG|AT&T 730 windowing terminal Version:\
+# (att730: I added <rmam>/<smam> based on the init string -- esr)
+att730|730MTG|AT&T 730 windowing terminal:\
 	:am:da:db:es:hs:mi:ms:xn:xo:\
 	:co#80:it#8:li#60:lm#0:ws#80:\
 	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
@@ -4144,44 +4726,29 @@ att730|730MTG|AT&T 730 windowing terminal Version:\
 	:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:dc=\E[P:dl=\E[M:\
 	:do=\E[B:ei=\E[4l:fs=\E8:ho=\E[H:\
 	:i1=\E[8;0|\E[?3;4;5;13;15l\E[13;20l\E[?7h\E[12h\E(B\E)B:\
-	:i2=\E(B\E)0:im=\E[4h:is=\E[0m\017:k1=\EOc:k2=\EOd:\
+	:i2=\E(B\E)0:im=\E[4h:is=\E[m\017:k1=\EOc:k2=\EOd:\
 	:k3=\EOe:k4=\EOf:k5=\EOg:k6=\EOh:k7=\EOi:k8=\EOj:\
-	:k9=\ENo:kb=^H:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:\
-	:ku=\E[A:le=^H:mb=\E[5m:md=\E[1m:me=\E[m\017:\
-	:mh=\E[2m:mk=\E[8m:mr=\E[7m:nd=\E[C:nw=\EE:pf=\E[?4i:\
-	:po=\E[?5i:ps=\E[?19h\E[0i:rc=\E8:\
+	:k9=\ENo:kI=\E[@:kb=^H:kd=\E[B:kh=\E[H:kl=\E[D:\
+	:kr=\E[C:ku=\E[A:le=^H:mb=\E[5m:md=\E[1m:me=\E[m\017:\
+	:mh=\E[2m:mr=\E[7m:nd=\E[C:nw=\EE:rc=\E8:\
 	:..rp=%p1%c\E[%p2%{1}%-%db:\
 	:..sa=\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%;:\
 	:sc=\E7:se=\E[27m:sf=\ED:so=\E[7m:sr=\EM:ta=^I:\
 	:ts=\E7\E[;%i%p1%dx:ue=\E[24m:up=\E[A:us=\E[4m:\
 	:vb=\E[?5h\E[?5l:ve=\E[?25h\E[?12l:vi=\E[?25l:\
 	:vs=\E[?12;25h:
-
 att730-41|730MTG-41|AT&T 730-41 windowing terminal Version:\
-	:li#41:\
-	:tc=att730:
-
+	:li#41:\tc=att730:
 att730-24|730MTG-24|AT&T 730-24 windowing terminal Version:\
-	:li#24:\
-	:tc=att730:
-
+	:li#24:\tc=att730:
 att730r|730MTGr|AT&T 730 rev video windowing terminal Version:\
 	:i1=\E[8;0|\E[?3;4;13;15l\E[?5h\E[13;20l\E[?7h\E[12h\E(B\E)B:\
 	:vb=\E[?5l\E[?5h:tc=att730:
-
 att730r-41|730MTG-41r|AT&T 730r-41 rev video windowing terminal Version:\
-	:li#41:\
-	:tc=att730r:
-
+	:li#41:\tc=att730r:
 att730r-24|730MTGr-24|AT&T 730r-24 rev video windowing terminal Version:\
-	:li#24:\
-	:tc=att730r:
-
+	:li#24:\tc=att730r:
 
-# 05-Aug-86:
-# The following Terminfo entry describes functions which are supported by
-# the AT&T 5430/pt505 terminal software version 2 and later.
-#
 # The following represents the screen layout along with the associated
 # bezel buttons for the 5430/pt505 terminal. The "kf" designations do
 # not appear on the screen but are shown to reference the bezel buttons.
@@ -4225,6 +4792,12 @@ att730r-24|730MTGr-24|AT&T 730r-24 rev video windowing terminal Version:\
 #
 #                                                          MAIL
 #
+# version 1 note: 
+#	The character string sent by key 'kf26' may be user programmable
+#       to send either \E[16s, or \E[26s.
+#       The character string sent by key 'krfr' may be user programmable
+#       to send either \E[17s, or \E[27s.
+#
 # Depression of the "CMD" key sends    \E!    (kcmd)
 # Depression of the "MAIL" key sends   \E[26s (kf26)
 # "REDRAW" same as "REFRESH" (krfr)
@@ -4297,6 +4870,7 @@ att730r-24|730MTGr-24|AT&T 730r-24 rev video windowing terminal Version:\
 #                       *=  2 Printer available
 #                       V=  Software version number
 #                       SV= Software sub version number
+#	(printer-available field not documented in v1)
 #
 #       Screen Alingment Aid: \En
 #
@@ -4321,6 +4895,8 @@ att730r-24|730MTGr-24|AT&T 730r-24 rev video windowing terminal Version:\
 #                                         (kf00-kf06, kf18-kf24)
 #                       string= Text to sent on button depression
 #
+# The following in version 2 only:
+#
 #       Request For Local Directory Data: \EPp12;\
 #
 #       Local Directory Data to host: \EPp11;LOCAL...DIRECTORY...DATA\
@@ -4331,6 +4907,10 @@ att730r-24|730MTGr-24|AT&T 730r-24 rev video windowing terminal Version:\
 #
 #	Disable 'Prt on Line' mode: \024 (DC4)
 #
+
+# 05-Aug-86:
+# The following Terminfo entry describes functions which are supported by
+# the AT&T 5430/pt505 terminal software version 2 and later.
 att505|pt505|att5430|gs5430|AT&T Personal Terminal 505 or 5430 GETSET terminal:\
 	:am:xo:\
 	:co#80:it#8:li#24:\
@@ -4338,242 +4918,21 @@ att505|pt505|att5430|gs5430|AT&T Personal Terminal 505 or 5430 GETSET terminal:\
 	:RI=\E[%dC:UP=\E[%dA:ae=\E[10m:al=\E[L:as=\E[11m:\
 	:bl=^G:cd=\E[0J:ce=\E[0K:cl=\E[2J\E[H:cm=\E[%d;%dH:\
 	:cr=^M:dc=\E[P:dl=\E[M:do=\E[B:ei=\E[4l:ho=\E[H:\
-	:i1=\EPr\\E[0u\E[2J\E[0;0H\E[0m\E[3l\E[<l\E[4l\E[>l\E[=l\E[?l:\
+	:i1=\EPr\\E[0u\E[2J\E[0;0H\E[m\E[3l\E[<l\E[4l\E[>l\E[=l\E[?l:\
 	:im=\E[4h:k0=\E[00s:k1=\E[01s:k2=\E[02s:k3=\E[03s:\
 	:k4=\E[04s:k5=\E[05s:k6=\E[06s:kb=^H:kd=\E[B:kl=\E[D:\
-	:kr=\E[C:ku=\E[A:le=\E[D:mb=\E[5m:md=\E[1m:me=\E[0m:\
-	:mr=\E[7m:nd=\E[C:pf=\E[4i:po=\E[5i:rc=\E8:sc=\E7:\
-	:se=\E[0m:sf=^J:so=\E[1m:ta=^I:ue=\E[0m:up=\E[A:\
-	:us=\E[4m:ve=\E[>l:vs=\E[>h:
+	:kr=\E[C:ku=\E[A:le=\E[D:mb=\E[5m:md=\E[1m:me=\E[m:\
+	:mr=\E[7m:nd=\E[C:rc=\E8:sc=\E7:se=\E[m:sf=^J:\
+	:so=\E[1m:ta=^I:ue=\E[m:up=\E[A:us=\E[4m:ve=\E[>l:\
+	:vs=\E[>h:
 
-#
 # The following Terminfo entry describes functions which are supported by
 # the AT&T 5430/pt505 terminal software version 1.
-#
-# The following represents the screen layout along with the associated
-# bezel buttons for the 5430/pt505 terminal. The "kf" designations do
-# not appear on the screen but are shown to reference the bezel buttons.
-# The "CMD", "MAIL", and "REDRAW" buttons are shown in their approximate
-# position relative to the screen.
-#
-#
-#
-#      +----------------------------------------------------------------+
-#      |                                                                |
-# XXXX | kf0                                                       kf24 | XXXX
-#      |                                                                |
-#      |                                                                |
-# XXXX | kf1                                                       kf23 | XXXX
-#      |                                                                |
-#      |                                                                |
-# XXXX | kf2                                                       kf22 | XXXX
-#      |                                                                |
-#      |                                                                |
-# XXXX | kf3                                                       kf21 | XXXX
-#      |                                                                |
-#      |                                                                |
-# XXXX | kf4                                                       kf20 | XXXX
-#      |                                                                |
-#      |                                                                |
-# XXXX | kf5                                                       kf19 | XXXX
-#      |                                                                |
-#      |                                                                |
-# XXXX | kf6                                                       kf18 | XXXX
-#      |                                                                |
-#      |                                                                |
-# XXXX |                                                                | XXXX
-#      |                                                                |
-#      |                                                                |
-#      +----------------------------------------------------------------+
-#
-#          XXXX  XXXX  XXXX  XXXX  XXXX  XXXX  XXXX  XXXX  XXXX  XXXX
-#
-# Note: XXXX represents the screen buttons
-#                                                          CMD   REDRAW
-#
-#                                                          MAIL
-#
-#       Depression of the "CMD" key sends    \E!    (kcmd)
-# Depression of the "MAIL" key sends   (note) (kf26)
-# "REDRAW" same as "REFRESH" (krfr)    (note)
-#
-# note: The character string sent by key 'kf26' may be user programmable
-#       to send either \E[16s, or \E[26s.
-#       The character string sent by key 'krfr' may be user programmable
-#       to send either \E[17s, or \E[27s.
-#
-# "kf" functions adds carriage return to output string if terminal is in
-# 'new line' mode.
-#
-# The following are functions not covered in the table above:
-#
-#       Set keyboard character (SKC):
-#
-#               \EPn1;Pn2w
-#
-#                       Pn1= 0 Back Space key
-#                       Pn1= 1 Break key
-#                       Pn2=   Program char (hex)
-#
-#       Screen Definition (SDF):
-#
-#               \E[Pn1;Pn2;Pn3;Pn4;Pn5t
-#
-#                       Pn1=     Window number (1-39)
-#                       Pn2-Pn5= Y;X;Y;X coordinates
-#
-#       Screen Selection (SSL):
-#
-#               \E[Pnu
-#
-#                       Pn= Window number
-#
-#       Set Terminal Modes (SM):
-#
-#               \E[Pnh
-#
-#                       Pn= 3 Graphics mode
-#                       Pn= > Cursor blink
-#                       Pn= < Enter new line mode
-#                       Pn= = Enter reverse insert/replace mode
-#                       Pn= ? Enter no scroll mode
-#
-#       Reset Terminal Mode (RM):
-#
-#               \E[Pnl
-#
-#                       Pn= 3 Exit graphics mode
-#                       Pn= > Exit cursor blink
-#                       Pn= < Exit new line mode
-#                       Pn= = Exit reverse insert/replace mode
-#                       Pn= ? Exit no scroll mode
-#
-#       Screen Status Report (SSR):
-#
-#               \E[Pnp
-#
-#                       Pn= 0 Request current window number
-#                       Pn= 1 Request current window dimensions
-#
-#       Device Status Report (DSR):
-#
-#               \E[6n    Request cursor position
-#
-#       Call Status Report (CSR):
-#
-#               \E[Pnv
-#
-#                       Pn= 0 Call failed
-#                       Pn= 1 Call successful
-#
-#       Transparent Button String (TBS):
-#
-#               \E[Pn1;Pn2;Pn3;{string
-#
-#                       Pn1= Button number to be loaded
-#                       Pn2= Character count of "string"
-#                       Pn3= Key mode being loaded:
-#                               0= Unshifted
-#                               1= Shifted
-#                               2= Control
-#                       String= Text string (15 chars max)
-#
-#       Screen Number Report (SNR):
-#
-#               \E[Pnp
-#
-#                       Pn= Screen number
-#
-#       Screen Dimension Report (SDR):
-#
-#               \E[Pn1;Pn2r
-#
-#                       Pn1= Number of rows available in window
-#                       Pn2= Number of columns available in window
-#
-#       Cursor Position Report (CPR):
-#
-#               \E[Pn1;Pn2R
-#
-#                       Pn1= "Y" Position of cousor
-#                       Pn2= "X" Position of cursor
-#
-#       Request Answer Back (RAB):
-#
-#               \E[c
-#
-#       Answer Back Response (ABR):
-#
-#               \E[?;0;30;VSV
-#
-#                       V=  Software version number
-#                       SV= Software sub version number
-#
-#       Screen Alignment Aid:
-#
-#               \En
-#
-#       Bell (lower pitch):
-#
-#               \E[x
-#
-#       Dial Phone Number:
-#
-#               \EPdstring\
-#
-#                       string= Phone number to be dialed
-#
-#       Set Phone Labels:
-#
-#               \EPpstring\
-#
-#                       string= Label for phone buttons
-#
-#       Set Clock:
-#
-#               \EPchour;minute;second\
-#
-#       Position Clock:
-#
-#               \EPsY;X\
-#
-#                       Y= "Y" coordinate
-#                       X= "X" coordinate
-#
-#       Delete Clock:
-#
-#               \Epr\
-#
-#       Programming The Function Buttons:
-#
-#               \EPfPn;string\
-#
-#                       Pn= Button number (00-06, 18-24)
-#                                         (kf00-kf06, kf18-kf24)
-#
-#                       string= Text to sent on button depression
-#
-#
-#
-# 							05-Aug-86
-#
-# 
-att505-24|pt505-24|gs5430-24| AT&T PT505 or 5430 GETSET version 1 24 lines:\
-	:am:xo:\
-	:co#80:it#8:li#24:\
-	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:LE=\E[%dD:\
-	:RI=\E[%dC:UP=\E[%dA:ae=\E[10m:al=\E[L:as=\E[11m:\
-	:bl=^G:cd=\E[0J:ce=\E[0K:cl=\E[2J\E[H:cm=\E[%d;%dH:\
-	:cr=^M:dc=\E[P:dl=\E[M:do=\E[B:ei=\E[4l:ho=\E[H:\
-	:i1=\EPr\\E[0u\E[2J\E[0;0H\E[0m\E[3l\E[<l\E[4l\E[>l\E[=l\E[?l:\
-	:im=\E[4h:k0=\E[00s:k1=\E[01s:k2=\E[02s:k3=\E[03s:\
-	:k4=\E[04s:k5=\E[05s:k6=\E[06s:kb=^H:kd=\E[B:kl=\E[D:\
-	:kr=\E[C:ku=\E[A:le=\E[D:mb=\E[5m:md=\E[1m:me=\E[0m:\
-	:mr=\E[7m:nd=\E[C:se=\E[0m:sf=^J:so=\E[1m:ta=^I:\
-	:ue=\E[0m:up=\E[A:us=\E[4m:ve=\E[>l:vs=\E[>h:
-att505-22|pt505-22|gs5430-22| AT&T PT505 or 5430 GETSET version 1 22 lines:\
-	:li#22:\
-	:tc=att505-24:
+att505-24|pt505-24|gs5430-24|AT&T PT505 or 5430 GETSET version 1 24 lines:\
+	:li#24:\
+	:rc@:sc@:tc=att505:
+tt505-22|pt505-22|gs5430-22|AT&T PT505 or 5430 GETSET version 1 22 lines:\
+	:li#22:\tc=att505:
 #
 # -------------------- TERMINFO FILE CAN BE SPLIT HERE -----------------------
 # This cut mark helps make life less painful for people running ncurses tic
@@ -4588,11 +4947,10 @@ att505-22|pt505-22|gs5430-22| AT&T PT505 or 5430 GETSET version 1 22 lines:\
 # videotape.  I'm told they are located in Redwood City, CA.
 
 # From: <cbosg!ucbvax!SRC:george> Fri Sep 11 22:38:32 1981
-# (ampex80: mapped ":pt:" to default tabs; some capabilities merged in from
-# SCO's entry -- esr)
+# (ampex80: some capabilities merged in from SCO's entry -- esr)
 ampex80|a80|d80|dialogue|dialogue80|ampex dialogue 80:\
-	:am:bs:bw:pt:ul:\
-	:co#80:li#24:\
+	:am:bw:ul:\
+	:co#80:it#8:li#24:\
 	:al=\EE:bl=^G:bt=\EI:cd=\Ey:ce=\Et:cl=\E*:\
 	:cm=\E=%+ %+ :cr=^M:ct=\E3:dc=\EW:dl=\ER:do=^J:ei=:\
 	:ic=\EQ:im=:is=\EA:le=^H:nd=^L:se=\Ek:sf=^J:so=\Ej:\
@@ -4603,9 +4961,9 @@ ampex175|ampex d175:\
 	:co#80:li#24:\
 	:al=\EE:bl=^G:cd=\Ey:ce=\Et:cl=\E+:cm=\E=%+ %+ :\
 	:cr=^M:dc=\EW:dl=\ER:do=^J:ei=:ho=^^:ic=\EQ:im=:\
-	:is=\EX\EA\EF:kd=^J:kh=^^:kl=^H:kr=^L:ku=^K:le=^H:\
-	:ll=^^^K:nd=^L:se=\Ek:sf=^J:so=\Ej:te=\EF:ti=\EN:\
-	:ue=\Em:up=^K:us=\El:
+	:is=\EX\EA\EF:kD=\EW:kI=\EQ:kd=^J:kh=^^:kl=^H:kr=^L:\
+	:ku=^K:le=^H:ll=^^^K:nd=^L:se=\Ek:sf=^J:so=\Ej:\
+	:te=\EF:ti=\EN:ue=\Em:up=^K:us=\El:
 # No backspace key in the main QWERTY cluster. Fortunately, it has a
 # NEWLINE/PAGE key just above RETURN that sends a strange single-character
 # code.  Given a suitable Unix (one that lets you set an echo-erase-as-BS-SP-BS
@@ -4615,31 +4973,32 @@ ampex175|ampex d175:\
 ampex175-b|ampex d175 using left arrow for erase:\
 	:kb=^_:tc=ampex175:
 # From: Richard Bascove <atd!dsd!rcb@ucbvax.berkeley.edu>
-# (ampex210: removed obsolete ":kn#10:"; mapped ":pt:" to default tabs -- esr)
+# (ampex210: removed obsolete ":kn#10:" -- esr)
 ampex210|a210|ampex a210:\
-	:am:bs:hs:pt:xn:\
-	:co#80:li#24:sg#1:ug#1:\
+	:am:hs:xn:\
+	:co#80:it#8:li#24:sg#1:ug#1:\
 	:al=\EE:bt=\EI:cd=\Ey:ce=\Et:cl=\E*:cm=\E=%+ %+ :\
 	:dc=\EW:dl=\ER:ei=:fs=\E.2:ho=^^:ic=\EQ:\
 	:if=/usr/share/tabset/std:im=:\
 	:is=\EC\Eu\E'\E(\El\EA\E%\E{\E.2\EG0\Ed\En:k0=^A0\r:\
 	:k1=^A1\r:k2=^A2\r:k3=^A3\r:k4=^A4\r:k5=^A5\r:\
 	:k6=^A6\r:k7=^A7\r:k8=^A8\r:k9=^A9\r:kd=^V:kh=^^:\
-	:kl=^H:kr=^L:ku=^K:nd=^L:se=\EG0:so=\EG4:\
+	:kl=^H:kr=^L:ku=^K:le=^H:nd=^L:se=\EG0:so=\EG4:ta=^I:\
 	:ts=\E.0\Eg\E}\Ef:ue=\EG0:up=^K:us=\EG8:\
 	:vb=\EU\EX\EU\EX\EU\EX\EU\EX:
+# (ampex219: I added <rmam>/<smam> based on the init string -- esr)
 ampex219|ampex-219|amp219|Ampex with Automargins:\
 	:hs:xn:\
 	:co#80:it#8:li#24:\
-	:bl=^G:bt=\E[Z:cd=\E[J:ce=\E[K:cl=\E[;H\E[2J:\
+	:bl=^G:bt=\E[Z:cd=\E[J:ce=\E[K:cl=\E[H\E[2J:\
 	:cm=\E[%i%d;%dH:cr=^M:cs=%i\E[%2;%2r:do=\E[B:ho=\E[H:\
 	:is=\E>\E[?1l\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:\
 	:k0=\E[21~:k1=\E[7~:k2=\E[8~:k3=\E[9~:k4=\E[10~:\
 	:k5=\E[11~:k6=\E[17~:k7=\E[18~:k8=\E[19~:k9=\E[20~:\
 	:kd=\E[B:ke=\E>:kh=\E[H:kl=\E[D:kr=\E[C:ks=\E=:\
-	:ku=\E[A:le=^H:mb=\E[5m:md=\E[1m:me=\E[0m:mh=\E[1m:\
-	:mr=\E[7m:nd=\E[C:se=\E[0m:sf=^J:so=\E[7m:sr=\EM:\
-	:ta=^I:ue=\E[0m:up=\E[A:us=\E[4m:
+	:ku=\E[A:le=^H:mb=\E[5m:md=\E[1m:me=\E[m:mh=\E[1m:\
+	:mr=\E[7m:nd=\E[C:se=\E[m:sf=^J:so=\E[7m:sr=\EM:\
+	:ta=^I:ue=\E[m:up=\E[A:us=\E[4m:
 ampex219w|ampex-219w|amp219w|Ampex 132 cols:\
 	:co#132:li#24:\
 	:bl=^G:cr=^M:do=^J:\
@@ -4669,7 +5028,7 @@ ampex232w|Ampex Model 232 / 132 columns:\
 # split out into several for the various screen sizes by dave-yost@rand
 # Modifications made 3/82 by Mark Horton
 # Modified by Tom Quarles at UCB for greater efficiency and more diversity
-# status line moved to top of screen, :vb: removed 5/82
+# status line moved to top of screen, <flash> removed 5/82
 # Some unknown person at SCO then hacked the init strings to make them more
 # efficient.
 #
@@ -4776,7 +5135,7 @@ ampex232w|Ampex Model 232 / 132 columns:\
 #	unused
 #
 
-annarbor|4080|ann arbor 4080:\
+annarbor4080|aa4080|ann arbor 4080:\
 	:am:\
 	:co#80:li#40:\
 	:bl=^G:cl=\014:\
@@ -4785,7 +5144,7 @@ annarbor|4080|ann arbor 4080:\
 	:kr=^_:ku=^N:le=^H:nd=^_:sf=^J:st=^]^P1:ta=^I:up=^N:
 
 # If you're using the GNU termcap library, add
-#	:cS=\E[%d;%d;%d;%dp:
+#	:cS=\E[%p1%d;%p2%d;%p3%d;%p4%dp:
 # to these capabilities.  This is the nonstandard GNU termcap scrolling
 # capability, arguments are:
 #   1. Total number of lines on the screen.
@@ -4798,18 +5157,17 @@ aaa+unk|aaa-unk|ann arbor ambassador (internal - don't use this directly):\
 	:co#80:it#8:\
 	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
 	:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:al=\E[L:bl=^G:bt=\E[Z:\
-	:cd=\E[J:ce=\E[K:ch=\E[%+^AG:cl=\E[H\E[J:\
-	:cm=\E[%i%d;%dH:cr=^M:ct=\E[2g:cv=\E[%+^Ad:dc=\E[P:\
-	:dl=\E[M:do=^K:ei=:ho=\E[H:i1=\E[m\E7\E[H\E9\E8:\
-	:i2=\E[1Q\E[>20;30l\EP`+x~M\E\\:ic=\E[@:im=:k1=\EOA:\
-	:k2=\EOB:k3=\EOC:k4=\EOD:k5=\EOE:k6=\EOF:k7=\EOG:\
-	:k8=\EOH:k9=\EOI:kb=^H:kd=\E[B:\
+	:cd=\E[J:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:\
+	:ct=\E[2g:dc=\E[P:dl=\E[M:do=^K:ei=:ho=\E[H:\
+	:i1=\E[m\E7\E[H\E9\E8:i2=\E[1Q\E[>20;30l\EP`+x~M\E\\:\
+	:ic=\E[@:im=:k1=\EOA:k2=\EOB:k3=\EOC:k4=\EOD:k5=\EOE:\
+	:k6=\EOF:k7=\EOG:k8=\EOH:k9=\EOI:kD=\E[P:kI=\E[@:\
+	:kb=^H:kd=\E[B:\
 	:ke=\EP`>y~[[J`8xy~[[A`4xy~[[D`6xy~[[C`2xy~[[B\E\\:\
 	:kh=\E[H:kl=\E[D:kr=\E[C:\
 	:ks=\EP`>z~[[J`8xz~[[A`4xz~[[D`6xz~[[C`2xz~[[B\E\\:\
-	:ku=\E[A:le=^H:mb=\E[5m:md=\E[1m:me=\E[0m:mk=\E[8m:\
-	:mm=\E[>52h:mo=\E[>52l:mr=\E[7m:nd=\E[C:pO=\E[%dv:\
-	:pf=^C:po=\E[v:ps=\E[0i:rc=\E8:\
+	:ku=\E[A:le=^H:mb=\E[5m:md=\E[1m:me=\E[m:mm=\E[>52h:\
+	:mo=\E[>52l:mr=\E[7m:nd=\E[C:rc=\E8:\
 	:..rp=%p1%c\E[%p2%{1}%-%db:\
 	:..sa=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;%;m:\
 	:sc=\E7:se=\E[m:sf=^K:so=\E[7m:st=\EH:ta=^I:ue=\E[m:\
@@ -4817,7 +5175,7 @@ aaa+unk|aaa-unk|ann arbor ambassador (internal - don't use this directly):\
 
 aaa+rv|ann arbor ambassador in reverse video:\
 	:i1=\E[7m\E7\E[H\E9\E8:mb=\E[5;7m:md=\E[1;7m:\
-	:me=\E[7m\016:mk=\E[7;8m:mr=\E[m:\
+	:me=\E[7m\016:mr=\E[m:\
 	:..sa=\E[%?%p1%p3%|%!%t7;%;%?%p2%t4;%;%?%p4%t5;%;%?%p6%t1;%;%?%p7%t8;%;m:\
 	:se=\E[7m:so=\E[m:ue=\E[7m:us=\E[4;7m:
 # Ambassador with the DEC option, for partial vt100 compatibility.
@@ -4904,7 +5262,7 @@ aaa-60-s|ann arbor ambassador/59 lines+status:\
 	:ts=\E[>51h\E[1;%p1%dH\E[2K:tc=aaa+unk:
 aaa-60-s-rv|ann arbor ambassador/59 lines+status+reverse video:\
 	:tc=aaa+rv:tc=aaa-60-s:
-aaa-60-s-rv-dec|ann arbor ambassador/dec mode+59 lines+status+rev video:\
+aaa-60-dec-rv|ann arbor ambassador/dec mode+59 lines+status+rev video:\
 	:tc=aaa+dec:tc=aaa+rv:tc=aaa-60-s:
 aaa-60|ann arbor ambassador/60 lines:\
 	:li#60:\
@@ -4927,16 +5285,16 @@ guru+s|guru status line:\
 	:ds=\E7\E[;0p\E[1;1H\E[K\E[H\E8\r\n\E[K:fs=\E[>51l:\
 	:te=\E[255;1p\E[255;1H\E[K:\
 	:ts=\E[>51h\E[1;%p1%dH\E[2K:
-guru-nctxt:\
+guru-nctxt|guru with no saved context:\
 	:ti=\E[H\E[J\E[33p\E[255;1H\E[K:tc=guru:
 guru-s|guru-33-s|ann arbor guru/33 lines+status:\
 	:li#32:\
 	:is=\r\n\E[A\E7\E[255;1;0;33;80;80p\E8\E[J:\
 	:ti=\E[33;1p\E[255;1H\E[K:tc=guru+s:tc=guru+unk:
-guru-24:\
+guru-24|ann arbor guru 24 lines:\
 	:co#80:li#24:\
 	:is=\E7\E[255;0;0;24;80;80p\E8\E[J:ti=\E[24p:tc=guru+unk:
-guru-44:\
+guru-44|ann arbor guru 44 lines:\
 	:co#97:li#44:\
 	:is=\E7\E[255;0;0;44;97;100p\E8\E[J:ti=\E[44p:tc=guru+unk:
 guru-44-s|ann arbor guru/44 lines+status:\
@@ -4963,9 +5321,9 @@ guru-76-w-s|ann arbor guru/76 lines+status+wide:\
 guru-76-wm|guru 76 lines by 178 cols with 255 cols memory:\
 	:co#178:li#76:\
 	:is=\E7\E[255;0;0;76;178;255p\E8\E[J:ti=\E[76p:tc=guru+unk:
-aaa-rv-unk:\
-	:i1=\E[7m\E7\E[H\E9\E8:mb=\E[5;7m:md=\E[1;7m:\
-	:me=\E[7m:mk=\E[7;8m:mr=\E[m:\
+aaa-rv-unk|ann arbor unknown type:\
+	:ho=\E[H:i1=\E[7m\E7\E[H\E9\E8:mb=\E[5;7m:md=\E[1;7m:\
+	:me=\E[7m:mr=\E[m:\
 	:..sa=\E[%?%p1%!%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;%;%?%p7%t8;%;m:\
 	:se=\E[7m:so=\E[m:ue=\E[7m:us=\E[4;7m:
 
@@ -4975,7 +5333,7 @@ aaa-rv-unk:\
 # 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) are at:
+# and NCR (who are still there as of early 1995) are at:
 #
 #	SunRiver Data Systems
 #	100 Marcus Boulevard
@@ -5010,36 +5368,25 @@ regent40|Adds Regent 40:\
 	:se=\E0@:so=\E0P:ue=\E0@:us=\E0`:tc=regent25:
 regent40+|Adds Regent 40+:\
 	:is=\EB:tc=regent40:
-# (regent60: removed obsolete ":ko=dc,im,ei:" -- esr)
 regent60|regent200|Adds Regent 60:\
-	:dc=\EE:ei=\EF:im=\EF:is=\EV\EB:se=\ER\E0@\EV:\
-	:so=\ER\E0P\EV:tc=regent40+:
-regent60na|regent 60 w/no arrow keys:\
-	:kd@:kl@:kr@:ku@:tc=regent60:
+	:dc=\EE:ei=\EF:im=\EF:is=\EV\EB:kD=\EE:kI=\EF:\
+	:se=\ER\E0@\EV:so=\ER\E0P\EV:tc=regent40+:
 # From: <edward@onyx.berkeley.edu> Thu Jul  9 09:27:33 1981
-# (viewpoint: added kcuf1, kf* and dl1 capabilities -- esr)
+# (viewpoint: added <kcuf1>, function key, and <dl1> capabilities -- esr)
 viewpoint|addsviewpoint|adds viewpoint:\
-	:am:bs:\
+	:am:\
 	:co#80:li#24:\
 	:bl=^G:cd=\Ek:ce=\EK:cl=^L:cm=\EY%+ %+ :cr=^M:dl=\El:\
 	:do=^J:is=\017\E0`:k0=^B1:k2=^B2:k3=^B!:k4=^B":\
 	:k5=^B#:kd=^J:kh=^A:kl=^U:kr=^F:ku=^Z:le=^H:ll=^A:\
 	:nd=^F:se=^O:sf=^J:so=^N:ue=^O:up=^Z:us=^N:\
 	:ve=\017\E0`:vs=\017\E0P:
+# Some viewpoints have bad ROMs that foo up on ^O
 screwpoint|adds viewpoint with ^O bug:\
-	:am:bs:\
-	:co#80:li#24:\
-	:bl=^G:cd=\Ek:ce=\EK:cl=\014:cm=\EY%+ %+ :cr=^M:\
-	:dl=\El:do=^J:is=^G:kd=^J:kh=^A:kl=^U:kr=^F:ku=^Z:\
-	:le=^H:ll=^A:nd=^F:sf=^J:up=^Z:
-fviewpoint|flaky adds viewpoint with ^O bug:\
-	:am:bs:\
-	:co#80:li#24:\
-	:bl=^G:cd=\Ek:ce=\EK:cl=\014:cm=\EY%+ %+ :cr=^M:\
-	:dl=\El:do=^J:is=^G:kd=^J:kh=^A:kl=^U:kr=^F:ku=^Z:\
-	:le=^H:ll=^A:nd=^F:sf=^J:up=^Z:
+	:se@:so@:ue@:us@:vs@:tc=viewpoint:
+
 # From: Jay S. Rouman <jsr@dexter.mi.org> 5 Jul 92
-# The civis/cnorm/sgr/sgr0 strings were added by ESR from specs.  
+# The <civis>/<cnorm>/<sgr>/<sgr0> strings were added by ESR from specs.  
 # Theory; the 3a+ 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.
@@ -5052,33 +5399,33 @@ vp3a+|viewpoint3a+|adds viewpoint 3a+:\
 	:nd=^L:nw=^M^J:\
 	:..sa=\E0%'@'%?%p1%tQ%|%;%?%p2%t%'`'%|%;%?%p3%tP%|%;%?%p4%t%{2}%|%;%?%p5%t%{1}%|%;%?%p7%tD%|%;%c\E):\
 	:se=\E(:sf=^J:so=\E0Q\E):ta=^I:up=^K:ve=^X:vi=^W:
-vp60|viewpoint60|addsviewpoint60|adds viewpoint60:\
+vp60|viewpoint60|addsvp60|adds viewpoint60:\
 	:tc=regent40:
 #
 # adds viewpoint 90 - from cornell
 # Note:  emacs sends ei occasionally to insure the terminal is out of
 #        insert mode. This unfortunately puts the viewpoint90 IN insert
-#        mode.  A hack to get around this is :ic=\EF \EF^U:.  (Also,
+#        mode.  A hack to get around this is <ich1>=\EF\s\EF^U.  (Also,
 #   -    :ei=:im=: must be present in the termcap translation.)
-#   -    :xs: indicates glitch that attributes stick to location
-#   -    :ms: means it's safe to move in standout mode
-#   -    :cl=\EG\Ek: clears screen and visual attributes without affecting
+#   -    <xhp> indicates glitch that attributes stick to location
+#   -    <msgr> means it's safe to move in standout mode
+#   -    <clear>=\EG\Ek: clears screen and visual attributes without affecting
 #               the status line
 # Function key and label capabilities merged in from SCO.
 vp90|viewpoint90|adds viewpoint 90:\
-	:bs:bw:ms:xs:\
+	:bw:ms:xs:\
 	:co#80:li#24:\
 	:cd=\Ek:ce=\EK:cl=\EG\Ek:cm=\EY%+ %+ :dc=\EE:dl=\El:\
 	:do=^J:ei=:ho=\EY  :ic=\EF \EF\025:im=:k0=^B1\r:\
 	:k1=^B2\r:k2=^B3\r:k3=^B4\r:k4=^B5\r:k5=^B6\r:\
 	:k6=^B7\r:k7=^B8\r:k8=^B9\r:k9=^B\072\r:kb=^H:kd=^J:\
-	:kh=^A:kl=^U:kr=^F:ku=^Z:ll=^A:nd=^F:se=\ER\E0@\EV:\
-	:sf=^J:so=\ER\E0Q\EV:ta=^I:ue=\ER\E0@\EV:up=^Z:\
-	:us=\ER\E0`\EV:
+	:kh=^A:kl=^U:kr=^F:ku=^Z:le=^H:ll=^A:nd=^F:\
+	:se=\ER\E0@\EV:sf=^J:so=\ER\E0Q\EV:ta=^I:\
+	:ue=\ER\E0@\EV:up=^Z:us=\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:\
-	:am:bs:\
+	:am:\
 	:co#80:li#24:\
 	:al=\E\016:bl=^G:cl=\014\013@:cm=\013%+@\E\005%2:\
 	:cr=^M:dl=\E\017:do=^J:k0=\E0:k1=\E1:k2=\E2:k3=\E3:\
@@ -5096,55 +5443,37 @@ adds980|a980|adds consul 980:\
 #           the delay times and do an auto tab set rather than the indirect
 #           file used in vt100.
 cit80|cit-80|citoh 80:\
-	:am:bs:\
+	:am:\
 	:co#80:li#24:\
-	:cd=\EJ:ce=\EK:cl=\E[;H\EJ:cm=\E[%i%2;%2H:cr=^M:\
-	:ff=^L:is=\E>:kd=\EOB:ke=\E[?1l\E>:kl=\EOD:kr=\EOC:\
-	:ks=\E[?1h\E=:ku=\EOA:nd=\E[C:sf=^J:up=\E[A:
-# Alternate cit101 (vt100 em) file used in vt100.
-#	    Uses 23 lines so can run citsys (like h19sys).
-#	24 May 85 (mtxinu!sybase!tim) - removed 2-byte limit on :cm: cursor
-#	  coordinates otherwise there is garbling on long lines in 
-#	  co#132 mode; also added support for multipage	memory on the Itoh.
+	:cd=\EJ:ce=\EK:cl=\E[H\EJ:cm=\E[%i%2;%2H:cr=^M:ff=^L:\
+	:is=\E>:kd=\EOB:ke=\E[?1l\E>:kl=\EOD:kr=\EOC:\
+	:ks=\E[?1h\E=:ku=\EOA:le=^H:nd=\E[C:sf=^J:up=\E[A:
 # From: Tim Wood <mtxinu!sybase!tim> Fri Sep 27 09:39:12 PDT 1985
-citc|Citoh fast vt100:\
-	:am:bs:xn:\
-	:co#80:li#23:\
-	:al=\E[L:cd=\E[J:ce=\E[K:cl=\E[;H\E[2J:\
+# (cit101: added <rmam>/<smam> based on init string, merged this with c101 -- esr)
+cit101|citc|C.itoh fast vt100:\
+	:am:xn:\
+	:co#80:li#24:\
+	:al=\E[L:bl=^G:cd=\E[J:ce=\E[K:cl=\E[H\E[2J:\
 	:cm=\E[%i%d;%dH:dc=\E[P:dl=\E[M:ei=:ic=\E[@:im=:\
 	:is=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[3g\E[>5g:\
 	:kd=\EOB:ke=\E[?1l\E>:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:\
-	:ku=\EOA:nd=\E[C:se=\E[m:so=\E[7m:ue=\E[m:up=\E[A:\
-	:us=\E[4m:\
-	:vb=\E[?5h\200\200\200\200\200\200\200\200\200\200\200\200\200\200\200\200\200\200\200\200\200\200\200\200\E[?5l:\
-	:ve=\E[V\E8:vs=\E7\E[U:
-cita:\
-	:am:bs:xn:\
-	:co#80:li#23:\
-	:cd=\E[J:ce=\E[K:cl=\E[;H\E[2J:cm=\E[%i%d;%dH:\
-	:is=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[3g\E[>5g:\
-	:kd=\EOB:ke=\E[?1l\E>:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:\
-	:ku=\EOA:nd=\E[C:se=\E[m:so=\E[7m:ue=\E[m:up=\E[A:\
-	:us=\E[4m:\
-	:vb=\E[?5h\200\200\200\200\200\200\200\200\200\200\200\200\200\200\200\200\200\200\200\200\200\200\200\200\E[?5l:\
-	:ve=\E[V\E8:vs=\E7\E[U:
-cit101:\
-	:li#24:\
-	:vb@:tc=citc:
-cit101b:\
-	:li#24:\
-	:tc=citc:
+	:ku=\EOA:le=^H:nd=\E[C:se=\E[m:so=\E[7m:ue=\E[m:\
+	:up=\E[A:us=\E[4m:vb=\E[?5h\E[?5l:ve=\E[V\E8:\
+	:vs=\E7\E[U:
 # The CIT-500 was unusual in that it had a portrait-style display.
-# (cit500: mapped ":pt:" to default tabs -- esr)
+# (cit500: I added <rmam>/<smam> based on the init string -- esr)
+# (This entry used to have lines#40, but Michael Coughlin <mikc@gnu.ai.mit.edu>
+# says this is wrong, they actually have 64 lines.  Perhaps someone was 
+# thinking in hex? -- esr)
 cit500|cit-500|cit 500:\
-	:am:bs:pt:xn:\
-	:co#80:li#40:\
-	:al=\E[L:cd=50\E[J:ce=3\E[K:cl=50\E[;H\E[2J:\
+	:am:xn:\
+	:co#80:it#8:li#64:\
+	:al=\E[L:cd=50\E[J:ce=3\E[K:cl=50\E[H\E[2J:\
 	:cm=5\E[%i%2;%2H:dc=\E[P:dl=\E[M:do=\ED:\
 	:is=\E(B\E)0\E>\E[?3l\E[?7h\E[?8h:k1=\EOP:k2=\EOQ:\
 	:k3=\EOR:k4=\EOS:kd=\EOB:ke=\E[?1l\E>:kh=\E[H:\
-	:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:ku=\EOA:nd=2\E[C:\
-	:se=2\E[m:so=2\E[7m:sr=5\EM:ue=2\E[m:up=2\E[A:\
+	:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:ku=\EOA:le=^H:nd=2\E[C:\
+	:se=2\E[m:so=2\E[7m:sr=5\EM:ta=^I:ue=2\E[m:up=2\E[A:\
 	:us=2\E[4m:
 
 citoh|ci8510|8510|c.itoh 8510a:\
@@ -5175,15 +5504,11 @@ citoh-8lpi|citoh in 8 lines per inch mode:\
 #### Control Data (cdc)
 #
 
-cdc456|cdc:\
-	:am:bs:\
+cdc456|cdc 456 terminal:\
+	:am:\
 	:co#80:li#24:\
 	:al=\EL:bl=^G:cd=^X:ce=^V:cl=^Y^X:cm=\E1%+ %+ :cr=^M:\
 	:dl=\EJ:do=^J:ho=^Y:le=^H:nd=^L:sf=^J:up=^Z:
-cdc456tst:\
-	:am:bs:\
-	:co#80:li#24:\
-	:bl=^G:cl=^Y^X:cm=\E1%+ %+ :cr=^M:do=^J:le=^H:sf=^J:
 
 #### Human Designed Systems (Concept)
 #
@@ -5215,35 +5540,30 @@ cdc456tst:\
 # It is much faster (at 9600 baud) than the c100 because the delays
 # are not fixed.
 # new status line display entries for c108-8p:
-# is3 - init str #3 - setup term for status display - 
+# <is3> - init str #3 - setup term for status display - 
 # set programmer mode, select window 2, define window at last 
 # line of memory, set bkgnd stat mesg there, select window 0.
 # 
-# tsl - to status line - select window 2, home cursor, erase to 
+# <tsl> - to status line - select window 2, home cursor, erase to 
 # end-of-window, 1/2 bright on, goto(line#0, col#?)
 # 
-# fsl - from status line - 1/2 bright off, select window 0
+# <fsl> - from status line - 1/2 bright off, select window 0
 # 
-# dsl - disable status display - set bkgnd status mesg with 
+# <dsl> - disable status display - set bkgnd status mesg with 
 # illegal window #
 # 
 # There are probably more function keys that should be added but 
 # I don't know what they are.
 #
+# No delays needed on c108 because of ^S/^Q handshaking
+#
 c108|concept108|c108-8p|concept108-8p|concept 108 w/8 pages:\
 	:i2=\EU\E z"\Ev\001\177 !p\E ;"\E z \Ev  \001\177p\Ep\n:\
 	:te=\Ev  \001\177p\Ep\r\n:tc=c108-4p:
-c108+acs|alternate charset defns for c108:\
-	:ae=\Ej :as=\Ej!:
-c108-4p-acs|c108-4p w/ acs:\
-	:tc=c108+acs:tc=c108-4p:
-c108-8p-acs|c108-8p w/ acs:\
-	:tc=c108+acs:tc=c108-8p:
-c108-rv-8p-acs|c108-rv-8p w/ acs:\
-	:tc=c108+acs:tc=c108-rv-8p:
 c108-4p|concept108-4p|concept 108 w/4 pages:\
 	:es:hs:xo:\
 	:pb@:\
+	:ae=\Ej :as=\Ej!:\
 	:..cm=\Ea%p1%?%p1%{95}%>%t\001%{96}%-%;%{32}%+%c%p2%?%p2%{95}%>%t\001%{96}%-%;%{32}%+%c:\
 	:cr=^M:dc=\E 1:ds=\E ;\177:fs=\Ee\E z :i1=\EK\E!\E F:\
 	:i2=\EU\E z"\Ev\177 !p\E ;"\E z \Ev  \001 p\Ep\n:\
@@ -5252,24 +5572,12 @@ c108-4p|concept108-4p|concept 108 w/4 pages:\
 	:ts=\E z"\E?\E\005\EE\Ea %+ :ve=\Ew:vs=\EW:tc=c100:
 c108-rv|c108-rv-8p|concept 108 w/8 pages in reverse video:\
 	:te=\Ev  \002 p\Ep\r\n:ti=\EU\Ev  8p\Ep\r:tc=c108-rv-4p:
-c108-rv-4p|concept108-rv-4p|concept108rv4p|concept 108 w/4 pages in reverse video:\
+c108-rv-4p|concept108rv4p|concept 108 w/4 pages in reverse video:\
 	:i1=\Ek:se=\Ee:so=\EE:vb=\EK\Ek:tc=c108-4p:
-c108-rv-4p-acs|c108-rv-4p w/ acs:\
-	:tc=c108+acs:tc=c108-rv-4p:
-c108-na|c108-na-8p|c108-8p-na|concept108-na-|concept108na8p|concept 108 w/8 pages no arrows:\
-	:k7=\E;:k8=\E<:k9=\E=:ke@:ks@:tc=c108-8p:
-c108-na-acs|c108-na w/ acs:\
-	:tc=c108+acs:tc=c108-na:
-c108-rv-na|c108-rv-na-8p|c108-8p-rv-na|concept 108 8 pages no arrows rev video:\
-	:k7=\E;:k8=\E<:k9=\E=:ke@:ks@:tc=c108-rv-8p:
-c108-rv-na-acs|c108-na w/ acs:\
-	:tc=c108+acs:tc=c108-rv-na:
 c108-w|c108-w-8p|concept108-w-8|concept108-w8p|concept 108 w/8 pages in wide mode:\
 	:co#132:\
 	:i1=\E F\E":te=\Ev  ^A0\001D\Ep\r\n:\
 	:ti=\EU\Ev  8\001D\Ep\r:tc=c108-8p:
-c108-w-acs|c108-w w/ acs:\
-	:tc=c108+acs:tc=c108-w:
 
 # Concept 100:
 # These have only window relative cursor addressing, not screen 
@@ -5286,10 +5594,10 @@ c108-w-acs|c108-w w/ acs:\
 # 
 # Some tty drivers use cr3 for concept, others use nl3, hence 
 # the delays on cr and ind below. This padding is only needed at 
-# 9600 baud. One or the other is commented out depending on 
+# 9600 baud and up.  One or the other is commented out depending on 
 # local conventions.
 # 
-# 2 ms padding on rmcup isn't always enough. 6 works fine. Maybe 
+# 2 ms padding on <rmcup> isn't always enough. 6 works fine. Maybe 
 # less than 6 but more than 2 will work.
 # 
 # Note: can't use function keys f7-f10 because they are 
@@ -5300,7 +5608,7 @@ c108-w-acs|c108-w w/ acs:\
 # because they don't transmit unless we reset them - I figured 
 # it was a bad idea to clobber their definitions.
 # 
-# The mc5 sequence changes the escape character to ^^ so that 
+# The <mc5> sequence changes the escape character to ^^ so that 
 # escapes will be passed through to the printer. Only trouble 
 # is that ^^ won't be - ^^ was chosen to be unlikely. 
 # Unfortunately, if you're sending raster bits through to be 
@@ -5317,38 +5625,35 @@ c100|concept100|concept|c104|c100-4p|hds concept 100:\
 	:ei=\E  :i1=\EK:i2=\Ev    \Ep\n:im=\E^P:ip=:\
 	:is=\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:\
 	:k1=\E5:k2=\E6:k3=\E7:k4=\E8:k5=\E9:k6=\E\072a:\
-	:k7=\E\072b:k8=\E\072c:kb=^H:kd=\E<:ke=\Ex:kh=\E?:\
-	:kl=\E>:kr=\E=:ks=\EX:ku=\E;:le=^H:mb=\EC:me=\EN@:\
-	:mh=\EE:mk=\EH:mp=\EI:mr=\ED:nd=\E=:\
-	:pf=\036o \E\EQ!\EYP\027:po=\EQ"\EY(\027\EYD\Eo \036:\
+	:k7=\E\072b:k8=\E\072c:kD=\E^Q:kI=\E^P:kN=\E-:kP=\E.:\
+	:kb=^H:kd=\E<:ke=\Ex:kh=\E?:kl=\E>:kr=\E=:ks=\EX:\
+	:ku=\E;:le=^H:mb=\EC:me=\EN@:mh=\EE:mr=\ED:nd=\E=:\
 	:rp=\Er%.%+ :se=\Ed:sf=^J:so=\ED:ta=\011:\
 	:te=\Ev    \Ep\r\n:ti=\EU\Ev  8p\Ep\r\E\025:ue=\Eg:\
 	:up=\E;:us=\EG:vb=\Ek\EK:
 c100-rv|c100-rv-4p|concept100-rv|c100 rev video:\
 	:i1=\Ek:se=\Ee:so=\EE:vb=\EK\Ek:ve@:vs@:tc=c100:
-c100-rv-na|c100-rv-4p-na|c100 with no arrows:\
-	:ke@:ks@:tc=c100-rv:
 oc100|oconcept|c100-1p|old 1 page concept 100:\
 	:in:\
 	:i3@:tc=c100:
 
-# ht through el included to specify padding needed in raw mode.
-# (untranslatable capabilities removed to fit entry within 1023 bytes)
+# <ht> through <el> included to specify padding needed in raw mode.
 avt-ns|concept avt no status line:\
 	:am:eo:mi:ul:xn:xo:\
 	:co#80:it#8:li#24:lm#192:\
 	:AL=\E[%dL:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:LE=\E[%dD:\
 	:RI=\E[%dC:UP=\E[%dA:ae=\016:al=\E[L:as=\017:bl=^G:\
-	:bt=\E[Z:cd=\E[J:ce=\E[K:ch=\E[%+^AG:cl=\E[H\E[J:\
-	:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:ct=\E[2g:\
-	:cv=\E[%+^Ad:dc=\E[P:dl=\E[M:do=^J:ei=\E4l:ho=\E[H:\
-	:i1=\E[=103l\E[=205l:ic=\E[@:im=\E1:ip=:\
+	:bt=\E[Z:cd=\E[J:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:\
+	:cr=^M:cs=\E[%i%d;%dr:ct=\E[2g:dc=\E[P:dl=\E[M:do=^J:\
+	:ei=\E4l:ho=\E[H:i1=\E[=103l\E[=205l:ic=\E[@:im=\E1:\
+	:ip=:\
 	:is=\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:\
-	:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:kb=^H:kd=\E[B:\
-	:ke=\E[!z\E[0;2u:kh=\E[H:kl=\E[D:kr=\E[C:\
-	:ks=\E[1!z\E[0;3u:ku=\E[A:le=^H:ll=\E[24H:mb=\E[5m:\
-	:md=\E[1m:me=\E[m:mh=\E[1!{:mk=\E8m:mp=\E[99m:\
-	:mr=\E[7m:nd=\E[C:pf=\E[4i:po=\E[5i:ps=\E[0i:rc=\E8:\
+	:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:kD=\E^B\r:kI=\E^A\r:\
+	:kb=^H:kd=\E[B:ke=\E[!z\E[0;2u:kh=\E[H:kl=\E[D:\
+	:kr=\E[C:ks=\E[1!z\E[0;3u:ku=\E[A:le=^H:ll=\E[24H:\
+	:mb=\E[5m:md=\E[1m:me=\E[m:mh=\E[1!{:mr=\E[7m:\
+	:nd=\E[C:rc=\E8:..rp=%p1%c\E[%p2%{1}%-%db:\
+	:..sa=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;%;m:\
 	:sc=\E7:se=\E[7!{:sf=\n:so=\E[7m:sr=\EM:st=\EH:\
 	:ta=\011:te=\E[w\E2\r\n:ti=\E[=4l\E[1;24w\E2\r:\
 	:ue=\E[4!{:up=\E[A:us=\E[4m:ve=\E[=119l:vs=\E[=119h:
@@ -5400,13 +5705,7 @@ contel300|contel320|c300|Contel Business Systems C-300 or C-320:\
 	:up=\EA:vb=\020\002\020\003:
 # Contel c301 and c321 terminals.
 contel301|contel321|c301|c321|Contel Business Systems C-301 or C-321:\
-	:am:in:xo:\
-	:co#80:li#24:sg#1:\
-	:al=\EL:bl=^G:cd=\EJ:ce=\EI:cl=\EK:cm=\EX%+ \EY%+ :\
-	:cr=^M:ct=\E3:dc=\EO:dl=\EM:do=^J:ho=\EH:k0=\ERJ:\
-	:k1=\ERA:k2=\ERB:k3=\ERC:k4=\ERD:k5=\ERE:k6=\ERF:\
-	:k7=\ERG:k8=\ERH:k9=\ERI:kb=^H:le=^H:ll=\EH\EA:\
-	:nd=\EC:se=\E!\200:sf=^J:so=\E!\r:st=\E1:up=\EA:
+	:ei=:ic@:im=:ip@:se=\E!\200:so=\E!\r:vb@:tc=contel300:
 
 #### Data General (dg)
 #
@@ -5423,11 +5722,20 @@ dg200|data general dasher 200:\
 	:k7=^^w:k8=^^x:k9=^^y:kd=^Z:kh=^H:kl=^Y:kr=^X:ku=^W:\
 	:le=^Y:nd=^X:nw=^J:se=^^E:sf=^J:so=^^D:ue=^U:up=^W:\
 	:us=^T:
-#
-# dg450 and dg200 from cornell
+# 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.
+# I suspect the d200 function keys actually work on the dg211, check it out.)
+dg211|Data General d211:\
+	:k0@:k1@:k2@:k3@:k4@:k5@:k6@:k7@:k8@:k9@:kb=^Y:\
+	:nw=^M^Z:se=00\036E\200/>:sf@:\
+	:so=00\036D\200\200\200\200\200/>:ta=^I:te=^L:\
+	:ti=^L^R:ve=^L:vs=^L^R:tc=dg200:
+
+# dg450 from cornell
 dg450|dg6134|data general 6134:\
-	:bs@:\
-	:nd=^X:tc=dg200:
+	:le@:nd=^X:tc=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
@@ -5435,25 +5743,25 @@ dg450|dg6134|data general 6134:\
 # mode rather than DG mode because standard UNIX tty drivers assume that ^H is
 # backspace on all terminals.  This is not so in DG mode.
 # (dg460-ansi: removed obsolete ":kn#6:"; also removed ":mu=\EW:", on the
-# grounds that there is no matching ":ml:"; mapped ":pt:" to default tabs; 
+# grounds that there is no matching ":ml:"
 # fixed garbled ":k9=\E[00\:z:" capability -- esr)
-dg460-ansi|Data General Dasher 460, ANSI-mode:\
-	:am:bs:ms:pt:ul:\
-	:co#80:li#24:\
+dg460-ansi|Data General Dasher 460 in ANSI-mode:\
+	:am:ms:ul:\
+	:co#80:it#8:li#24:\
 	:al=\E[L:cd=\E[J:ce=\E[K:cl=\E[2J:cm=\E[%i%2;%2H:\
 	:dc=\E[P:dl=\E[M:do=\E[B:ei=:ho=\E[H:ic=\E[@:im=:\
 	:is=^^F@:k0=\E[001z:k1=\E[002z:k2=\E[003z:k3=\E[004z:\
 	:k4=\E[005z:k5=\E[006z:k6=\E[007z:k7=\E[008z:\
 	:k8=\E[009z:k9=\E[010z:kb=\E[D:kd=\E[B:kh=\E[H:\
-	:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:mb=\E[5m:me=\E[0m:\
-	:mh=\E[2m:mr=\E[7m:nd=\E[C:nl=\ED:se=\E[0m:sf=\E[S:\
-	:so=\E[7m:sr=\E[T:ue=\E[05:up=\E[A:us=\E[4m:
+	:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:mb=\E[5m:me=\E[m:\
+	:mh=\E[2m:mr=\E[7m:nd=\E[C:nl=\ED:se=\E[m:sf=\E[S:\
+	:so=\E[7m:sr=\E[T:ta=^I:ue=\E[05:up=\E[A:us=\E[4m:
 # From: Wayne Throop <mcnc!rti-sel!rtp47!throopw>
 # 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!
 dg6053|data general 6053:\
-	:am:bs:bw:pt:ul:\
+	:am:bs:bw:ul:\
 	:co#80:li#24:\
 	:bl=^G:ce=^K:cl=^L:cm=\020%r%.%.:cr=^M:do=^Z:ho=^H:\
 	:is=^R:k0=^^q:k1=^^r:k2=^^s:k3=^^t:k4=^^u:k5=^^v:\
@@ -5461,29 +5769,6 @@ dg6053|data general 6053:\
 	:ku=^W:le=^Y:nd=^X:nw=^M^Z:se=\200^^E:\
 	:so=\200\200\200\200\200\036D:ta=^I:te=^L:ti=^L^R:\
 	:ue=^U:up=^W:us=^T:ve=^L:vs=^L^R:
-# From: Peter N. Wan <ihnp4!gatech!gacsr!wan>
-# courtesy of Carlos Rucalde of Vantage Software, Inc.
-dgd211|Data General d211:\
-	:am:bw:\
-	:co#80:li#24:\
-	:ce=^K:cl=^L:..cm=\020%r%.%.:cr=^M:do=^Z:ho=^H:kb=^Y:\
-	:kd=^Z:kh=^H:kl=^Y:kr=^X:ku=^W:le=^Y:nd=^X:nw=^M^Z:\
-	:se=00\036E\200/>:so=00\036D\200\200\200\200\200/>:\
-	:ta=^I:te=^L:ti=^L^R:ue=^U:up=^W:us=^T:ve=^L:vs=^L^R:
-# From: Joan Walter <joanw@BRL.ARPA>
-# Data General/One
-#  David Holub got the dg1 to work with jove with this termcap
-#   by making li#23 and co#78 to comply with obvious terminal
-#   capabilities.  Still waiting for documentation.
-# Data General/One from  modified DG Dasher DG210/211 (bw removed)
-# From: Peter N. Wan <ihnp4!gatech!gacsr!wan>
-# courtesy of Carlos Rucalde of Vantage Software, Inc.
-dg1|Data General/One:\
-	:am:\
-	:co#78:li#23:\
-	:ce=^K:cl=^L:cm=\020%r%.%.:cr=^M:do=^Z:ho=^H:kb=^Y:\
-	:kd=^Z:kh=^H:kl=^Y:kr=^X:ku=^W:le=^Y:nd=^X:nw=^M^Z:\
-	:ta=^I:up=^W:
 
 #### Datamedia (dm)
 #
@@ -5491,7 +5776,7 @@ dg1|Data General/One:\
 cs10|colorscan|Datamedia Color Scan 10:\
 	:ms:\
 	:co#80:li#24:\
-	:bl=^G:cd=\E[J:ce=\E[K:cl=\E[;H\E[J:cm=\E[%i%02;%02H:\
+	:bl=^G:cd=\E[J:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%02;%02H:\
 	:cr=^M:do=^J:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:kd=\E[B:\
 	:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:nd=\E[C:se=\E[m:sf=^J:\
 	:so=\E[7m:ue=\E[m:up=\E[A:us=\E[4m:
@@ -5499,16 +5784,15 @@ cs10-w|Datamedia Color Scan 10 with 132 columns:\
 	:co#132:\
 	:cm=\E[%i%02;%03H:tc=cs10:
 
-# (dm1520: removed obsolete ":ma=^\ ^_^P^YH:";
-# mapped ":pt:" to default tabs -- esr)
+# (dm1520: removed obsolete ":ma=^\ ^_^P^YH:" -- esr)
 dm1520|dm1521|datamedia 1520:\
-	:am:bs:pt:xn:\
-	:co#80:li#24:\
+	:am:xn:\
+	:co#80:it#8:li#24:\
 	:bl=^G:cd=^K:ce=^]:cl=^L:cm=\036%r%+ %+ :cr=^M:do=^J:\
 	:ho=^Y:kd=^J:kh=^Y:kl=^H:kr=^\:ku=^_:le=^H:nd=^\:\
 	:sf=^J:ta=^I:up=^_:
 dm2500|datamedia2500|datamedia 2500:\
-	:bs:nc:\
+	:nc:\
 	:co#80:li#24:\
 	:al=\020\n\030\035\030\035:bl=^G:ce=^W:cl=^^^^\177:\
 	:cm=\014%r%n%.%.:dc=\020\010\030\035:\
@@ -5516,35 +5800,61 @@ dm2500|datamedia2500|datamedia 2500:\
 	:ei=\377\377\030\035:ho=^B:ic=\020\034\030\035:im=^P:\
 	:le=^H:nd=^\:pc=\377:se=^X^]:sf=^J:so=^N:up=^Z:
 # dmchat is like DM2500, but DOES need "all that padding" (jcm 1/31/82)
-# also, has a meta-key (:km:)
+# also, has a meta-key.
 # From: <goldberger@su-csli.arpa>
 # (dmchat: ":MT:" changed to ":km:" -- esr)
 dmchat|dmchat version of datamedia 2500:\
 	:km:\
 	:al=1*\020\n\030\035\030\035:dl=2\020\032\030\035:tc=dm2500:
-# (dm3025: ":MT:" changed to ":km:"; mapped ":pt:" to default tabs -- esr)
+# (dm3025: ":MT:" changed to ":km:" -- esr)
 dm3025|datamedia 3025a:\
-	:bs:km:pt:\
-	:co#80:li#24:\
+	:km:\
+	:co#80:it#8:li#24:\
 	:al=\EP\n\EQ:bl=^G:cd=\EJ:ce=\EK:cl=\EM:\
 	:cm=\EY%r%+ %+ :cr=^M:dc=\010:dl=\EP\EA\EQ:dm=\EP:\
 	:do=^J:ed=\EQ:ei=\EQ:ho=\EH:im=\EP:ip=:is=\EQ\EU\EV:\
 	:le=^H:nd=\EC:se=\EO0:sf=^J:so=\EO1:ta=^I:up=\EA:
-# (dm3045: mapped ":pt:" to default tabs -- esr)
 dm3045|datamedia 3045a:\
-	:am:bs:eo:pt:ul:xn:\
-	:co#80:li#24:\
-	:bl=^G:cd=\EJ:ce=\EK:cl=\EM:cm=\EY%r%+ %+ :cr=^M:\
-	:dc=\EB:do=^J:ei=\EP:ho=\EH:im=\EP:ip=:is=\EU\EV:\
-	:k0=\Ey\r:k1=\Ep\r:k2=\Eq\r:k3=\Er\r:k4=\Es\r:\
-	:k5=\Et\r:k6=\Eu\r:k7=\Ev\r:k8=\Ew\r:k9=\Ex\r:kh=\EH:\
-	:kr=\EC:ku=\EA:le=^H:nd=\EC:pc=\177:sf=^J:ta=^I:\
-	:up=\EA:
+	:am:eo:km@:ul:xn:\
+	:al@:dc=\EB:dl@:dm@:ed@:ei=\EP:is=\EU\EV:k0=\Ey\r:\
+	:k1=\Ep\r:k2=\Eq\r:k3=\Er\r:k4=\Es\r:k5=\Et\r:\
+	:k6=\Eu\r:k7=\Ev\r:k8=\Ew\r:k9=\Ex\r:kh=\EH:kr=\EC:\
+	:ku=\EA:pc=\177:se@:so@:tc=dm3025:
+# Datamedia DT80 soft switches:
+# 1	0=Jump  1=Smooth
+# 	Autorepeat 	0=off  1=on
+# 	Screen		0=Dark 1=light
+# 	Cursor		0=u/l  1=block
+# 
+# 2	Margin Bell	0=off  1=on
+# 	Keyclick	0=off  1=on
+# 	Ansi/VT52	0=VT52 1=Ansi
+# 	Xon/Xoff	0=Off  1=On
+# 
+# 3	Shift3		0=Hash 1=UK Pound
+# 	Wrap		0=Off  1=On
+# 	Newline		0=Off  1=On
+# 	Interlace	0=Off  1=On
+# 	
+# 4	Parity		0=Odd  1=Even
+# 	Parity		0=Off  1=On
+# 	Bits/Char	0=7    1=8
+# 	Power		0=60Hz 1=50Hz
+# 
+# 5	Line Interface  0=EIA  1=Loop
+# 	Aux Interface   0=EIA  1=Loop
+# 	Local Copy    	0=Off  1=On	
+# 	Spare
+# 
+# 6	Aux Parity	0=Odd  1=Even
+# 	Aux Parity	0=Off  1=On
+# 	Aux Bits/Char   0=7    1=8
+# 	CRT Saver	0=Off  1=On
 # dm80/1 is a vt100 lookalike, but it doesn't seem to need any padding.
 dm80|dmdt80|dt80|datamedia dt80/1:\
 	:cd=\E[J:ce=\E[K:cl=\E[2J\E[H:cm=%i\E[%d;%dH:do=^J:\
-	:ho=\E[H:nd=\E[C:pf=\E[4i:po=\E[5i:ps=\E[0i:se=\E[m:\
-	:so=\E[7m:sr=\EM:ue=\E[m:up=\E[A:us=\E[4m:tc=vt100:
+	:ho=\E[H:nd=\E[C:se=\E[m:so=\E[7m:sr=\EM:ue=\E[m:\
+	:up=\E[A:us=\E[4m:tc=vt100:
 # except in 132 column mode, where it needs a little padding.
 # This is still less padding than the vt100, and you can always turn on
 # the ^S/^Q handshaking, so you can use vt100 flavors for things like
@@ -5562,8 +5872,8 @@ dtx-sas|dt80-sas|Datamedia DT803/DTX for SAS usage:\
 	:..cs=\E=%p1%' '%+%c%' '%c\E#1\E=%p2%' '%+%c%' '%c\E#2:\
 	:ct=\E'0:dl=\EM:do=\EB:ff=^L:ho=^Y:\
 	:is=\E)0\E<\EP\E'0\E$2:kd=^J:kh=^Y:kl=^H:kr=^\:ku=^_:\
-	:le=^H:me=^X:mr=\E$2\004:nd=^\:pf=^O:po=^N:se=^X:\
-	:sf=\EB:so=\E$2\004:sr=\EI:st=\E'1:ta=^I:up=^_:
+	:le=^H:me=^X:mr=\E$2\004:nd=^\:se=^X:sf=\EB:\
+	:so=\E$2\004:sr=\EI:st=\E'1:ta=^I:up=^_:
 
 #### Falco
 #
@@ -5577,26 +5887,25 @@ dtx-sas|dt80-sas|Datamedia DT803/DTX for SAS usage:\
 # 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
-# (falco: mapped ":pt:" to default tabs -- esr)
+# Test version for Falco ts-1. See <arpavax.hickman@ucb> for info
 # This terminal was released around 1983 and was discontinued long ago.
 falco|ts1|ts-1|falco ts-1:\
-	:am:bs:pt:\
-	:co#80:li#24:\
+	:am:\
+	:co#80:it#8:li#24:\
 	:al=\EE:bl=^G:cd=\EY:ce=\ET\EG0\010:cl=\E*:\
 	:cm=\E=%+ %+ :cr=^M:dc=\EW:dl=\ER:do=^J:ei=\Er:ho=^^:\
 	:im=\Eq:is=\Eu\E3:k0=^A0\r:kd=^J:kl=^H:kr=^L:ku=^K:\
 	:le=^H:nd=^L:se=\Eg0:sf=^J:so=\Eg1:ta=^I:ue=\Eg0:\
 	:up=^K:us=\Eg1:
-# (falco-p: mapped ":pt:" to default tabs -- esr)
 falco-p|ts1p|ts-1p|falco ts-1 with paging option:\
-	:am:bs:da:db:mi:ms:pt:ul:\
-	:co#80:li#24:\
+	:am:da:db:mi:ms:ul:\
+	:co#80:it#8:li#24:\
 	:al=\EE:bl=^G:bt=\EI:cd=\EY:ce=\ET\EG0\010\Eg0:\
 	:cl=\E*:cm=\E=%+ %+ :cr=^M:dc=\EW:dl=\ER:do=\E[B:\
 	:ei=\Er:im=\Eq:is=\EZ\E3\E_c:kd=\E[B:kh=\E[H:kl=\E[D:\
 	:kr=\E[C:ku=\E[A:le=^H:nd=\E[C:se=\Eg0:sf=^J:so=\Eg4:\
 	:ta=^I:te=\E_b:ti=\E_d:ue=\Eg0:up=\E[A:us=\Eg1:
+# (ts100: I added <rmam>/<smam> based on the init string -- esr)
 ts100|ts100-sp|falco ts100-sp:\
 	:am:mi:ms:xn:xo:\
 	:co#80:it#8:li#24:vt#3:\
@@ -5618,12 +5927,12 @@ ts100-ctxt|falco ts-100 saving context:\
 #### Florida Computer Graphics
 #
 
-#	Florida Computer Graphics Beacon System, using terminal emulator
-#	program "host.com", as provided by FCG.  Entry provided by
-#	David Bryant (cbosg!djb) 1/7/83.
-#	This description is for an early release of the "host" program.
-#	Known bug: ed clears the whole screen, so it's commented out.
-#
+# Florida Computer Graphics Beacon System, using terminal emulator program
+# "host.com", as provided by FCG.  This description is for an early release
+# of the "host" program.  Known bug: <ed> clears the whole screen, so it's
+# commented out.
+
+# From: David Bryant <cbosg!djb> 1/7/83
 beacon|FCG Beacon System:\
 	:am:da:db:\
 	:co#80:li#32:\
@@ -5646,8 +5955,8 @@ beacon|FCG Beacon System:\
 f1720|f1720a|fluke 1720A:\
 	:xt:\
 	:co#80:li#16:sg#1:ug#1:\
-	:bl=^G:cd=\E[J:ce=\E[K:cl=\E[;H\E[2J:cm=\E[%i%d;%dH:\
-	:cr=^M:do=\E[B:is=\E[;H\E[2J:kd=^]:kl=^_:kr=^^:ku=^\:\
+	:bl=^G:cd=\E[J:ce=\E[K:cl=\E[H\E[2J:cm=\E[%i%d;%dH:\
+	:cr=^M:do=\E[B:is=\E[H\E[2J:kd=^]:kl=^_:kr=^^:ku=^\:\
 	:le=^H:nd=\E[C:se=\E[m:sf=\ED:so=\E[7m:sr=\EM:\
 	:ue=\E[m:up=\E[A:us=\E[4m:
 
@@ -5664,14 +5973,13 @@ f100|freedom|freedom100|freedom model 100:\
 	:am:bw:hs:mi:ms:xo:\
 	:co#80:li#24:\
 	:ae=\E$:al=\EE:as=\E%:bl=^G:bt=\EI:cd=\EY:ce=\ET:\
-	:ch=\E]%+ :cl=^Z:cm=\E=%+ %+ :cr=^M:ct=\E3:cv=\E[%+ :\
-	:dc=\EW:dl=\ER:do=^J:ds=\Eg\Ef\r:ei=\Er:fs=^M:ho=^^:\
-	:im=\Eq:ip=:is=\Eg\Ef\r\Ed:k1=^A@\r:k2=^AA\r:\
-	:k3=^AB\r:k4=^AC\r:k5=^AD\r:k6=^AE\r:k7=^AF\r:\
-	:k8=^AG\r:k9=^AH\r:kb=^H:kd=^V:kh=^^:kl=^H:kr=^L:\
-	:ku=^K:le=^H:nd=^L:se=\EG0:sf=^J:so=\EG4:sr=\Ej:\
-	:st=\E1:ta=^I:ts=\Eg\Ef:ue=\EG0:up=^K:us=\EG8:\
-	:vb=\Eb\Ed:
+	:cl=^Z:cm=\E=%+ %+ :cr=^M:ct=\E3:dc=\EW:dl=\ER:do=^J:\
+	:ds=\Eg\Ef\r:ei=\Er:fs=^M:ho=^^:im=\Eq:ip=:\
+	:is=\Eg\Ef\r\Ed:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:\
+	:k5=^AD\r:k6=^AE\r:k7=^AF\r:k8=^AG\r:k9=^AH\r:kb=^H:\
+	:kd=^V:kh=^^:kl=^H:kr=^L:ku=^K:le=^H:nd=^L:se=\EG0:\
+	:sf=^J:so=\EG4:sr=\Ej:st=\E1:ta=^I:ts=\Eg\Ef:ue=\EG0:\
+	:up=^K:us=\EG8:vb=\Eb\Ed:
 f100-rv|freedom-rv|freedom 100 in reverse video:\
 	:is=\Eg\Ef\r\Eb:vb=\Ed\Eb:tc=f100:
 # The f110 and f200 have problems with vi(1).  They use the ^V
@@ -5687,31 +5995,25 @@ f100-rv|freedom-rv|freedom 100 in reverse video:\
 # 
 # The same applies to f200 users, except that another option exists.
 # This option has been chosen locally. It will not be distributed unless
-# a user runs into this problem and requests assistance. Very few users,
+# a user runs into this problem and requests assistance.  Very few users,
 # if any, should run into this problem. The local solution is in
-# vifix.local.ti. The f200 has the ability to reprogram the down cursor
+# vifix.local.ti.  The f200 has the ability to reprogram the down cursor
 # key. The key is reprogrammed to ^J (linefeed). This value is remembered
 # in non-volatile RAM, so powering the terminal off and on will not cause
 # the change to be lost. The terminfo definition for the f200 is changed
-# to identify kcud1 as ^J instead of ^V.
+# to identify <kcud1> as ^J instead of ^V.
+# (f110: added <ht>, <khome> & <kcbt> from f100 -- esr)
 f110|freedom110|Liberty Freedom 110:\
-	:am:es:hs:mi:ms:xo:\
-	:co#80:it#8:li#24:ws#80:\
-	:ae=\E%%:al=\EE:as=\E$:bl=^G:bt=\EI:cd=\EY:ce=\ET:\
-	:ch=\E]%+ :cl=^Z:cm=\E=%+ %+ :cr=^M:ct=\E3:cv=\E[%+ :\
-	:dc=\EW:dl=\ER:do=^V:ds=\Ef\r:ei=\Er\EO:fs=^M:ho=^^:\
-	:k0=^AI\r:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:\
-	:k5=^AD\r:k6=^AE\r:k7=^AF\r:k8=^AG\r:k9=^AH\r:kb=^H:\
-	:kd=^V:kl=^H:kr=^L:ku=^K:le=^H:mb=\EG2:md=\EG0:\
-	:me=\EG0:mh=\EG@:mk=\EG1:mr=\EG4:nd=^L:pf=\Ea:po=\E`:\
-	:se=\EG0:sf=^J:so=\EG<:sr=\EJ\nsmir=\EO\Eq:st=\E1:\
-	:ts=\Ef:ue=\EG0:up=^K:us=\EG8:\
-	:vb=\Eb\200\200\200\200\Ed:ve=\E.2:vi=\E.1:vs=\E.2:
+	:bw@:es:\
+	:it#8:ws#80:\
+	:ae=\E%%:al=\EE:as=\E$:dl=\ER:do=^V:ds=\Ef\r:\
+	:ei=\Er\EO:im=\EO\Eq:ip@:is@:k0=^AI\r:kD=\EW:kI=\EQ:\
+	:mb=\EG2:md=\EG0:me=\EG0:mh=\EG@:mr=\EG4:so=\EG<:\
+	:sr=\EJ:ts=\Ef:vb=\Eb\Ed:ve=\E.2:vi=\E.1:vs=\E.2:tc=f100:
 f110-14|Liberty Freedom 110 14inch:\
 	:dc@:tc=f110:
 f110-w|Liberty Freedom 110 - 132 cols:\
-	:co#132:\
-	:tc=f110:
+	:co#132:\tc=f110:
 f110-14w|Liberty Freedom 110 14in/132 cols:\
 	:co#132:\
 	:dc@:tc=f110:
@@ -5719,35 +6021,20 @@ f200|freedom200|Liberty Freedom 200:\
 	:am:es:hs:mi:ms:xo:\
 	:co#80:it#8:li#24:ws#80:\
 	:ae=\E%%:al=\EE:as=\E$:bl=^G:bt=\EI:cd=\EY:ce=\ET:\
-	:ch=\E]%+ :cl=^Z:cm=\E=%+ %+ :cr=^M:cs=\Em0%+ %+ :\
-	:ct=\E3:cv=\E[%+ :dc=\EW:dl=\ER:do=^V:ds=\Ef\r:\
-	:ei=\Er:fs=^M:ho=^^:im=\Eq:k0=^AI\r:k1=^A@\r:\
-	:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:k6=^AE\r:\
-	:k7=^AF\r:k8=^AG\r:k9=^AH\r:kb=^H:kd=^V:kl=^H:kr=^L:\
-	:ku=^K:le=^H:mb=\EG2:md=\EG0:me=\EG0:mh=\EG@:mk=\EG1:\
-	:mr=\EG4:nd=^L:pf=\Ea:po=\E`:se=\EG0:sf=^J:so=\EG<:\
-	:sr=\EJ:st=\E1:ts=\Ef:ue=\EG0:up=^K:us=\EG8:\
-	:vb=\Eo\200\200\200\200\200\200\200\200\200\200\200\200\200\200\200\En:\
-	:ve=\E.1:vi=\E.0:vs=\E.1:
+	:cl=^Z:cm=\E=%+ %+ :cr=^M:cs=\Em0%+ %+ :ct=\E3:\
+	:dc=\EW:dl=\ER:do=^V:ds=\Ef\r:ei=\Er:fs=^M:ho=^^:\
+	:im=\Eq:k0=^AI\r:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:\
+	:k5=^AD\r:k6=^AE\r:k7=^AF\r:k8=^AG\r:k9=^AH\r:kD=\EW:\
+	:kI=\EQ:kb=^H:kd=^V:kl=^H:kr=^L:ku=^K:le=^H:mb=\EG2:\
+	:md=\EG0:me=\EG0:mh=\EG@:mr=\EG4:nd=^L:se=\EG0:sf=^J:\
+	:so=\EG<:sr=\EJ:st=\E1:ts=\Ef:ue=\EG0:up=^K:us=\EG8:\
+	:vb=\Eo\En:ve=\E.1:vi=\E.0:vs=\E.1:
 f200-w|Liberty Freedom 200 - 132 cols:\
-	:co#132:\
-	:tc=f200:
+	:co#132:\tc=f200:
 f200vi|Liberty Freedom 200 for vi:\
-	:am:es:hs:mi:ms:xo:\
-	:co#80:it#8:li#24:ws#80:\
-	:ae=\E%%:al=\EE:as=\E$:bl=^G:bt=\EI:cd=\EY:ce=\ET:\
-	:ch=\E]%+ :cl=^Z:cm=\E=%+ %+ :cr=^M:cs=\Em0%+ %+ :\
-	:ct=\E3:cv=\E[%+ :dc=\EW:dl=\ER:do=^V:ds=\Ef\r:\
-	:ei=\Er:fs=^M:ho=^^:im=\Eq:k0=^AI\r:k1=^A@\r:\
-	:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:k6=^AE\r:\
-	:k7=^AF\r:k8=^AG\r:k9=^AH\r:kb=^H:kd=^J:kl=^H:kr=^L:\
-	:ku=^K:le=^H:mb=\EG2:md=\EG0:me=\EG0:mh=\EG@:mk=\EG1:\
-	:mr=\EG4:nd=^L:pf=\Ea:po=\E`:se=\EG0:sf=^J:so=\EG<:\
-	:sr=\EJ:st=\E1:ts=\Ef:ue=\EG0:up=^K:us=\EG8:\
-	:vb=\Eb\200\200\200\200\Ed:ve=\E.1:vi=\E.0:vs=\E.1:
+	:kd=^J:vb=\Eb\Ed:tc=f200:
 f200vi-w|Liberty Freedom 200 - 132 cols for vi:\
-	:co#132:\
-	:tc=f200vi:
+	:co#132:\tc=f200vi:
 
 #### GraphOn (go)
 #
@@ -5763,28 +6050,27 @@ f200vi-w|Liberty Freedom 200 - 132 cols for vi:\
 # including one odd hybrid that starts out life on power-up as a character
 # terminal, than can be switched to X graphics mode (driven over the serial
 # line) by an escape sequence.  No info on this beast yet.
-
-# (go140: mapped ":pt:" to default tabs -- esr)
+# (go140: I added <rmam>/<smam> based on the init string -- esr)
 go140|graphon go-140:\
-	:bs:pt:\
-	:co#80:li#24:\
-	:al=\E[L:cd=10\E[J:ce=\E[K:cl=10\E[;H\E[2J:\
+	:co#80:it#8:li#24:\
+	:al=\E[L:cd=10\E[J:ce=\E[K:cl=10\E[H\E[2J:\
 	:cm=\E[%i%2;%2H:dc=\E[P:dl=\E[M:ei=\E[4l:\
 	:if=/usr/share/tabset/vt100:im=\E[4h:\
 	:is=\E<\E=\E[?3l\E[?7l\E(B\E[J\E7\E[;r\E8\E[m\E[q:\
 	:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:kd=\EOB:\
 	:ke=\E[?1l\E>:kh=\E[H:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:\
-	:ku=\EOA:nd=\E[C:se=\E[m:so=\E[7m:sr=\EM:ue=\E[m:\
-	:up=\E[A:us=\E[4m:
+	:ku=\EOA:le=^H:nd=\E[C:se=\E[m:so=\E[7m:sr=\EM:ta=^I:\
+	:ue=\E[m:up=\E[A:us=\E[4m:
 go140w|graphon go-140 in 132 column mode:\
+	:am:\
 	:co#132:\
 	:is=\E<\E=\E[?3h\E[?7h\E(B\E[J\E7\E[;r\E8\E[m\E[q:tc=go140:
 # Hacked up vt200 termcap to handle GO-225/VT220
 # From: <edm@nwnexus.WA.COM>
-# (go225: mapped ":pt:" to default tabs -- esr)
+# (go225: I added <rmam>/<smam> based on the init string -- esr)
 go225|go-225|Graphon 225:\
-	:am:bs:mi:pt:xn:\
-	:co#80:li#25:vt#3:\
+	:am:mi:xn:\
+	:co#80:it#8:li#25:vt#3:\
 	:al=\E[L:cd=\E[J:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:\
 	:cs=\E[%i%d;%dr:dc=\E[P:dl=\E[M:do=^J:ei=\E[4l:\
 	:ho=\E[H:im=\E[4h:\
@@ -5792,9 +6078,9 @@ go225|go-225|Graphon 225:\
 	:k2=\EOQ:k3=\EOR:k4=\EOS:kb=^H:kd=\E[B:ke=\E>:\
 	:kh=\E[H:kl=\E[D:kr=\E[C:ks=\E=:ku=\E[A:le=^H:\
 	:mb=\E[5m:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:rc=\E8:\
-	:rs=\E[!p\E[?7h\E[2;1;1#w:sc=\E7:se=\E[27m:sf=\ED:\
-	:so=\E[7m:sr=\EM:te=\E[!p\E[?7h\E[2;1;1#w:\
-	:ti=\E[2;0#w\E[1;25r:ue=\E[24m:up=\E[A:us=\E[4m:
+	:sc=\E7:se=\E[27m:sf=\ED:so=\E[7m:sr=\EM:ta=^I:\
+	:te=\E[!p\E[?7h\E[2;1;1#w:ti=\E[2;0#w\E[1;25r:\
+	:ue=\E[24m:up=\E[A:us=\E[4m:
 
 #### Harris (Beehive)
 #
@@ -5806,29 +6092,29 @@ go225|go-225|Graphon 225:\
 # Beehive documentation is undated and marked Preliminary and has no figures
 # so we must have early Superbee2 (Model 600, according to phone conversation
 # with mfr.). It has proved reliable except for some missing padding
-# (notably after \EK and nl at bottom of screen).
+# (notably after \EK and <nl> at bottom of screen).
 # 
-# The key idea is that AEP mode is poison for cup & that US's in 
+# The key idea is that AEP mode is poison for <cup> & that US's in 
 # the local memory should be avoided like the plague. That means 
 # that the 2048 character local buffer is used as 25 lines of 80 
 # characters, period. No scrolling local memory, folks. It also 
 # appears that we cannot use naked INS LINE feature since it uses
-# US. The sbi fakes il1 with an 80-space insert that may be too 
+# US. The sbi fakes <il1> with an 80-space insert that may be too 
 # slow at low speeds; also spaces get converted to \040 which is 
 # too long for some programs (not vi).  DEL LINE is ok but slow.
 # 
-# The nl string is designed for last line of screen ONLY; cup to 
+# The <nl> string is designed for last line of screen ONLY; cup to 
 # 25th line corrects the motion inherent in scrolling to Page 1.
 # 
 # There is one understood bug. It is that the screen appears to
-# pop to a new (blank) page after a nel, or leave a half-line 
+# pop to a new (blank) page after a <nel>, or leave a half-line 
 # elipsis to a quad that is the extra 48 memory locations. The 
 # data received is dumped into memory but not displayed.  Not to 
-# worry if cup is being used; the lines not displayed will be, 
-# whenever the cursor is moved up there. Since cup is addressed 
+# worry if <cup> is being used; the lines not displayed will be, 
+# whenever the cursor is moved up there. Since <cup> is addressed 
 # relative to MEMORY of window, nothing is lost; but beware of 
-# relative cursor motion (cuu1,cud1,cuf1,cub1). Recommended, therefore, 
-# is setenv MORE -c .
+# relative cursor motion (<cuu1>,<cud1>,<cuf1>,<cub1>). Recommended,
+# therefore, is setenv MORE -c .
 # 
 # WARNING: Not all features tested.
 # 
@@ -5869,9 +6155,9 @@ sb1|beehive superbee:\
 	:cr=\r:ct=\E3:dc=\EP:dl=\EM:do=^J:ei=\ER:ho=\EH:\
 	:im=\EQ\EO:is=\EE\EX\EZ\EO\Eb\Eg\ER:k0=\E2:k1=\Ep:\
 	:k2=\Eq:k3=\Er:k4=\Es:k5=\Et:k6=\Eu:k7=\Ev:k8=\Ew:\
-	:k9=\E1:kb=^_:kd=\EB:kh=\EH:kl=\ED:kr=\EC:ku=\EA:\
-	:le=^H:nd=\EC:se=\E_3:sf=^J:so=\E_1:st=\E1:ta=^I:\
-	:ti=\EO:ue=\E_3:up=\EA:us=\E_0:
+	:k9=\E1:kI=\EQ\EO:kb=^_:kd=\EB:kh=\EH:kl=\ED:kr=\EC:\
+	:ku=\EA:le=^H:nd=\EC:se=\E_3:sf=^J:so=\E_1:st=\E1:\
+	:ta=^I:ti=\EO:ue=\E_3:up=\EA:us=\E_0:
 sbi|superbee|beehive superbee at Indiana U.:\
 	:xb:\
 	:al=1\EN\EL\EQ \EP \EO\ER\EA:cr=\r:tc=sb1:
@@ -5881,46 +6167,42 @@ sbi|superbee|beehive superbee at Indiana U.:\
 # The sb3 puts garbage on the bottom of the screen when you scroll with
 # the switch in the back set to CRLF instead of AEP.  This description
 # is tested on the sb2 but should work on all with either switch setting.
-# The f1/f2 business is for the sb1 and the xsb can be taken out for
+# The f1/f2 business is for the sb1 and the <xsb> can be taken out for
 # the other two if you want to try to hit that tiny escape key.
 # This description is tricky: being able to use cup depends on there being
-# 2048 bytes of memory and the hairy nl string.
+# 2048 bytes of memory and the hairy <nl> string.
 superbee-xsb|beehive super bee:\
-	:am:bs:da:db:pt:xb:\
-	:co#80:dC#10:it#8:li#25:\
+	:am:da:db:xb:\
+	:co#80:it#8:li#25:\
 	:cd=\EJ:ce=\EK:cl=\EH\EJ:cm=\EF%r%3%3:cr=\r:ct=\E3:\
 	:dc=\EP:dl=\EM:do=^J:ho=\EH:is=\EH\EJ:k1=\Ep:k2=\Eq:\
 	:k3=\Er:k4=\Es:k5=\Et:k6=\Eu:k7=\Ev:k8=\Ew:kd=\EB:\
-	:kh=\EH:kl=\ED:kr=\EC:ku=\EA:le=^H:nd=\EC:\
-	:nl=\n\200\200\200\n\200\200\200\EA\EK\200\200\200\ET\ET:\
-	:se=\E_3:\
+	:kh=\EH:kl=\ED:kr=\EC:ku=\EA:le=^H:nd=\EC:se=\E_3:\
 	:sf=\n\200\200\200\n\200\200\200\EA\EK\200\200\200\ET\ET:\
-	:so=\E_1:st=\E1:up=\EA:ve=^J:
+	:so=\E_1:st=\E1:ta=^I:up=\EA:ve=^J:
 # This loses on lines > 80 chars long, use at your own risk
 superbeeic|super bee with insert char:\
 	:ei=\ER:ic=:im=\EQ:tc=superbee-xsb:
 sb2|sb3|fixed superbee:\
-	:xb@:\
-	:tc=superbee:
+	:xb@:\tc=superbee:
 
 # Reports are that most of these Beehive entries (except superbee) have not
-# been tested and do not work right.  :se: is a trouble spot.  Be warned.
+# been tested and do not work right.  <rmso> is a trouble spot.  Be warned.
 
-# (bee: removed obsolete ":ko=al,bt,ce,cl,dc,dl,ei,ho,ic,im:" -- esr)
+# (bee: <ich1> was empty, which is obviously bogus -- esr)
 beehive|bee|harris beehive:\
-	:am:bs:mi:\
+	:am:mi:\
 	:co#80:li#24:\
 	:al=\EL:bt=\E>:cd=\EJ:ce=\EK:cl=\EE:cm=\EF%+ %+ :\
-	:dc=\EP:dl=\EM:do=\EB:ei=\E@:ho=\EH:ic=:im=\EQ:kb=^H:\
-	:kd=\EB:kh=\EH:kl=\ED:kr=\EC:ku=\EA:nd=\EC:se=\Ed@:\
-	:so=\EdP:ue=\Ed@:up=\EA:us=\Ed`:
+	:dc=\EP:dl=\EM:do=\EB:ei=\E@:ho=\EH:im=\EQ:kD=\EP:\
+	:kI=\EQ:kb=^H:kd=\EB:kh=\EH:kl=\ED:kr=\EC:ku=\EA:\
+	:le=^H:nd=\EC:se=\Ed@:so=\EdP:ue=\Ed@:up=\EA:us=\Ed`:
 # set tab is ^F, clear (one) tab is ^V, no way to clear all tabs.
-# good grief - does this entry make sg/ug when it doesn't have to?
-# look at those spaces in se/so.  Seems strange to me...
-# (bh3m: mapped ":pt:" to default tabs -- esr)
-beehive3|bh3m|beehiveIIIm:\
-	:am:bs:pt:\
-	:co#80:li#20:\
+# good grief - does this entry make :sg:/:ug: when it doesn't have to?
+# look at those spaces in <rmso>/<smso>.  Seems strange to me...
+beehive3|bh3m|beehiveIIIm|harris beehive 3m:\
+	:am:\
+	:co#80:it#8:li#20:\
 	:al=\023:bl=^G:cd=^R:ce=^P:cl=^E^R:cr=^M:dl=\021:\
 	:do=^J:ho=^E:if=/usr/share/tabset/beehive:le=^H:\
 	:ll=^E^K:nd=^L:se= ^_:sf=^J:so=^] :ta=^I:up=^K:
@@ -5929,10 +6211,9 @@ beehive4|bh4|beehive 4:\
 	:co#80:li#24:\
 	:bl=^G:cd=\EJ:ce=\EK:cl=\EE:cr=^M:do=^J:ho=\EH:\
 	:le=\ED:nd=\EC:sf=^J:up=\EA:
-# (microb: mapped ":pt:" to default tabs -- esr)
 microb|microbee|micro bee series:\
-	:am:bs:pt:\
-	:co#80:li#24:\
+	:am:\
+	:co#80:it#8:li#24:\
 	:bl=^G:cd=\EJ:ce=\EK:cl=\EE:cm=\EF%+ %+ :cr=^M:do=^J:\
 	:k1=\Ep:k2=\Eq:k3=\Er:k4=\Es:k5=\Et:k6=\Eu:k7=\Ev:\
 	:k8=\Ew:k9=\Ex:kd=\EB:kh=\EH:kl=\ED:kr=\EC:ku=\EA:\
@@ -5955,53 +6236,59 @@ ha8686|harris 8686:\
 #
 # Hazeltine appears to be out of the business now (1995).  These guys were 
 # co-owners of the Terminal Brain Damage Hall Of Fame along with Harris.
-# Good riddance.
+# They have a hazeltine.com domain and can be reached at:
+#
+#	Hazeltine
+#	450 East Pulaski Road
+#	Greenlawn, New York 11740
 #
-# The ony contact information I have dates from 1993 and is:
+# As late as 1993, manuals for the terminal product line could still be
+# purchased from:
 #
-# Customer Service Division
-# 15 Law Drive
-# P.O. Box 2076
-# Fairfield, NJ 07007-2078
+#	TRW Customer Service Division
+#	15 Law Drive
+#	P.O. Box 2076
+#	Fairfield, NJ 07007-2078
 #
-# Since :nd: is blank, when you want to erase something you
+
+# Since <cuf1> is blank, when you want to erase something you
 # are out of luck.  You will have to do ^L's a lot to
 # redraw the screen.  h1000 is untested.  It doesn't work in
 # vi - this terminal is too dumb for even vi.  (The code is
 # there but it isn't debugged for this case.)
 h1000|hazeltine 1000:\
-	:bs:\
 	:co#80:li#12:\
 	:bl=^G:cl=^L:cr=^M:do=^J:ho=^K:le=^H:nd= :sf=^J:
 # From: <cbosg!ucbvax!pur-ee!cincy!chris> Thu Aug 20 09:09:18 1981
 h1420|hazeltine 1420:\
-	:am:bs:\
+	:am:\
 	:co#80:li#24:\
 	:al=\E^Z:bl=^G:cd=\E^X:ce=\E^O:cl=\E^\:\
 	:cm=\E\021%r%.%+ :cr=^M:dl=\E^S:do=^J:le=^H:nd=^P:\
 	:se=\E^Y:sf=^J:so=\E^_:ta=^N:up=\E^L:
-# New "safe" cursor movement (11/87) from cgs@umd5.umd.edu.  Prevents freakout
-# with out-of-range args and tn3270.  No hz since it needs to receive ~'s.
+# New "safe" cursor movement (11/87) from <cgs@umd5.umd.edu>.  Prevents
+# freakout with out-of-range args and tn3270.  No hz since it needs to
+# receive tildes.
 h1500|hazeltine 1500:\
-	:am:bs:hz:\
+	:am:hz:\
 	:co#80:li#24:\
 	:al=~\032:bl=^G:cd=~\030:ce=~^O:cl=~^\:\
 	:cm=~\021%r%>^^ %+`%+`:cr=^M:dl=~\023:do=~^K:ho=~^R:\
 	:kd=^J:kh=~^R:kl=^H:kr=^P:ku=~^L:le=^H:nd=^P:se=~^Y:\
 	:sf=^J:so=~^_:up=~^L:
 # h1510 assumed to be in sane escape mode.  Else use h1500.
-# (h1510: early versions of this entry apparently had ":se=\E^_:so=\E^Y:",
-# but these caps were commented out in 8.3; also, removed incorrect
-# and overridden ":do=^J:" -- esr)
+# (h1510: early versions of this entry apparently had "<rmso>=\E^_, 
+# <smso>=\E^Y, but these caps were commented out in 8.3; also,
+# removed incorrect and overridden ":do=^J:" -- esr)
 h1510|hazeltine 1510:\
-	:am:bs:\
+	:am:\
 	:co#80:li#24:\
 	:al=\E^Z:bl=^G:cd=\E^X:ce=\E^O:cl=\E^\:\
 	:cm=\E\021%r%.%.:cr=^M:dl=\E^S:do=\E^K:le=^H:nd=^P:\
 	:sf=^J:up=\E^L:
 # (h1520: removed incorrect and overridden ":do=^J:" -- esr)
 h1520|hazeltine 1520:\
-	:am:bs:hz:\
+	:am:hz:\
 	:co#80:li#24:\
 	:al=~^Z:bl=^G:cd=~^X:ce=~^O:cl=~^\:cm=~\021%r%.%.:\
 	:cr=^M:dl=~^S:do=~^K:ho=~^R:le=^H:nd=^P:se=~^Y:sf=^J:\
@@ -6011,11 +6298,11 @@ h1520|hazeltine 1520:\
 # Be sure the auto lf/cr switch is set to cr.
 h1552|hazeltine 1552:\
 	:al=\EE:dl=\EO:do=^J:k1=\EP:k2=\EQ:k3=\ER:tc=vt52:
-h1552rv|hazeltine 1552 reverse video:\
+h1552-rv|hazeltine 1552 reverse video:\
 	:do=^J:se=\ET:so=\ES:tc=h1552:
 # Note: h2000 won't work well because of a clash between upper case and ~'s.
 h2000|hazeltine 2000:\
-	:am:bs:nc:\
+	:am:nc:\
 	:co#74:li#27:\
 	:al=~\032:bl=^G:cl=~\034:cm=~\021%r%.%.:dl=~\023:\
 	:do=^J:ho=~^R:le=^H:pc=\177:sf=^J:
@@ -6037,8 +6324,7 @@ esprit|Hazeltine Esprit I:\
 	:kd=\E^K:ke=\E>:kh=\E^R:kl=^H:kr=^P:ks=\E<:ku=\E^L:\
 	:le=^H:nd=^P:se=\E^Y:sf=^J:so=\E^_:up=\E^L:
 esprit-am|hazeltine esprit auto-margin:\
-	:am:\
-	:tc=esprit:
+	:am:\tc=esprit:
 
 #### IBM
 #
@@ -6046,9 +6332,11 @@ esprit-am|hazeltine esprit auto-margin:\
 ibm327x|line mode IBM 3270 style:\
 	:gn:\
 	:ce=^M:cl=^M^J:ho=^M:
+
+# Beware! The 3101 entry IBM shipped with AIX 3 is *wrong*.  Losers...
 # From: J.B. Nicholson-Owens <jeffo@uiuc.edu> 8 Mar 94
 ibm3101|i3101|IBM 3101-10:\
-	:am:bs:pt:xo:\
+	:am:xo:\
 	:co#80:li#24:\
 	:bl=^G:cd=\EJ:ce=\EI:cl=\EK:cm=\EY%+ %+ :cr=^M:\
 	:ct=\E1:do=^J:ho=\EH:if=/usr/share/tabset/ibm3101:\
@@ -6056,21 +6344,21 @@ ibm3101|i3101|IBM 3101-10:\
 	:nw=^M^J:sf=^J:st=\E0:ta=^I:up=\EA:
 #   Received from the IBM terminals division (given to DRB)
 #   June 1988 for PS/2 OS 2.2.3 cut
-ibm3151|i3151:\
+ibm3151|i3151|IBM 3151:\
 	:me=\E4@:\
 	:..sa=\E4%{64}%?%p1%{0}%>%p1%{4}%<%&%t%{8}%|%;%?%p1%{7}%=%t%{16}%|%;%?%p2%t%{1}%|%;%?%p3%t%{4}%|%;%?%p4%t%{2}%|%;%c:\
 	:se=\E4@:so=\E4A:ue=\E4@:us=\E4B:tc=ibm3163:
 # From: Mark Easter <marke@fsi-ssd.csg.ssd.fsi.com> 29 Oct 1992 
-# I commented out some IBM extensions.
+# I've commented out or translated some IBM extensions.
 ibm3161|ibm3163|wy60-316X|wyse60-316X|IBM 3161/3163 display:\
 	:am:mi:ms:\
 	:co#80:it#8:li#24:\
 	:bl=^G:cd=\EJ:ce=\EI:cl=\EH\EJ:cm=\EY%+ %+ :cr=^M:\
 	:dc=\EQ:dl=\EO:do=\EB:ho=\EH:k1=\Ea\r:k2=\Eb\r:\
 	:k3=\Ec\r:k4=\Ed\r:k5=\Ee\r:k6=\Ef\r:k7=\Eg\r:\
-	:k8=\Eh\r:k9=\Ei\r:kb=^H:kd=\EB:kh=\EH:kl=\ED:kr=\EC:\
-	:ku=\EA:le=\ED:mb=\E4D:md=\E4H:me=\E4@\E<@:mk=\E4P:\
-	:mr=\E4A:nd=\EC:\
+	:k8=\Eh\r:k9=\Ei\r:kD=\EQ:kI=\EP \010:kb=^H:kd=\EB:\
+	:kh=\EH:kl=\ED:kr=\EC:ku=\EA:le=\ED:mb=\E4D:md=\E4H:\
+	:me=\E4@\E<@:mr=\E4A:nd=\EC:\
 	:..sa=\E4%'@'%?%p1%t%'A'%|%;\n%?%p2%t%'B'%|%;\n%?%p3%t%'A'%|%;\n%?%p4%t%'D'%|%;\n%?%p5%t%'@'%|%;\n%?%p6%t%'H'%|%;\n%?%p7%t%'P'%|%;%c\n%?%p9%t\E>A%e\E<@%;:\
 	:se=\E4@:sf=^J:so=\E4A:te=\E>A:ti=\E>A:ue=\E4@:\
 	:up=\EA:us=\E4B:
@@ -6085,32 +6373,36 @@ ibm3161|ibm3163|wy60-316X|wyse60-316X|IBM 3161/3163 display:\
 #	%c		# pop Pa2 
 #	%{64}		# use only black background for now
 #	%c		# pop Pa3
-ibm3164|i3164|3164:\
+ibm3164|i3164|IBM 3164:\
 	:mb=\E4D:md=\E4H:me=\E4@:\
 	:..sa=\E4%{32}%?%p2%t%{1}%|%;%?%p3%t%{4}%|%;%?%p4%t%{2}%|%;%c%{39}%p1%-%c%{64}%c:tc=ibm3163:
 
-# (ibmaed: mapped ":pt:" to default tabs -- esr)
 ibmaed|IBM Experimental display:\
-	:am:bs:eo:ms:pt:\
-	:co#80:li#52:\
+	:am:eo:ms:\
+	:co#80:it#8:li#52:\
 	:al=\EN:cd=\EJ:ce=\EI:cl=\EH\EK:cm=\EY%+ %+ :dc=\EQ:\
 	:dl=\EO:do=\EB:ei=:ho=\EH:ic=\EP:im=:kb=^H:kd=\EB:\
-	:kl=\ED:kr=\EC:ku=\EA:nd=\EC:se=\E0:so=\E0:ue=:\
-	:up=\EA:us=:vb=\EG:
+	:kl=\ED:kr=\EC:ku=\EA:le=^H:nd=\EC:se=\E0:so=\E0:\
+	:ta=^I:up=\EA:vb=\EG:
 ibm-apl|apl|IBM apl terminal simulator:\
-	:li#25:\
-	:tc=dm1520:
+	:li#25:\tc=dm1520:
 # (ibmmono: this had an unknown `sb' boolean, I changed it to `bs'.  
 # Also it had ":I0=f10:" which pretty obviously should be "l0=f10" -- esr)
 ibmmono|ibm5151|IBM workstation monochrome:\
-	:bs:es:hs:\
+	:es:hs:\
 	:al=\EL:dl=\EM:ds=\Ej\EY8 \EI\Ek:fs=\Ek:k0=\E<:\
 	:k1=\ES:k2=\ET:k3=\EU:k4=\EV:k5=\EW:k6=\EP:k7=\EQ:\
-	:k8=\ER:k9=\EY:kb=^H:kh=\EH:md=\EZ:me=\Ew\Eq\Ez\EB:\
-	:mk=\EF\Ef0;\Eb0;:mr=\Ep:se=\Ez:so=\EZ:sr=\EA:\
+	:k8=\ER:k9=\EY:kI=\200:kN=\EE:kP=\Eg:kb=^H:kh=\EH:\
+	:md=\EZ:me=\Ew\Eq\Ez\EB:mr=\Ep:se=\Ez:so=\EZ:sr=\EA:\
 	:ts=\Ej\EY8%+ \Eo:ue=\Ew:us=\EW:tc=ibm3101:
+ibmega|ibm5154|IBM Enhanced Color Display:\
+	:cr=^M:do=^J:kb=^H:kd=^J:kl=^H:nw=^M^J:sf=^J:ta=^I:tc=ibmmono:
 ibmega-c|ibm5154-c|IBM Enhanced Color Display:\
 	:se=\EB:so=\EF\Ef3;:ue=\EB:us=\EF\Ef2;:tc=ibmmono:
+ibmvga-c|IBM VGA display color termcap:\
+	:cr=^M:do=^J:kb=^H:kd=^J:kl=^H:nw=^M^J:sf=^J:ta=^I:tc=ibmega-c:
+ibmvga|IBM VGA display:\
+	:cr=^M:do=^J:kb=^H:kd=^J:kl=^H:nw=^M^J:sf=^J:ta=^I:tc=ibmega:
 # ibmapa* and ibmmono entries come from ACIS 4.3 distribution
 rtpc|ibmapa16|ibm6155|IBM 6155 Extended Monochrome Graphics Display:\
 	:li#32:\
@@ -6127,8 +6419,9 @@ ibmapa8c-c|ibm6154-c|IBM 6154 Advanced Color Graphics Display:\
 # (hft-c: this entry had :kb=\E[D:kf=\E[C: on the line with ku/kd/kh; this was
 # pretty obviously mislabeled for :le: and :nd:; also ":ul=\E[4m:" was clearly
 # a typo for ":us=\E[4m:"; also ":el=\E[K:" was a typo for ":ce=\E[K:".
+# I also added <rmam>/<smam> based on the terminal reset string.
 # There was an unknown boolean ":ht:" which I assume was meant to set 
-# hardware tabs, so I have insrted it#8. Finally, "ac=^N" paired with the
+# hardware tabs, so I have inserted it#8. Finally, "ac=^N" paired with the
 # ae looked like a typo for ":as=^N:" -- esr)
 ibm8512|ibm8513|hft-c|IBM High Function Terminal:\
 	:am:mi:ms:\
@@ -6140,10 +6433,9 @@ ibm8512|ibm8513|hft-c|IBM High Function Terminal:\
 	:k2=\E[002q:k3=\E[003q:k4=\E[004q:k5=\E[005q:\
 	:k6=\E[006q:k7=\E[007q:k8=\E[008q:k9=\E[009q:kd=\E[B:\
 	:kh=\E[H:ku=\E[A:le=\E[D:mb=\E[5m:md=\E[1m:me=\E[m:\
-	:mr=\E[7m:nd=\E[C:rc=\E[u:\
-	:rs=\Eb\E[m\017\E[?7h\E[H\E[J:sc=\E[s:se=\E[m:\
-	:so=\E[7m:te=\E[20h:ti=\E[20;4l\E[?7h\Eb:ue=\E[m:\
-	:up=\E[A:us=\E[4m:
+	:mr=\E[7m:nd=\E[C:rc=\E[u:sc=\E[s:se=\E[m:so=\E[7m:\
+	:te=\E[20h:ti=\E[20;4l\E[?7h\Eb:ue=\E[m:up=\E[A:\
+	:us=\E[4m:
 hft|AIWS High Function Terminal:\
 	:am:xo:\
 	:co#80:li#25:\
@@ -6151,10 +6443,17 @@ hft|AIWS High Function Terminal:\
 	:cm=\E[%i%d;%dH:cr=^M:dc=\E[P:dl=\E[M:do=^J:ei=\E6:\
 	:ho=\E[H:ic=\E[@:im=\E6:k1=\E[001q:k2=\E[002q:\
 	:k3=\E[003q:k4=\E[004q:k5=\E[005q:k6=\E[006q:\
-	:k7=\E[007q:k8=\E[008q:k9=\E[009q:kb=^H:kd=\E[B:\
-	:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:mb=\E[5m:\
-	:md=\E[1m:me=\E[0m:mk=\E[8m:mr=\E[7m:nd=\E[C:se=\E[m:\
-	:sf=^J:so=\E[7m:ta=^I:ue=\E[m:up=\E[A:us=\E[4m:
+	:k7=\E[007q:k8=\E[008q:k9=\E[009q:kN=\E[153q:\
+	:kP=\E[159q:kb=^H:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:\
+	:ku=\E[A:le=^H:mb=\E[5m:md=\E[1m:me=\E[m:mr=\E[7m:\
+	:nd=\E[C:se=\E[m:sf=^J:so=\E[7m:ta=^I:ue=\E[m:\
+	:up=\E[A:us=\E[4m:
+ibm-system1|system1|ibm system/1 computer:\
+	:am:xt:\
+	:co#80:li#24:\
+	:bl=^G:cl=^Z:cm=\005%+ %+ :ho=^K:le=^H:nd=^\:sf=^J:\
+	:up=^^:
+
 # From: <pryor@math.berkeley.edu>
 ibm5081|ibmmpel|IBM 5081 1024x1024 256/4096 color display:\
 	:es:hs:\
@@ -6164,24 +6463,47 @@ ibm5081-c|ibmmpel-c|IBM 5081 1024x1024 256/4096 enhanced color display:\
 	:es:hs:\
 	:li#33:\
 	:ds=\Ej\EYA \EI\Ek:fs=\Ek:ts=\Ej\EYA%+ \Eo:tc=ibmega-c:
-ibm-system1|system1|ibm system/1 computer:\
-	:am:xt:\
-	:co#80:li#24:\
-	:bl=^G:cl=^Z:cm=\005%+ %+ :ho=^K:le=^H:nd=^\:sf=^J:\
-	:up=^^:
+ibm8514|IBM 8514 color display:\
+	:es:hs:\
+	:li#41:\
+	:cr=^M:do=^J:ds=\Ej\EYI \EI\Ek:fs=\Ek:kb=^H:kd=^J:\
+	:kl=^H:nw=^M^J:sf=^J:ta=^I:ts=\Ej\EYI%+ \Eo:tc=ibmega:
+ibm8514-c|IBM 8514 color display:\
+	:es:hs:\
+	:li#41:\
+	:cr=^M:do=^J:ds=\Ej\EYI \EI\Ek:fs=\Ek:kb=^H:kd=^J:\
+	:kl=^H:nw=^M^J:sf=^J:ta=^I:ts=\Ej\EYI%+ \Eo:tc=ibmega-c:
+
+#
+# AIX entries.  IBM ships these with AIX 3. 
+# AIX extension caps are commented out,
+# except for box1 which has been translated to an <acsc> string.
+#
+aixterm-m|IBM AIXterm Monochrome Terminal Emulator:\
+	:es:hs:\
+	:ds=\E[?E:fs=\E[?F:md=\E[1m:me=\E[0;10m\E(B:\
+	:..sa=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;m:\
+	:sr@:ts=\E[?%p1%dT:tc=ibm6153:
+aixterm-m-old|IBM AIXterm Monochrome Terminal Emulator:\
+	:es:hs:\
+	:ds=\E[?E:fs=\E[?F:md=\E[1m:\
+	:..sa=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;m:\
+	:sr@:ts=\E[?%p1%dT:tc=ibm6153:
+jaixterm-m|IBM Kanji AIXterm Monochrome Terminal Emulator:\
+	:tc=aixterm-m:
 
 #### Infoton/General Terminal Corp.
 #
 
 # gt100 sounds like something DEC would come out with.  Let's hope they don't.
 i100|gt100|gt100a|General Terminal 100A (formerly Infoton 100):\
-	:am:bs:\
+	:am:\
 	:co#80:li#24:\
 	:al=\EL:bl=^G:cd=\EJ:ce=\EK:cl=^L:cm=\Ef%r%+ %+ :\
 	:cr=^M:dl=\EM:do=^J:ho=\EH:le=^H:nd=\EC:se=\Ea:sf=^J:\
 	:so=\Eb:up=\EA:vb=\Eb\Ea:
 i400|infoton 400:\
-	:am:bs:\
+	:am:\
 	:co#80:li#25:\
 	:al=\E[L:bl=^G:ce=\E[N:cl=\E[2J:cm=%i\E[%3;%3H:cr=^M:\
 	:dc=\E[4h\E[2Q\E[P\E[4l\E[0Q:dl=\E[M:do=^J:\
@@ -6193,17 +6515,12 @@ addrinfo:\
 	:co#80:li#24:\
 	:bl=^G:cd=^K:cl=^L:..cm=\037%p1%{1}%-%c%p2%{1}%-%c:\
 	:cr=^M:do=^J:ho=^H:le=^Z:ll=^H^\:nd=^Y:sf=^J:up=^\:
+# (infoton: used to have the no-ops <lh>#0, <lw>#0, <nlab>#0 -- esr)
 infoton:\
 	:am:\
 	:co#80:li#24:\
 	:bl=^G:cd=^K:cl=^L:cr=^M:do=^J:le=^Z:ll=^H^\:nd=^Y:\
 	:sf=^J:up=^\:
-# (infotonKAS: removed obsolete ":bc=^Z:" -- esr)
-infotonKAS:\
-	:am:\
-	:co#80:li#24:\
-	:bl=^G:cd=^K:cl=^L:cr=^M:do=^J:le=^Z:ll=^H^\:nd=^Y:\
-	:sf=^J:up=^\:
 
 #### Interactive Systems Corp
 #
@@ -6213,12 +6530,11 @@ infotonKAS:\
 #
 
 # From: <cithep!eric>  Wed Sep 16 08:06:44 1981
-# (intext: removed obsolete ":ma=^K^P^R^L^L :";
-# mapped ":pt:" to default tabs, removed obsolete ":bc=^_:", also the
+# (intext: removed obsolete ":ma=^K^P^R^L^L ::bc=^_:", also the
 # ":le=^_:" later overridden -- esr)
 intext|Interactive Systems Corporation modified owl 1200:\
 	:am:\
-	:co#80:li#24:sg#1:\
+	:co#80:it#8:li#24:sg#1:\
 	:al=\020:bl=^G:bt=^Y:cd=\026J:ce=^Kp^R:cl=\014:\
 	:cm=\017%+ %+ :cr=^M:dc=\022:dl=\021:do=^J:ei=^V<:\
 	:im=^V;:ip=:k0=^VJ\r:k1=^VA\r:k2=^VB\r:k3=^VC\r:\
@@ -6229,83 +6545,83 @@ intext|Interactive Systems Corporation modified owl 1200:\
 intext2|intextii|INTERACTIVE modified owl 1251:\
 	:am:bw:ul:\
 	:co#80:li#24:sg#0:\
-	:al=\E[L:bl=^G:bt=\E[Z:cd=\E[J:ce=\E[K:ch=\E[%+^AG:\
-	:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cr=^M:dc=\E[P:dl=\E[M:\
-	:do=\E[B:ei=:ic=\E[@:im=:k0=\E@\r:k1=\EP\r:k2=\EQ\r:\
-	:k3=\ES\r:k4=\ET\r:k5=\EU\r:k6=\EV\r:k7=\EW\r:\
-	:k8=\EX\r:k9=\EY\r:kb=^H:kd=\EB\r:kh=\ER\r:kl=\ED\r:\
-	:kr=\EC\r:ku=\EA\r:nd=\E[C:se=\E[2 D:sf=\E[S:\
-	:so=\E[6 D:sr=\E[T:ta=^I:ue=\E[2 D:up=\E[A:\
-	:us=\E[18 D:vb=\E[;;;;;;;;;2;;u\E[;;;;;;;;;1;;u:
+	:al=\E[L:bl=^G:bt=\E[Z:cd=\E[J:ce=\E[K:cl=\E[H\E[2J:\
+	:cm=\E[%i%d;%dH:cr=^M:dc=\E[P:dl=\E[M:do=\E[B:ei=:\
+	:ic=\E[@:im=:k0=\E@\r:k1=\EP\r:k2=\EQ\r:k3=\ES\r:\
+	:k4=\ET\r:k5=\EU\r:k6=\EV\r:k7=\EW\r:k8=\EX\r:\
+	:k9=\EY\r:kb=^H:kd=\EB\r:kh=\ER\r:kl=\ED\r:kr=\EC\r:\
+	:ku=\EA\r:nd=\E[C:se=\E[2 D:sf=\E[S:so=\E[6 D:\
+	:sr=\E[T:ta=^I:ue=\E[2 D:up=\E[A:us=\E[18 D:\
+	:vb=\E[;;;;;;;;;2;;u\E[;;;;;;;;;1;;u:
 
 #### Kimtron (abm, kt)
 #
-# Kimtron entries include (undocumented) codes for: enter dim mode (:mh:),
-# enter bold mode (:md:), enter reverse mode (:mr:), turn off all attributes
-# (:me:).
+# Kimtron entries include (undocumented) codes for: enter dim mode,
+# enter bold mode, enter reverse mode, turn off all attributes.
+#
 
 # Kimtron ABM 85 added by Dual Systems
-# (abm85: mapped ":pt:" to default tabs; removed duplicated ":kd=^J:" -- esr)
+# (abm85: removed duplicated ":kd=^J:" -- esr)
 abm85|Kimtron ABM 85:\
-	:am:bs:bw:ms:pt:\
-	:co#80:li#24:sg#1:ug#1:\
+	:am:bw:ms:\
+	:co#80:it#8:li#24:sg#1:ug#1:\
 	:al=\EE:bt=\EI:cd=\Ey:ce=\Et:cl=\E*:cm=\E=%+ %+ :\
 	:dc=\EW:dl=\ER:do=^J:ei=\Er:\
 	:if=/usr/share/tabset/stdcrt:im=\EQ:\
 	:is=\EC\EX\Eg\En\E%\Er\E(\Ek\Em\Eq:kb=^H:kd=^J:kh=^^:\
-	:kl=^H:kr=^L:ku=^K:nd=^L:se=\Ek:so=\Ej:ue=\Em:up=^K:\
-	:us=\El:
+	:kl=^H:kr=^L:ku=^K:le=^H:nd=^L:se=\Ek:so=\Ej:ta=^I:\
+	:ue=\Em:up=^K:us=\El:
 # Kimtron ABM 85H added by Dual Systems.
 # Some notes about the 85h entries:
-# 1) there are several firmware revs of 85H in the world. Use o85h for
+# 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., :is: can't fix change it)
+#    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 :vs: turns on
+#    Vi won't swallow `del char' for instance, but <smcup> turns on
 #    dup-edit anyway so that the arrow keys will work right. If the
-#    arrow keys don't work the way you like, change :vs:, :ve:, and :is:.
-#    920E mode does not have software commands to toggle between dup
-#    and local edit, so you get whatever was set last on the terminal.
-# 4) :vb: attribute is nice, but seems too slow to work correctly (\Eb<pad>\Ed)
+#    arrow keys don't work the way you like, change <smcup>, <rmcup>, and
+#    <is2>.  Note that 920E mode does not have software commands to toggle
+#    between dup and local edit, so you get whatever was set last on the
+#    terminal.
+# 4) <flash> attribute is nice, but seems too slow to work correctly
+#    (\Eb<pad>\Ed)
 # 5) Make sure `hidden' attributes are selected. If `embedded' attributes
-#    are selected, the entries :sg@: and :ug@: should be removed.
+#    are selected, the <xmc@> entry should be removed.
 # 6) auto new-line should be on (selectable from setup mode only)
 #
 # From: Erik Fair <fair@ucbarpa>  Sun Oct 27 07:21:05 1985
-abm85h|85H|85h|Kimtron ABM 85H, 85H mode:\
+abm85h|Kimtron ABM 85H native mode:\
 	:hs:\
 	:sg@:ug@:\
-	:ds=\Ee:fs=^M:im=\EZ:\
+	:bl=^G:ds=\Ee:fs=^M:im=\EZ:\
 	:is=\EC\EN\EX\024\016\EA\Ea\E%\E9\Ee\Er\En\E"\E}\E'\E(\Ef\r\EG0\Ed\E.4\El:\
 	:kd=^V:me=\E(\EG0:mh=\E):mr=\EG4:se=\EG0:so=\EG4:\
 	:ts=\Eg\Ef:ue=\EG0:us=\EG8:vb@:ve=\E.4:vs=\E.2:tc=abm85:
-abm85e|85E|85e|Kimtron ABM 85H, 920E mode:\
-	:sg@:ug@:\
-	:im=\EZ:\
+abm85e|Kimtron ABM 85H in 920E mode:\
+	:sg@:\
+	:bl=^G:im=\EZ:\
 	:is=\EC\EX\EA\E%\E9\Ee\Er\En\E"\E}\E'\E(\Ef\r\Ek\Eq\Em:\
 	:me=\E(\Ek:mh=\E):mr=\Ej:vb@:tc=abm85:
-abm85h-o|oabm85h|o85h|Kimtron ABM 85H, old firmware rev.:\
-	:sg@:ug@:\
-	:im=\EZ:\
+abm85h-old|oabm85h|o85h|Kimtron ABM 85H with old firmware rev.:\
+	:sg@:\
+	:bl=^G:im=\EZ:\
 	:is=\E}\EC\EX\Ee\En\E%\Er\E(\Ek\Em\Eq\Ed\ET\EC\E9\EF:\
-	:me=\E(\Ek:mh=\E):mr=\Ej:\
-	:vb=\200\200\200\007\200\200\200:tc=abm85:
+	:me=\E(\Ek:mh=\E):mr=\Ej:tc=abm85:
 # From: <malman@bbn-vax.arpa>
-# (kt7: removed obsolete ":ko=ic,dc,al,dl,cl,ce,cd,bt:", ":ma=^V^J^L :";
-# mapped ":pt:" to default tabs -- esr)
+# (kt7: removed obsolete :ma=^V^J^L :" -- esr)
 kt7|kimtron model kt-7:\
-	:am:bs:pt:\
-	:co#80:li#24:\
+	:am:\
+	:co#80:it#8:li#24:\
 	:al=\EE:bt=\EI:cd=\EY:ce=\ET:cl=^Z:cm=\E=%+ %+ :\
 	:dc=\EW:dl=\ER:do=^V:ei=:fs=\Eg:ho=^^:ic=\EQ:\
 	:if=/usr/share/tabset/stdcrt:im=:is=\El\E":k0=^AI\r:\
 	:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:\
-	:k6=^AE\r:k7=^AF\r:k8=^AG\r:k9=^AH\r:kb=^H:kd=^V:\
-	:kh=^^:kl=^H:kr=^L:ku=^K:nd=^L:se=\EG0:so=\EG4:\
-	:ts=\Ef:ue=\EG0:up=^K:us=\EG8:
+	:k6=^AE\r:k7=^AF\r:k8=^AG\r:k9=^AH\r:kD=\EW:kI=\EQ:\
+	:kb=^H:kd=^V:kh=^^:kl=^H:kr=^L:ku=^K:le=^H:nd=^L:\
+	:se=\EG0:so=\EG4:ta=^I:ts=\Ef:ue=\EG0:up=^K:us=\EG8:
 
 #### Microterm (act, mime)
 #
@@ -6313,13 +6629,13 @@ kt7|kimtron model kt-7:\
 # The default mime is assumed to be in enhanced act iv mode.
 #
 
-# New "safe" cursor movement (5/87) from reuss@umd5.umd.edu.  Prevents freakout with
-# out-of-range args on Sytek multiplexors.  No ":so=^N:" and ":se=^N:" since 
-# it gets confused and it's too dim anyway.  No ic since Sytek insists ^S 
-# means xoff.
+# New "safe" cursor movement (5/87) from <reuss@umd5.umd.edu>.  Prevents
+# freakout with out-of-range args on Sytek multiplexors.  No <smso>=^N and
+# <rmso>=^N since  it gets confused and it's too dim anyway.  No <ich1>
+# since Sytek insists ^S means xoff.
 # (act4: found ":ic=2^S:ei=:im=:ip=.1*^V:" commented out in 8.3 -- esr)
 act4|microterm|microterm act iv:\
-	:am:bs:\
+	:am:\
 	:co#80:li#24:\
 	:al=2.3*\001<2.3*/>:bl=^G:cd=2.2*\037:ce=.1*\036:\
 	:cl=12\014:cm=\024%+^X%>/0%+P:cr=^M:dc=.1*\004:\
@@ -6330,10 +6646,6 @@ act4|microterm|microterm act iv:\
 # (microterm5: removed obsolete ":ma==^Z^P^Xl^Kj:" -- esr)
 act5|microterm5|microterm act v:\
 	:kd=^K:kl=^H:kr=^X:ku=^Z:sr=\EH:uc=^H\EA:tc=act4:
-# Act V in split screen mode.  act5s is not tested and said not to work.
-act5s|skinny act5:\
-	:co#39:li#48:\
-	:te=\EQ:ti=\EP:tc=act5:
 # Mimes using brightness for standout.  Half bright is really dim unless
 # you turn up the brightness so far that lines show up on the screen.
 mime-fb|full bright mime1:\
@@ -6341,10 +6653,10 @@ mime-fb|full bright mime1:\
 mime-hb|half bright mime1:\
 	:is=^Y\E:se=^Y:so=^S:tc=mime:
 # (mime: removed obsolete ":ma=^X ^K^J^Z^P:"; removed ":do=^K:" that overrode
-# the more plausible ":do=^J:"; mapped ":pt:" to ":it#8:" -- esr)
+# the more plausible ":do=^J:" -- esr)
 # uc was at one time disabled to get around a curses bug, be wary of it
 mime|mime1|mime2|mimei|mimeii|microterm mime1:\
-	:am:bs:pt:\
+	:am:\
 	:co#80:it#8:li#24:vt#9:\
 	:al=\001:bl=^G:cd=^_:ce=^^:cl=^]^C:\
 	:cm=\024%+^X%> 0%+P:cr=^M:dl=\027:do=^J:ho=^]:\
@@ -6353,16 +6665,14 @@ mime|mime1|mime2|mimei|mimeii|microterm mime1:\
 # These termcaps (for mime 2a) put the terminal in low intensity mode
 # since high intensity mode is so obnoxious.
 mime2a-s|microterm mime2a (emulating an enhanced soroc iq120):\
-	:am:bs:\
+	:am:\
 	:co#80:li#24:\
 	:al=\001:bl=^G:cd=\EJ:ce=\EK:cl=\EL:cm=\E=%+ %+ :\
 	:cr=^M:dc=\ED:dl=\027:do=^J:ei=^Z:ho=^^:im=\EE:ip=:\
 	:is=\E):kd=^J:kl=^H:kr=^L:ku=^K:le=^H:nd=^L:se=\E;:\
 	:sf=^J:so=\E\072:sr=\EI:ue=\E7:up=\EI:us=\E6:
 # This is the preferred mode (but ^X can't be used as a kill character)
-# (mime2a: replaced ":pt:" with SCO's "it#8" -- esr)
 mime2a|mime2a-v|microterm mime2a (emulating an enhanced vt52):\
-	:bs:pt:\
 	:co#80:it#8:li#24:\
 	:al=\001:bl=^G:cd=\EQ:ce=\EP:cl=\EL:cm=\EY%+ %+ :\
 	:cr=^M:dc=^N:dl=\027:do=^J:ei=^Z:ho=\EH:im=^O:ip=:\
@@ -6373,9 +6683,7 @@ mime2a|mime2a-v|microterm mime2a (emulating an enhanced vt52):\
 mime3a|mime1 emulating 3a:\
 	:am@:\
 	:kd=^K:kl=^H:kr=^X:ku=^Z:tc=adm3a:
-# (mime3ax: mapped ":pt:" to default tabs -- esr)
 mime3ax|mime-3ax|mime1 emulating enhanced 3a:\
-	:pt:\
 	:it#8:\
 	:al=\001:cd=^_:ce=^X:dl=\027:ta=\011:tc=mime3a:
 # Wed Mar  9 18:53:21 1983
@@ -6392,6 +6700,33 @@ mime314|mm314|mime 314:\
 	:al=^A:cd=^_:ce=^^:cl=^L:cm=\024%.%.:dc=^D:dl=^W:\
 	:ei=^V:ho=^]:im=^S:kd=^K:kl=^H:kr=^X:ku=^Z:le=^H:\
 	:nd=^X:ta=^I:up=^Z:
+# Microterm mime 340 from University of Wisconsin
+mm340|mime340|mime 340:\
+	:co#80:li#24:\
+	:al=46\EU:cd=2*\037:ce=2.1\EL:cl=12\032:cm=\E=%+ %+ :\
+	:cr=^M:dc=2.1*\E#:dl=49.6\EV:do=^J:is=\E\054:kb=^H:\
+	:kd=^J:kl=^H:ku=^K:le=^H:nd=^L:nw=^M^J:sf=^J:ta=^I:\
+	:up=^K:
+# This came from University of Wisconsin marked "astro termcap for jooss".
+# (mt4520-rv: removed obsolete ":kn#4:" and incorrect ":ri=\E[C:";
+# also added <rmam>/<smam> based  on the init string -- esr)
+mt4520-rv|micro-term 4520 reverse video:\
+	:am:hs:ms:xn:xo:\
+	:co#80:it#8:li#24:ws#80:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
+	:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:al=\E[L:bl=^G:cd=\E[J:\
+	:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:\
+	:cs=\E[%i%d;%dr:ct=\E[g:dc=\E[P:dl=\E[M:do=\E[B:ei=:\
+	:fs=\E[?5l\E[?5h:ho=\E[H:ic=\E[@:im=:\
+	:is=\E(B\E[2l\E>\E[20l\E[?3l\E[?5h\E[?7h\E[1;24r\E[24;1H\E[H\E[J:\
+	:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:kb=^H:kd=\E[B:\
+	:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:le=\E[D:ll=\E[24;1H:\
+	:nd=\E[C:nw=\EE:rc=\E8:sc=\E7:se=\E[0m:sf=\ED:\
+	:so=\E[7m:sr=\EM:st=\EH:ta=^I:ts=\E[25;1H:ue=\E[24m:\
+	:up=\E[A:us=\E[4m:vb=\E[?5l\E[?5h:ve=\E[0V\E8:\
+	:vs=\E7\E[0U:
+
+
 # Fri Aug  5 08:11:57 1983
 # This entry works for the ergo 4000 with the following setups:
 # ansi,wraparound,newline disabled, xon/xoff disabled in both
@@ -6400,6 +6735,7 @@ mime314|mm314|mime 314:\
 # WARNING!!! There are multiple versions of ERGO 4000 microcode
 # Be advised that very early versions DO NOT WORK RIGHT !!  
 # Microterm does have a ROM exchange program- use it or lose big
+# (ergo400: added <rmam>/<smam> based on the init string -- esr)
 ergo4000|microterm ergo 4000:\
 	:da:db:ms:\
 	:co#80:li#66:\
@@ -6408,8 +6744,8 @@ ergo4000|microterm ergo 4000:\
 	:ei=\E[4l:im=\E[4h:\
 	:is=\E<\E=\E[?1l\E[?4l\E[?5l\E[?7h\E[?8h:k1=\EOP:\
 	:k2=\EOQ:k3=\EOR:k4=\EOS:kd=\E[B:ke=\E=:kl=\E[D:\
-	:kr=\E[C:ks=\E=:ku=\E[A:le=^H:nd=\E[C:se=\E[0m:\
-	:sf=\ED:so=\E[7m:sr=\EM:ta=^I:up=\E[A:
+	:kr=\E[C:ks=\E=:ku=\E[A:le=^H:nd=\E[C:se=\E[m:sf=\ED:\
+	:so=\E[7m:sr=\EM:ta=^I:up=\E[A:
 
 #### NCR 
 #
@@ -6417,6 +6753,43 @@ ergo4000|microterm ergo 4000:\
 # For what happened to that group, see the ADDS section.
 #
 
+# NCR7900 DIP switches:
+#
+# Switch A:
+# 1-4 - Baud Rate
+# 5   - Parity (Odd/Even)
+# 6   - Don't Send or Do Send Spaces
+# 7   - Parity Enable
+# 8   - Stop Bits (One/Two)
+# 
+# Switch B:
+# 1   - Upper/Lower Shift
+# 2   - Typewriter Shift
+# 3   - Half Duplex / Full Duplex
+# 4   - Light/Dark Background
+# 5-6 - Carriage Return Without / With Line Feed
+# 7   - Extended Mode
+# 8   - Suppress Keyboard Display
+# 
+# Switch C:
+# 1   - End of line entry disabled/enabled
+# 2   - Conversational mode / (Local?) Mode
+# 3   - Control characters displayed / not displayed
+# 4   - (2-wire?) / 4-wire communications
+# 5   - RTS on and off for each character
+# 6   - (50Hz?) / 60 Hz
+# 7   - Exit after level zero diagnostics
+# 8   - RS-232 interface
+# 
+# Switch D:
+# 1   - Reverse Channel (yes / no)
+# 2   - Manual answer (no / yes)
+# 3-4 - Cursor appearance
+# 5   - Communication Rate
+# 6   - Enable / Disable EXT turnoff
+# 7   - Enable / Disable CR turnoff
+# 8   - Enable / Disable backspace
+#
 # From <root@goliath.un.atlantaga.NCR.COM>, init string hacked by SCO.
 ncr7900i|7900i|ncr7900|7900|ncr 7900 model 1:\
 	:am:bw:ul:\
@@ -6424,11 +6797,8 @@ ncr7900i|7900i|ncr7900|7900|ncr 7900 model 1:\
 	:bl=^G:cd=\Ek:ce=\EK:cl=^L:cm=\E1%r%.%.:cr=^M:do=^J:\
 	:is=\E0@\010\E3\E4\E7:kd=^J:kh=^A:kl=^U:kr=^F:ku=^Z:\
 	:le=^H:ll=^A:mb=\E0B:me=\E0@:mh=\E0A:mr=\E0P:nd=^F:\
-	:pf=^T:po=^R:\
 	:..sa=\E0%p5%'@'%+%p4%{2}%*%+%p3%{16}%*%+%p2%{32}%*%+%p1%{17}%*%+%c:\
 	:se=\E0@:sf=^J:so=\E0Q:ue=\E0@:up=^Z:us=\E0`:
-ncr7900i-na|ncr7900-na|7900-na|ncr 7900 model 1 with no arrows:\
-	:kd@:kl@:kr@:ku@:tc=ncr7900i:
 ncr7900iv|ncr 7900 model 4:\
 	:am:bw:es:hs:\
 	:co#80:li#24:\
@@ -6441,10 +6811,9 @@ ncr7900iv|ncr 7900 model 4:\
 ncr7901|7901|ncr 7901 model:\
 	:am:bw:ul:\
 	:co#80:li#24:\
-	:bl=^G:cd=\Ek:ce=\EK:ch=\020%+^J:cl=^L:cm=\EY%+ %+ :\
-	:cr=^M:cv=\013%+@:do=^J:is=\E4^O:kd=^J:kh=^H:kl=^U:\
-	:kr=^F:ku=^Z:le=^H:ll=^A:mb=\E0B:me=^O:mh=\E0A:\
-	:mr=\E0P:nd=^F:pf=^T:po=^R:\
+	:bl=^G:cd=\Ek:ce=\EK:cl=^L:cm=\EY%+ %+ :cr=^M:do=^J:\
+	:is=\E4^O:kd=^J:kh=^H:kl=^U:kr=^F:ku=^Z:le=^H:ll=^A:\
+	:mb=\E0B:me=^O:mh=\E0A:mr=\E0P:nd=^F:\
 	:..sa=\E0%p5%'@'%+%p4%{2}%*%+%p3%{16}%*%+%p2%{32}%*%+%p1%{17}%*%+%c\016:\
 	:se=^O:sf=^J:so=\E0Q\016:ue=^O:up=^Z:us=\E0`\016:\
 	:ve=^X:vi=^W:
@@ -6480,6 +6849,9 @@ pe1251|pe6300|pe6312|perkin elmer 1251:\
 	:ct=\E3:do=\EB:ho=\EH:k0=\ERA:k1=\ERB:k2=\ERC:\
 	:k3=\ERD:k4=\ERE:k5=\ERF:k6=\ERG:k7=\ERH:k8=\ERI:\
 	:k9=\ERJ:le=\ED:nd=\EC:sf=^J:st=\E1:up=\EA:
+# (pe7000m: this had
+# 	rmul=\E!\0, smul=\E!\040, 
+# which is probably wrong, it collides with kf0
 pe7000m|perkin elmer 7000 series monochrome monitor:\
 	:am:\
 	:co#80:li#24:\
@@ -6488,19 +6860,10 @@ pe7000m|perkin elmer 7000 series monochrome monitor:\
 	:k0=\E!\200:k1=\E!^A:k2=\E!^B:k3=\E!^C:k4=\E!^D:\
 	:k5=\E!^E:k6=\E!^F:k7=\E!^G:k8=\E!^H:k9=\E!^I:kb=^H:\
 	:kd=\E!U:kh=\E!S:kl=\E!V:kr=\E!W:ku=\E!T:le=\ED:\
-	:ll=\ES7 :nd=\EC:se=\E!\200:sf=^J:so=\E!^H:sr=\ER:\
-	:ue=\E!\200:up=\EA:us=\E! :
+	:ll=\ES7 :nd=\EC:sf=^J:sr=\ER:up=\EA:
 pe7000c|perkin elmer 7000 series colour monitor:\
-	:am:\
-	:co#80:li#24:\
-	:bl=^G:bt=\E!Y:cd=\EJ:ce=\EI:cl=\EK:cm=\ES%+ %+ :\
-	:cr=^M:do=\EB:ho=\EH:\
-	:i1=\E!\200\EW  7o\Egf\Eb0\Ec7\ES7 :k0=\E!\200:\
-	:k1=\E!^A:k2=\E!^B:k3=\E!^C:k4=\E!^D:k5=\E!^E:\
-	:k6=\E!^F:k7=\E!^G:k8=\E!^H:k9=\E!^I:kb=^H:kd=\E!U:\
-	:kh=\E!S:kl=\E!V:kr=\E!W:ku=\E!T:le=\ED:ll=\ES7 :\
-	:nd=\EC:se=\Eb0:sf=^J:so=\Eb2:sr=\ER:ue=\E!\200:\
-	:up=\EA:us=\E! :
+	:i1=\E!\200\EW  7o\Egf\Eb0\Ec7\ES7 :se=\Eb0:so=\Eb2:\
+	:ue=\E!\200:us=\E! :tc=pe7000m:
 
 #### Sperry Univac
 #
@@ -6510,6 +6873,7 @@ pe7000c|perkin elmer 7000 series colour monitor:\
 # This entry is for the Sperry UTS30 terminal running the TTY 
 # utility under control of CP/M Plus 1R1. The functionality 
 # provided is comparable to the DEC vt100.
+# (uts30: I added <rmam>/<smam> based on the init string -- esr)
 uts30|sperry uts30 with cp/m@1R1:\
 	:am:bw:hs:\
 	:co#80:li#24:ws#40:\
@@ -6540,7 +6904,7 @@ tandem6510|adm3a repackaged by Tandem:\
 # this doubtless(?) exploits.  There is a 6520 that is slightly dumber.
 # (tandem653: had ":sb=\ES:", probably someone's mistake for sf -- esr)
 tandem653|t653x|Tandem 653x multipage terminal:\
-	:am:bs:da:db:hs:\
+	:am:da:db:hs:\
 	:co#80:li#24:sg#1:ug#1:ws#64:\
 	:cd=\EJ:ce=\EK:cl=\EI:cm=\023%+ %+ :do=^J:ds=\Eo\r:\
 	:fs=^M:ho=\EH:if=/usr/share/tabset/tandem653:le=^H:\
@@ -6565,34 +6929,28 @@ dt100|dt-100|Tandy DT-100 terminal:\
 	:xo:\
 	:co#80:li#24:sg#1:ug#1:\
 	:ae=^O:al=\E[L:as=^N:bl=^G:cd=\E[J:ce=\E[K:\
-	:cl=\E[;H\E[2J:cm=\010\E[%i%d;%dH:cr=^M:cs=\E[%2;%2r:\
+	:cl=\E[H\E[2J:cm=\010\E[%i%d;%dH:cr=^M:cs=\E[%2;%2r:\
 	:dc=\E[P:dl=\E[M:do=\E[B:ei=:ho=\E[H:ic=\E[@:im=:\
 	:is=\E[?3l\E)0\E(B:k1=\E[?3i:k2=\E[2i:k3=\E[@:\
 	:k4=\E[M:k5=\E[17~:k6=\E[18~:k7=\E[19~:k8=\E[20~:\
-	:k9=\E[21~:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:\
-	:le=^H:nd=\E[C:se=\E[m:sf=^J:so=\E[7m:sr=\EM:ta=^I:\
-	:ue=\E[m:up=\E[A:us=\E[4m:ve=\E[?25h:vi=\E[?25l:
+	:k9=\E[21~:kN=\E[29~:kP=\E[28~:kd=\E[B:kh=\E[H:\
+	:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:nd=\E[C:se=\E[m:sf=^J:\
+	:so=\E[7m:sr=\EM:ta=^I:ue=\E[m:up=\E[A:us=\E[4m:\
+	:ve=\E[?25h:vi=\E[?25l:
 dt100w|dt-100w|Tandy DT-100 terminal (wide mode):\
-	:co#132:\
-	:bl=^G:cr=^M:do=^J:is=\E[?3l\E)0\E(B:sf=^J:tc=dt100:
+	:co#132:\tc=dt100:
 dt110|Tandy DT-110 emulating ansi:\
 	:xo:\
 	:co#80:li#24:\
 	:ae=^O:al=\E[0L:as=^N:bl=^G:cd=\E[0J:ce=\E[0K:\
-	:cl=\E[;H\E[2J:cm=\010\E[%i%d;%dH:cr=^M:\
+	:cl=\E[H\E[2J:cm=\010\E[%i%d;%dH:cr=^M:\
 	:cs=\E[%i%d;%dr:dc=\E[0P:dl=\E[0M:do=\E[0B:ei=:\
 	:ho=\E[H:ic=\E[0@:im=:is=\E[?3l\E)0\E(B:k1=\E[1~:\
 	:k2=\E[2~:k3=\E[3~:k4=\E[4~:k5=\E[5~:k6=\E[6~:\
-	:k7=\E[7~:k8=\E[8~:k9=\E[9~:kd=\E[B:kh=\E[G:kl=\E[D:\
-	:kr=\E[C:ku=\E[A:le=^H:nd=\E[C:se=\E[0m:sf=^J:\
-	:so=\E[7m:sr=\EM:ta=^I:ue=\E[0m:up=\E[0A:us=\E[4m:\
-	:ve=\E[?25h:vi=\E[?25l:
-dt200|td200|Tandy 200:\
-	:am:xt:\
-	:co#40:li#16:\
-	:al=\EL:bl=^G:cd=^L:ce=\EK:cl=\EE:cm=\EY%+ %+ :cr=^M:\
-	:dl=\EM:do=^_:kd=^_:kl=^]:kr=^\:ku=^^:le=^H:nd=^\:\
-	:se=\Eq:sf=^J:so=\Ep:up=\EA:
+	:k7=\E[7~:k8=\E[8~:k9=\E[9~:kI=\E[@:kN=\E[26~:\
+	:kP=\E[25~:kd=\E[B:kh=\E[G:kl=\E[D:kr=\E[C:ku=\E[A:\
+	:le=^H:nd=\E[C:se=\E[m:sf=^J:so=\E[7m:sr=\EM:ta=^I:\
+	:ue=\E[m:up=\E[0A:us=\E[4m:ve=\E[?25h:vi=\E[?25l:
 pt210|TRS-80 PT-210 printing terminal:\
 	:hc:os:\
 	:co#80:\
@@ -6636,10 +6994,10 @@ tek4023|4023|tex|tektronix 4023:\
 # because it only works in the workspace, not the monitor.  
 # Same for home. Likewise, standout only works in the workspace.
 # 
-# el was commented out since vi and rogue seem to work better 
+# <el> was commented out since vi and rogue seem to work better 
 # simulating it with lots of spaces!
 # 
-# il1 and il had 145ms of padding, but that slowed down vi's ^U 
+# <il1> and <il> had 145ms of padding, but that slowed down vi's ^U 
 # and didn't seem necessary.
 #
 tek4024|tek4025|tek4027|tektronix 4024/4025/4027:\
@@ -6655,8 +7013,7 @@ tek4024|tek4025|tek4027|tektronix 4024/4025/4027:\
 	:ks=\037lea p4 /h/\r\037lea p8 /k/\r\037lea p6 / /\r\037lea p2 /j/\r\037lea f5 /H/\r:\
 	:le=^H:nd=\037rig\r:sf=^F^J:ta=^I:up=^K:
 tek4025-17|4025-17|4027-17|tek 4025 17 line window:\
-	:li#17:\
-	:tc=tek4025:
+	:li#17:\tc=tek4025:
 tek4025-17-ws|4025-17-ws|4025-17ws|4027-17ws|4027-17-ws|tek 4025 17 line window in workspace:\
 	:is=!com 31\r\n\037sto 9 17 25 33 41 49 57 65 73\r\037wor 17\r\037mon 17\r:\
 	:se=\037att s\r:so=\037att e\r:te=\037mon h\r:\
@@ -6682,17 +7039,17 @@ tek4025-ex|tek4027-ex|tek 4025/4027 w/!:\
 # There also seems to be a problem with vertical motion, perhaps involving
 # delete/insert-line, following a typed carriage return.  This terminal sucks.
 # Delays not specified; use "stty ixon -ixany" to enable DC3/DC1 flow control!
-# (tek4025a: mapped ":pt:" to default tabs; removed obsolete ":xx:".
-# This may mean the tek4025a entry won't work any more. -- esr)
+# (tek4025a: removed obsolete ":xx:". This may mean the tek4025a entry won't
+# work any more. -- esr)
 tek4025a|4025a|Tektronix 4025A:\
-	:am:bs:bw:da:db:pt:xo:\
-	:co#80:li#34:\
+	:am:bw:da:db:xo:\
+	:co#80:it#8:li#34:\
 	:CC=^]:DC=\035dch %d;:DL=\035dli %d;:DO=\035dow %d;:\
 	:LE=\035lef %d;:RI=\035rig %d;:SF=\035dow %d;:\
 	:UP=\035up %d;:al=\013\035ili;:bl=^G:bt=\035bac;:\
-	:ce=\035dch 80;:ch=\r\035rig %d;:\
-	:cl=\035era;\n\035rup;:cr=^M:ct=\035sto;:dc=\035dch;:\
-	:dl=\035dli;:do=^J:le=^H:nd=\035rig;:\
+	:ce=\035dch 80;:cl=\035era;\n\035rup;:cr=^M:\
+	:ct=\035sto;:dc=\035dch;:dl=\035dli;:do=^J:le=^H:\
+	:nd=\035rig;:\
 	:rs=!com 29\035del 0\035rss t\035buf\035buf n\035cle\035dis\035dup\035ech r\035eol\035era g\035for n\035pad 203\035pad 209\035sno n\035sto 9 17 25 33 41 49 57 65 73\035wor 0;:\
 	:sf=^J:ta=^I:up=^K:
 # From: cbosg!teklabs!davem Wed Sep 16 21:11:41 1981
@@ -6701,13 +7058,12 @@ 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: mapped ":pt:" to default tabs -- esr)
 tek4025-cr|4025-cr|tek 4025 for curses and rogue:\
-	:am:bs:pt:\
-	:co#80:li#33:\
+	:am:\
+	:co#80:it#8:li#33:\
 	:cl=\037era;:cm=\037jum%i%d\054%d;:do=^F^J:\
 	:is=!com 31\r\n\037sto 9 17 25 33 41 49 57 65 73\r:\
-	:le=^H:nd=\037rig;:nl=^F^J:te=\037wor 0:\
+	:le=^H:nd=\037rig;:sf=^F^J:ta=^I:te=\037wor 0:\
 	:ti=\037wor 33h:up=^K:
 # 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:\
@@ -6718,16 +7074,17 @@ tek4025ex|4025ex|4027ex|tek 4025 w/!:\
 tek4105|4105|tektronix 4105:\
 	:am:mi:ms:ul:xn:xt:\
 	:co#79:it#8:li#29:\
-	:ae=\E[0m:al=\E[1L:as=\E[1m:bl=^G:bt=\E[Z:cd=\E[J:\
+	:ae=\E[m:al=\E[1L:as=\E[1m:bl=^G:bt=\E[Z:cd=\E[J:\
 	:ce=\E[K:cl=\E[2J\E[H:cm=\E[%i%2;%2H:cr=^M:ct=\E[1g:\
 	:dc=\E[1P:dl=\E[1M:do=\E[1B:ei=\E[4l:ho=\E[H:\
-	:i1=\E%!1\E[0m:im=\E[4h:is=\E%!1\E[?6141\E[0m:kb=^H:\
+	:i1=\E%!1\E[m:im=\E[4h:is=\E%!1\E[?6141\E[m:kb=^H:\
 	:kd=\E[1B:kl=\E[1D:kr=\E[1C:ku=\E[1A:mb=\E[=3;<7m:\
-	:md=\E[=7;<4m:me=\E[=0;<1m:mh=\E[=1;<6m:mk=\E[=6;<5:\
-	:mr=\E[=1;<3m:nd=\E[1C:se=\E[=0;<1m:sf=\E[S:\
-	:so=\E[=2;<3m:sr=\E[T:ta=^I:ti=\E%!1\E[?6l\E[2J:\
-	:ue=\E[=0;<1m:up=\E[1A:us=\E[=5;<2m:
+	:md=\E[=7;<4m:me=\E[=0;<1m:mh=\E[=1;<6m:mr=\E[=1;<3m:\
+	:nd=\E[1C:se=\E[=0;<1m:sf=\E[S:so=\E[=2;<3m:sr=\E[T:\
+	:ta=^I:ti=\E%!1\E[?6l\E[2J:ue=\E[=0;<1m:up=\E[1A:\
+	:us=\E[=5;<2m:
 
+# (tek4105-30: I added <rmam>/<smam> based on the init string -- esr)
 tek4105-30|4105-30|4015 emulating 30 line vt100:\
 	:am:mi:ms:xn:xo:\
 	:co#80:it#8:li#30:vt#3:\
@@ -6760,8 +7117,8 @@ tek4107|tek4109|4107|4109|tektronix terminals 4107 4109:\
 tek4207-s|Tektronix 4207 with sysline but no memory:\
 	:es:hs:\
 	:ds=\E7\E[?6l\E[2K\E[?6h\E8:fs=\E[?6h\E8:\
-	:i2=\E7\E[?6l\E[2K\E[?6h\E8:\
-	:is=\E%!1\E[2;32r\E[132D\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:\
+	:i1=\E%!1\E[2;32r\E[132D\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:\
+	:is=\E7\E[?6l\E[2K\E[?6h\E8:\
 	:ts=\E7\E[?6l\E[2K\E[;%i%df:tc=tek4107:
 
 # The 4110 series may be a wonderful graphics series, but they make the 4025
@@ -6785,129 +7142,123 @@ otek4112|o4112-nd|otek4113|otek4114|old tektronix 4110 series:\
 	:ti=\EKA0\ELV0\EMG0:up=^K:
 # The 4112 with the ANSI compatibility enhancement
 tek4112|tek4114|tektronix 4110 series:\
-	:am:bs:db:\
+	:am:db:\
 	:co#80:li#34:\
 	:al=\E[L:bt=\E[Z:cd=\E[0J:ce=\E[0K:cl=\E[2J\E[0;0H:\
 	:cm=\E[%i%d;%dH:dc=\E[P:dl=\E[M:ei=:ic=\E[@:im=:\
-	:is=\E3!1:nd=\E[C:se=\E[m:sf=\E7\E[0;0H\E[M\E8:\
+	:is=\E3!1:le=^H:nd=\E[C:se=\E[m:sf=\E7\E[0;0H\E[M\E8:\
 	:so=\E[7m:sr=\E7\E[0;0H\E[L\E8:ue=\E[m:up=\EM:\
-	:us=\E[4m:ve=:vs=:
+	:us=\E[4m:
 tek4112-nd|4112-nd|4112 not in dialog area:\
 	:ns:\
 	:up=^K:tc=tek4112:
 tek4112-5|4112-5|4112 in 5 line dialog area:\
-	:li#5:\
-	:tc=tek4112:
-# (tek4113: this used to have ":nd=\LM1 \LM0:", someone's mistake;
-# removed ":as=\E^N:ae=\E^O:", which had been commented out in 8.3.
-# Note, the !0 and !1 sequences in :te:/:ti:/:ve:/:vs: were previously \0410
-# and \0411 sequences...I don't *think* they were supposed to be 4-digit
-# octal -- esr)
-tek4113|tektronix 4113 color graphics, 5 line dialog area:\
-	:am:bs:da:eo:\
+	:li#5:\tc=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.
+# Note, the !0 and !1 sequences in <rmcup>/<smcup>/<cnorm>/<civis> were
+# previously \0410 and \0411 sequences...I don't *think* they were supposed
+# to be 4-digit octal -- esr)
+tek4113|tektronix 4113 color graphics with 5 line dialog area:\
+	:am:da:eo:\
 	:co#80:li#5:\
 	:cl=\ELZ:do=^J:is=\EKA1\ELL5\ELV0\ELV1:le=^H:\
 	:nd=\ELM1 \ELM0:uc=\010\ELM1_\ELM0:\
 	:vb=\ERBA4\ERBA4\ERBA4\ERBA4\ERBA4\ERBA4\ERBA4\ERBA4\ERBA4\ERBA4\ERB0:
-tek4113-34|4113-34|tektronix 4113 color graphics, 34 line dialog area:\
+tek4113-34|4113-34|tektronix 4113 color graphics with 34 line dialog area:\
 	:li#34:\
 	:is=\EKA1\ELLB2\ELV0\ELV1:tc=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: mapped ":pt:" to default tabs -- esr)
-tek4113-nd|4113-nd|tektronix 4113 color graphics, no dialog area:\
-	:am:bs:eo:pt:\
-	:co#80:li#34:\
+tek4113-nd|4113-nd|tektronix 4113 color graphics with no dialog area:\
+	:am:eo:\
+	:co#80:it#8:li#34:\
 	:cl=\E^L:do=^J:ho=\ELF7l\177 @:\
 	:is=\ELZ\EKA0\ELF7l\177 @:le=^H:ll=\ELF hl @:nd=^I:\
-	:se=\EMT1:so=\EMT2:uc=\010\EMG1_\EMG0:up=^K:\
+	:se=\EMT1:so=\EMT2:ta=^I:uc=\010\EMG1_\EMG0:up=^K:\
 	:vb=\ERBA4\ERBA4\ERBA4\ERBA4\ERBA4\ERBA4\ERBA4\ERBA4\ERBA4\ERBA4\ERB0:\
 	:vs=\ELZ\EKA0:
 # This entry is from Tek. Inc.  (Brian Biehl)
-# (tek4115: mapped ":pt:" to default tabs; :bc: renamed to :le: -- esr)
+# (tek4115: :bc: renamed to :le:, <rmam>/<smam> added based on init string -- esr)
 otek4115|Tektronix 4115:\
-	:am:bs:da:db:eo:pt:\
-	:co#80:li#34:\
-	:al=\E[L:bt=\E[Z:cd=\E[J:ce=\E[K:cl=\E[;H\E[2J:\
+	:am:bs:da:db:eo:\
+	:co#80:it#8:li#34:\
+	:al=\E[L:bt=\E[Z:cd=\E[J:ce=\E[K:cl=\E[H\E[2J:\
 	:cm=\E[%i%d;%dH:dc=\E[P:dl=\E[M:do=\E[B:ei=\E[4l:\
-	:ho=\E[;H:if=/usr/share/tabset/vt100:im=\E[4h:\
-	:is=\E%!0\E%\014\ELV0\EKA1\ELBB2\ENU@=\ELLB2\ELM0\ELV1\EKYA?\E%!1\E[<1l\E[?7h\E[?8h\E[34;1H\E[34B\E[0m:\
+	:ho=\E[H:if=/usr/share/tabset/vt100:im=\E[4h:\
+	:is=\E%!0\E%\014\ELV0\EKA1\ELBB2\ENU@=\ELLB2\ELM0\ELV1\EKYA?\E%!1\E[<1l\E[?7h\E[?8h\E[34;1H\E[34B\E[m:\
 	:kb=^H:ke=\E>:ks=\E=:le=\E[D:nd=\E[C:se=\E[m:\
-	:so=\E[7m:sr=\EM:te=\E%!0\ELBG8\E%!1\E[34;1H\E[J:\
-	:ti=\E%!0\ELBB2\E%!1:ue=\E[m:up=\E[A:us=\E[4m:\
+	:so=\E[7m:sr=\EM:ta=^I:\
+	:te=\E%!0\ELBG8\E%!1\E[34;1H\E[J:ti=\E%!0\ELBB2\E%!1:\
+	:ue=\E[m:up=\E[A:us=\E[4m:\
 	:ve=\E%!0\ELBG8\E%!1\E[34;1H:vs=\E%!0\ELBB2\E%!1:
 tek4115|newer tektronix 4115 entry with more ANSI capabilities:\
 	:am:xo:\
 	:co#80:li#34:\
 	:AL=\E[%dL:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:LE=\E[%dD:\
 	:RI=\E[%dC:UP=\E[%dA:al=\E[L:bl=^G:bt=\E[Z:cd=\E[J:\
-	:ce=\E[K:ch=\E[%+^AG:cl=\E[H\E[J:cm=\E[%i%d;%dH:\
-	:cr=^M:ct=\E[2g:cv=\E[%+^Ad:dc=\E[P:dl=\E[M:do=^J:\
-	:ei=:ho=\E[H:ic=\E[@:im=:kb=^H:kd=\E[B:kh=\E[H:\
-	:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:mb=\E[5m:md=\E[1m:\
-	:me=\E[0m:mk=\E[8m:mr=\E[7m:nd=\E[C:\
+	:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:ct=\E[2g:\
+	:dc=\E[P:dl=\E[M:do=^J:ei=:ho=\E[H:ic=\E[@:im=:kb=^H:\
+	:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:\
+	:mb=\E[5m:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:\
 	:..rp=%p1%c\E[%p2%{1}%-%db:\
 	:..sa=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;%;m:\
 	:se=\E[m:sf=^J:so=\E[7m:st=\EH:ta=^I:ue=\E[m:up=\E[A:\
 	:us=\E[4m:
 # The tek4125 emulates a vt100 incorrectly - the scrolling region
-# command is ignored.  The following entry replaces the :cs: with the needed
-# :al:, :dl:, and :im:; removes some cursor pad commands that the tek4125
+# command is ignored.  The following entry replaces <csr> with the needed
+# <il>, <il>, and <smir>; removes some cursor pad commands that the tek4125
 # 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|4125:\
+tek4125|tektronix 4125:\
 	:li#34:\
 	:al=\E[1L:cs@:dl=\E[1M:im=\E1:\
 	:is=\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:\
 	:ks=\E=:rc@:sc@:tc=vt100:
 
 # From: <jcoker@ucbic>
-# (tek4107: mapped ":pt:" to default tabs.  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)
+# (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)
 tek4207|Tektronix 4207 graphics terminal with memory:\
-	:am:bs:bw:mi:pt:ul:xn:\
-	:co#80:li#32:\
+	:am:bw:mi:ul:xn:\
+	:co#80:it#8:li#32:\
 	:al=3\E[L:bt=\E[Z:cd=\E[J:ce=5\E[K:cl=156\E[H\E[J:\
 	:cm=\E[%i%d;%dH:dc=4\E[P:dl=3\E[M:do=^J:ei=:ho=\E[H:\
 	:ic=4\E[@:im=:\
 	:is=\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:\
 	:kd=\ED:kh=\E[H:kl=\E[D:kr=\E[C:ku=\EM:le=^H:\
 	:mb=\E[5m:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:se=\E[m:\
-	:so=\E[7m:te=\E[?6h\E%!0\ELBP0\E%!1\E[32;1f:\
+	:so=\E[7m:ta=^I:te=\E[?6h\E%!0\ELBP0\E%!1\E[32;1f:\
 	:ti=\E[?6l\E[H\E[J:ue=\E[m:up=\EM:us=\E[4m:
 
 # From: <carolyn@dali.berkeley.edu>  Thu Oct 31 12:54:27 1985
-# (tek4404: There was a "\!" in :ti: that I replaced with "\E!";
-# also mapped ":pt:" to default tabs -- esr)
-tek4404|4404:\
-	:bs:pt:\
-	:co#80:li#32:\
-	:al=\E[1L:cd=\E[J:ce=\E[K:cl=\E[;H\E[2J:\
+# (tek4404: There was a "\!" in <smcup> that I replaced with "\E!".
+# Tab had been given as \E2I,that must be the tab-set capability -- esr)
+tek4404|tektronix 4404:\
+	:co#80:it#8:li#32:\
+	:al=\E[1L:cd=\E[J:ce=\E[K:cl=\E[H\E[2J:\
 	:cm=\E[%i%d;%dH:cs=\E[%i%d;%dr:dc=\E[P:dl=\E[1M:\
 	:do=^J:ei=\E[4l:ho=\E[H:im=\E[4h:kd=\E[B:ke=\E[?1h:\
-	:kl=\E[D:kr=\E[C:ks=\E[?1l:ku=\E[A:mb=\E[5m:md=\E[1m:\
-	:me=\E[m:nd=\E[C:rc=\E8:sc=\E7:se=\E[27m:so=\E[7m:\
-	:ta=\E[2I:te=\E[1;1H\E[0J\E[?6h\E[?1l:\
+	:kl=\E[D:kr=\E[C:ks=\E[?1l:ku=\E[A:le=^H:mb=\E[5m:\
+	:md=\E[1m:me=\E[m:nd=\E[C:rc=\E8:sc=\E7:se=\E[27m:\
+	:so=\E[7m:st=\E[2I:ta=^I:te=\E[1;1H\E[0J\E[?6h\E[?1l:\
 	:ti=\E%\E!1\E[1;32r\E[?6l\E>:ue=\E[m:up=\E[A:\
 	:us=\E[4m:
-# t500 is a local entry for the oddball Tek 500 owned by Fluke 
-# Labs
-#
+# t500 is a local entry for the oddball Tek 500 owned by Fluke Labs
 t500|Tek series 500:\
 	:am:bw:\
 	:co#80:li#25:\
 	:bl=^G:cl=\005:cm=\E=%+ %+ :cr=^M:do=^J:ho=^T:le=^H:\
 	:sf=^J:
+# Some unknown person wrote:
 # I added the is string - straight Unix has ESC ; in the login 
 # string which sets a ct8500 into monitor mode (aka 4025 snoopy 
 # mode). The is string here cleans up a few things (but not 
 # everything).
-#
 ct8500|tektronix ct8500:\
 	:am:bw:da:db:\
 	:co#80:li#25:\
@@ -6921,12 +7272,13 @@ ct8500|tektronix ct8500:\
 #
 # am is not defined because the wrap around occurs not when the char.
 # is placed in the 80'th column, but when we are attempting to type
-# the 81'st character on the line.
+# the 81'st character on the line.  (esr: hmm, this is like the vt100
+# version of xenl, perhaps am + xenl would work!)
 #
 # Bold, dim, and standout are simulated by colors and thus not allowed
 # with colors.  The tektronix color table is mapped into the RGB color
 # table by setf/setb. All colors are reset to factory specifications by oc.
-# The initc cap uses RGB notation to define colors.  for arguments 1-3 the 
+# 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:\
@@ -6936,14 +7288,14 @@ tek4205|4205|tektronix 4205:\
 	:UP=\E[%dA:ae=^O:al=\E[1L:as=^N:bl=^G:bt=\E[Z:\
 	:cd=\E[J:ce=\E[K:cl=\E[2J\E[H:cm=\E[%i%d;%dH:cr=^M:\
 	:ct=\E[1g:dc=\E[1P:dl=\E[1M:do=\E[B:ec=\E%dX:\
-	:ei=\E[4l:ho=\E[H:i1=\E%!0\ETM1\E%!1\E[0m:im=\E[4h:\
+	:ei=\E[4l:ho=\E[H:i1=\E%!0\ETM1\E%!1\E[m:im=\E[4h:\
 	:k0=\EOA:k1=\EOB:k2=\EOC:k3=\EOD:k4=\EP:k5=\EQ:\
 	:k6=\ER:k7=\ES:kb=^H:kd=\E[B:kl=\E[D:kr=\E[C:ku=\E[A:\
 	:le=\E[D:mb=\E[5m:md=\E[=7;<4m:\
-	:me=\E[=0;<1m\E[24;25;27m\017:mh=\E[=1;<6m:\
-	:mk=\E[=6;<5:mr=\E[7m:nd=\E[C:se=\E[=0;<1m:sf=\ED:\
-	:so=\E[=2;<3m:sr=\EM:ta=^I:ti=\E%%!1\E[?6l\E[2J:\
-	:ue=\E[24m:up=\E[A:us=\E[4m:
+	:me=\E[=0;<1m\E[24;25;27m\017:mh=\E[=1;<6m:mr=\E[7m:\
+	:nd=\E[C:se=\E[=0;<1m:sf=\ED:so=\E[=2;<3m:sr=\EM:\
+	:ta=^I:ti=\E%%!1\E[?6l\E[2J:ue=\E[24m:up=\E[A:\
+	:us=\E[4m:
 
 #### Teletype (tty)
 #
@@ -6956,14 +7308,12 @@ tek4205|4205|tektronix 4205:\
 # other programs still default to emitting codes for the Model 37.
 #
 
-tty33|model 33 teletype:\
+tty33|tty35|model 33 or 35 teletype:\
 	:hc:os:xo:\
 	:co#72:\
 	:bl=^G:cr=^M:do=^J:sf=^J:
-tty35|model 35 teletype:\
-	:tc=tty33:
 tty37|model 37 teletype:\
-	:bs:hc:os:xo:\
+	:hc:os:xo:\
 	:bl=^G:cr=^M:do=^J:hd=\E9:hu=\E8:le=^H:sf=^J:up=\E7:
 
 # There are known to be at least three flavors of the tty40, all seem more
@@ -6973,75 +7323,66 @@ tty37|model 37 teletype:\
 # braindamaged but has hope and is described here.  The 40-4 is a 3270
 # lookalike and beyond hope.  The terminal has visible bell but I don't know
 # it - it's null here to prevent it from showing the BL character.
-# There is an \EG in :nl: because of a bug in old vi (if stty says you have
+# There is an \EG in <nl> because of a bug in old vi (if stty says you have
 # a "newline" style terminal (-crmode) vi figures all it needs is nl
-# to get crlf, even if :cr: is not ^M.)
+# to get crlf, even if <cr> is not ^M.)
 # (tty40: removed obsolete ":nl=\EG\EB:", it's just do+cr -- esr)
 tty40|ds40|ds40-2|dataspeed40|teletype dataspeed 40/2:\
 	:xo:\
 	:co#80:li#24:\
 	:al=\EL:cd=\EJ:cl=\EH\EJ:cr=\EG:ct=\EH\E2:dc=\EP:\
 	:dl=\EM:do=\EB:ei=:ho=\EH:ic=\E^:im=:kb=^]:kl=^H:\
-	:le=^H:nd=\EC:pf=^T:po=\022:se=\E4:sf=\ES:so=\E3:\
-	:sr=\ET:st=\E1:ta=\E@:up=\E7:
+	:le=^H:nd=\EC:se=\E4:sf=\ES:so=\E3:sr=\ET:st=\E1:\
+	:ta=\E@:up=\E7:
 tty43|model 43 teletype:\
-	:am:bs:hc:os:xo:\
+	:am:hc:os:xo:\
 	:co#132:\
 	:bl=^G:cr=^M:do=^J:kb=^H:le=^H:sf=^J:
 
 #### Tymshare
 #
 
+# You can add <is2>=\E< to put this 40-column mode, though I can't
+# for the life of me think why anyone would want to.
 scanset|sc410|sc415|Tymshare Scan Set:\
 	:am:bw:ms:\
 	:co#80:li#24:\
 	:ae=^O:as=^N:bl=^G:cd=\EJ:ce=\EK:cl=\EH\EJ:\
 	:cm=\EY%+ %+ :cr=^M:do=^J:ho=\EH:kd=\EB:kl=\ED:\
-	:kr=\EC:ku=\EA:le=^H:nd=^I:pf=\E;0:po=\E;0:ps=\E;3:\
-	:rc=^C:sc=^B:sf=^J:up=^K:
-
-scanset-n|Tymshare Scan Set in 40 col mode:\
-	:tc=scanset:
+	:kr=\EC:ku=\EA:le=^H:nd=^I:rc=^C:sc=^B:sf=^J:up=^K:
 
 #### Volker-Craig (vc)
 #
 
 # Missing in vc303a and vc303 descriptions:  they scroll 2 lines at a time
 # every other linefeed.
-vc303a|vc403a|volker-craig 303a:\
-	:am:bs:ns:\
-	:co#80:li#24:\
-	:bl=^G:ce=\026:cl=\030:cr=^M:do=^J:ho=\031:kd=^J:\
-	:kl=^H:kr=^U:ku=^Z:le=^H:ll=^P:nd=^U:up=^Z:
 vc303|vc103|vc203|volker-craig 303:\
-	:am:bs:ns:\
+	:am:ns:\
 	:co#80:li#24:\
 	:bl=^G:cl=\014:cr=^M:do=^J:ho=\013:kd=^J:kl=^H:kr=^I:\
 	:ku=^N:le=^H:ll=\017W:nd=^I:up=^N:
+vc303a|vc403a|volker-craig 303a:\
+	:ce=\026:cl=\030:ho=\031:kr=^U:ku=^Z:ll=^P:nd=^U:\
+	:up=^Z:tc=vc303:
 # (vc404: removed obsolete ":ma=^Z^P^U :" -- esr)
 vc404|volker-craig 404:\
-	:am:bs:\
+	:am:\
 	:co#80:li#24:\
 	:bl=^G:cd=\027:ce=\026:cl=\030:cm=\020%+ %+ :cr=^M:\
 	:do=^J:ho=\031:kd=^J:kl=^H:kr=^U:ku=^Z:le=^H:nd=^U:\
 	:sf=^J:up=^Z:
 vc404-s|volker-craig 404 w/standout mode:\
 	:do=^J:se=^O:so=^N:tc=vc404:
-# (vc404-na: removed obsolete ":ma@:" -- esr)
-vc404-na|volker-craig 404 w/no arrow keys:\
-	:kr@:ku@:tc=vc404:
-vc404-s-na|volker-craig 404 w/standout mode and no arrow keys:\
-	:se=^O:so=^N:tc=vc404-na:
 # From: <wolfgang@cs.sfu.ca>
+# (vc414: merged in cup/dl1/home from an old vc414h-noxon)
 vc414|vc414h|Volker-Craig 414H in sane escape mode.:\
 	:am:bs:\
 	:co#80:li#24:\
-	:al=\E\032:cd=\E^X:ce=10\E\017:cl=\E\034:dc=\E3:\
-	:do=\E^K:ei=:ic=\E\072:im=:k0=\EA:k1=\EB:k2=\EC:\
-	:k3=\ED:k4=\EE:k5=\EF:k6=\EG:k7=\EH:kd=\E^K:kh=\E^R:\
-	:kl=^H:kr=^P:ku=\E^L:nd=^P:se=\E^_:so=\E^Y:up=\E^L:
-vc414h-noxon:\
-	:cm=\E\021%r%.%.:dl=\E\023:ho=\E^R:tc=vc414h:
+	:al=\E\032:cd=\E^X:ce=10\E\017:cl=\E\034:\
+	:cm=\E\021%r%.%.:dc=\E3:dl=\E\023:do=\E^K:ei=:\
+	:ho=\E^R:ic=\E\072:im=:k0=\EA:k1=\EB:k2=\EC:k3=\ED:\
+	:k4=\EE:k5=\EF:k6=\EG:k7=\EH:kd=\E^K:kh=\E^R:kl=^H:\
+	:kr=^P:ku=\E^L:nd=^P:se=\E^_:so=\E^Y:up=\E^L:
 vc415|volker-craig 415:\
 	:cl=^L:tc=vc404:
 
@@ -7059,18 +7400,13 @@ vc415|volker-craig 415:\
 # Steve Jacobson 8/85
 pcplot|pc-plot terminal emulation program:\
 	:xn@:\
-	:cs@:rc@:sc@:tc=vt100:
+	:AL@:DL@:al@:cs@:dl@:rc@:sc@:tc=vt100:
 # (kaypro: removed obsolete ":ma=^K^P:" -- esr)
 kaypro|kaypro2|kaypro II:\
-	:am:bs:\
+	:am:\
 	:co#80:li#24:\
 	:cl=1\032:cm=\E=%+ %+ :ho=^^:kd=^J:kl=^H:kr=^L:ku=^K:\
-	:nd=^L:up=^K:
-sanyo55|sanyo|sanyo mbc-55x pc compatible:\
-	:am:bs:\
-	:co#80:li#25:\
-	:cd=\E[J:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:nd=\E[C:\
-	:se=\E[m:so=\E[7m:ue=\E[m:up=\E[A:us=\E[4m:
+	:le=^H:nd=^L:up=^K:
 
 # From IBM, Thu May  5 19:35:27 1983
 ibmpc|ibm-pc|ibm5051|5051|IBM Personal Computer (no ANSI.SYS):\
@@ -7082,28 +7418,16 @@ ibmpc|ibm-pc|ibm5051|5051|IBM Personal Computer (no ANSI.SYS):\
 #### Apple
 #
 
-# apple -- works with an Apple ][+ that is equipped with a Videx 80 column
-# card in slot 3. A special routine must be installed at the apple end to
-# enable scroll down, here indicated with a ^U.  The Videx card must have 
-# inverse char set, which is used as standout.
-apple|apple-v80|Apple][+ w/Videx80 & custom scroll down:\
-	:am:xn:\
-	:co#80:li#24:\
-	:ae=^Z3:as=^Z2:bl=^G:cd=\013:ce=\035:cl=\014:\
-	:..cm=\r\036%r%p1%{32}%+%c%p2%{32}%+%c$<6>:cr=^M:\
-	:do=^J:ho=\031:le=\010:nd=^\:se=^Z2:sf=^J:so=^Z3:\
-	:sr=^P:up=^_:
-# (appleII: mapped ":pt:" to default tabs -- esr)
 appleII|apple ii plus:\
-	:am:bs:pt:\
-	:co#80:li#24:\
+	:am:\
+	:co#80:it#8:li#24:\
 	:cd=^K:ce=^]:cl=^L:cm=\036%r%+ %+ :do=^J:ho=\E^Y:\
-	:is=\024T1\016:kd=^J:kr=^U:nd=^\:se=^N:so=^O:up=^_:\
-	:vb=\024G1\024T1:ve=^TC2:vs=^TC6:
+	:is=\024T1\016:kd=^J:kr=^U:le=^H:nd=^\:se=^N:so=^O:\
+	:ta=^I:up=^_:vb=\024G1\024T1:ve=^TC2:vs=^TC6:
 # Originally by Gary Ford 21NOV83
 # From: <ee178aci%sdcc7@SDCSVAX.ARPA>  Fri Oct 11 21:27:00 1985
 apple-80|apple II with smarterm 80 col:\
-	:am:bs:bw:\
+	:am:bw:\
 	:co#80:li#24:\
 	:bt=^R:cd=10*\013:ce=10\035:cl=10*\014:\
 	:cm=\036%r%+ %+ :cr=10*\r:do=^J:ho=^Y:le=^H:nd=^\:\
@@ -7119,26 +7443,23 @@ apple-soroc|apple emulating soroc 120:\
 #   ucbvax!ucsfmis!harrison@BERKELEY   .......ARPA
 # "These two work.  If you don't have the inverse video chip for the
 # Apple with videx then remove the so and se fields."
-# (DaleApple: mapped ":pt:" to default tabs -- esr)
-DaleApple|Apple with videx videoterm 80 column board with inverse video:\
-	:am:bs:pt:xn:\
-	:co#80:li#24:\
+# (apple-videx: this used to be called DaleApple -- esr)
+apple-videx|Apple with videx videoterm 80 column board with inverse video:\
+	:am:xn:\
+	:co#80:it#8:li#24:\
 	:cd=^K:ce=^]:cl=300\014:cm=\036%r%+ %+ :do=^J:ho=^Y:\
 	:kd=^J:kh=^Y:kl=^H:kr=^U:le=^H:nd=^\:se=^Z2:so=^Z3:\
-	:up=^_:
-# (lisa: this had forms-drawing capabilities
-#	:GV=`:GH=a:G1=c:G2=f:G3=e:G4=d:GU=u:GD=s:GC=b:GL=v:GR=t:
-# I renamed GS/GE/CO/CF, mapped ":pt:" to default tabs -- esr)
-lisa|apple lisa console display, black on white:\
-	:am:bs:eo:ms:pt:\
-	:co#88:li#32:\
+	:ta=^I:up=^_:
+lisa|apple lisa console display (black on white):\
+	:am:eo:ms:\
+	:co#88:it#8:li#32:\
 	:ae=\E[10m:al=\E[L:as=\E[11m:cd=\E[J:ce=\E[K:cl=^L:\
 	:cm=\E[%i%d;%dH:dc=\E[P:dl=\E[M:do=\E[B:ei=:ho=\E[H:\
-	:ic=\E[@:im=:is=\E>\E[0m\014:kb=^H:kd=\E[B:kl=\E[D:\
-	:kr=\E[C:ku=\E[A:nd=\E[C:se=\E[m:so=\E[7m:ue=\E[m:\
-	:up=\E[A:us=\E[4m:vi=\E[5h:vs=\E[5l:
-liswb|apple lisa console display, white on black:\
-	:is=\E>\E[0;7m\014:se=\E[0;7m:so=\E[0m:ue=\E[0;7m:\
+	:ic=\E[@:im=:is=\E>\E[m\014:kb=^H:kd=\E[B:kl=\E[D:\
+	:kr=\E[C:ku=\E[A:le=^H:nd=\E[C:se=\E[m:so=\E[7m:\
+	:ta=^I:ue=\E[m:up=\E[A:us=\E[4m:vi=\E[5h:vs=\E[5l:
+liswb|apple lisa console display (white on black):\
+	:is=\E>\E[0;7m\014:se=\E[0;7m:so=\E[m:ue=\E[0;7m:\
 	:us=\E[4m:tc=lisa:
 mac|macintosh|Macintosh with MacTerminal:\
 	:xn:\
@@ -7152,75 +7473,47 @@ mac|macintosh|Macintosh with MacTerminal:\
 # I read these as mistakes for ":it#8:" and ":bl=\007:" respectively -- esr)
 # From: <{pbrown,ctl}@ocf.berkeley.edu> 12 Mar 90
 coco3|os9LII|Tandy CoCo3 24*80 OS9 Level II:\
-	:am:bs:\
+	:am:\
 	:co#80:it#8:li#24:\
 	:al=^_0:bl=^G:cd=^K:ce=^D:cl=5*\014:cm=2\002%r%+ %+ :\
-	:dl=^_1:do=^J:ho=^A:kd=^J:kl=^H:kr=^I:ku=^L:mb=^_":\
-	:md=\E\072^A:me=\037!\E\072\200:mr=^_ :nd=^F:se=^_!:\
-	:so=^_ :ue=^_#:up=^I:us=^_":ve=^E!:vi=^E :
-trs80|trs-80|radio shack trs-80 Model I:\
-	:am:bs:\
-	:co#64:li#16:\
-	:bl=^G:cr=^M:do=^J:le=^H:sf=^J:
-# (trs2: mapped ":pt:" to default tabs; removed obsolete ":nl=^_:" -- esr)
+	:dl=^_1:do=^J:ho=^A:kd=^J:kl=^H:kr=^I:ku=^L:le=^H:\
+	:mb=^_":md=\E\072^A:me=\037!\E\072\200:mr=^_ :nd=^F:\
+	:se=^_!:so=^_ :ue=^_#:up=^I:us=^_":ve=^E!:vi=^E :
+# (trs2: removed obsolete ":nl=^_:" -- esr)
 trs2|trsII|trs80II|Radio Shack Model II using P&T CP/M:\
-	:am:bs:ms:pt:\
-	:co#80:li#24:\
+	:am:ms:\
+	:co#80:it#8:li#24:\
 	:al=^D:bl=^G:cd=^B:ce=^A:cl=^L:cm=\EY%+ %+ :cr=^M:\
 	:dl=^K:do=^_:ho=^F:kb=^H:kd=^_:kl=^\:kr=^]:ku=^^:\
-	:nd=^]:se=^O:sf=^J:so=^N:up=^^:
+	:le=^H:nd=^]:se=^O:sf=^J:so=^N:ta=^I:up=^^:
 # From: Kevin Braunsdorf <ksb@mentor.cc.purdue.edu>
-# (This had unknown capabilities
-#	:GV=s:GH=u:GU=e:GD=c:G1=`:G2=_:G3=b:G4=a:\
+# (This had extension capabilities
 #	:BN=\E[?33h:BF=\E[?33l:UC=\E[_ q:BC=\E[\177 q:\
 #	:CN=\ERC:CF=\ERc:NR=\ERD:NM=\ER@:
-# I renamed GS/GE,also deleted the unnecessary ":kn#2:", ":sg#0:"
-# and mapped ":pt:" to default tabs -- esr)
+# I also deleted the unnecessary ":kn#2:", ":sg#0:" -- esr)
 trs16|trs-80 model 16 console:\
-	:am:bs:pt:\
-	:co#80:li#24:sg#0:\
+	:am:\
+	:co#80:it#8:li#24:\
 	:ae=\ERg:al=\EL:as=\ERG:bl=^G:cd=\EJ:ce=\EK:cl=^L:\
 	:cm=\EY%+ %+ :cr=^M:dc=\EQ:dl=\EM:do=\EB:ei=:ho=\EH:\
 	:ic=\EP:im=:k0=^A:k1=^B:k2=^D:k3=^L:k4=^U:k5=^P:\
 	:k6=^N:k7=^S:kb=^H:kd=\EB:kh=^W:kl=\ED:kr=\EC:ku=\EA:\
-	:le=^H:nd=\EC:pf=\E]+:po=\E]=:se=\ER@:sf=^J:so=\ERD:\
-	:ta=^I:up=\EA:ve=\ERC:vi=\ERc:
-# From: Suk Lee <..!{decvax,linus,allegra,ihnp4}!utcsrgv!spoo>
-# (civis/cnorm added from SCO description)
-trs100|Radio Shack Model 100:\
-	:am:bs:xt:\
-	:co#40:li#8:\
-	:al=\EL:bl=^G:cd=\EJ:ce=\EK:cl=\EE:cm=\EY%+ %+ :\
-	:cr=^M:dl=\EM:do=^J:ho=\EH:kb=^H:kd=^_:kl=^]:kr=^\:\
-	:ku=^^:le=^H:nd=\EC:se=\Eq:sf=^J:so=\Ep:up=\EA:\
-	:ve=\EP:vi=\EQ:
-trs200|Tandy Model 200:\
-	:am:xt:\
-	:co#40:li#16:\
-	:al=\EL:bl=^G:cd=^L:ce=\EK:cl=\EE:cm=\EY%+ %+ :cr=^M:\
-	:dl=\EM:do=^_:kd=^_:kl=^]:kr=^\:ku=^^:le=^H:nd=^\:\
-	:se=\Eq:sf=^J:so=\Ep:up=\EA:
-trs600|Tandy Model 600:\
-	:am:\
-	:co#80:li#15:\
-	:bl=^G:cl=\EH\EE:cm=\EY%+ 040%+ :cr=^M:do=\EB:kd=\EB:\
-	:kl=\ED:kr=\EC:ku=\EA:le=^H:nd=\EC:sf=^J:ta=^I:\
-	:up=\EA:
+	:le=^H:nd=\EC:se=\ER@:sf=^J:so=\ERD:ta=^I:up=\EA:\
+	:ve=\ERC:vi=\ERc:
 
 #### Atari ST
 #
 
 # From: Simson L. Garfinkel <simsong@media-lab.mit.edu>
-# (atari: mapped ":pt:" to default tabs -- esr)
 atari|atari st:\
-	:am:bs:pt:\
-	:co#80:li#25:\
+	:am:\
+	:co#80:it#8:li#25:\
 	:al=\EL:cd=\EJ:ce=\EK:cl=\EH\EJ:cm=\EY%+ %+ :dl=\EM:\
-	:do=\EB:kd=\EB:kl=\ED:kr=\EC:ku=\EA:nd=\EC:se=\Eq:\
-	:so=\Ep:sr=\EI:up=\EA:
+	:do=\EB:kd=\EB:kl=\ED:kr=\EC:ku=\EA:le=\ED:nd=\EC:\
+	:se=\Eq:so=\Ep:sr=\EI:ta=^I:up=\EA:
 # UniTerm terminal program for the Atari ST:  49-line VT220 emulation mode
 # From: Paul M. Aoki <aoki@ucbvax.berkeley.edu>
-uniterm|uniterm49|UniTerm VT220 emulator, 49 lines:\
+uniterm|uniterm49|UniTerm VT220 emulator with 49 lines:\
 	:li#49:\
 	:is=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;49r\E[49;1H:tc=vt220:
 
@@ -7259,62 +7552,9 @@ amiga|Amiga ANSI:\
 	:ei=:ho=\E[H:ic=\E[@:im=:is=\E[20l:k0=\E9~:k1=\E0~:\
 	:k2=\E1~:k3=\E2~:k4=\E3~:k5=\E4~:k6=\E5~:k7=\E6~:\
 	:k8=\E7~:k9=\E8~:kb=^H:kd=\EB:kl=\ED:kr=\EC:ku=\EA:\
-	:le=\E[D:mb=\E[7;2m:md=\E[1m:me=\E[0m:mh=\E[2m:\
-	:mk=\E[8m:mr=\E[7m:nd=\E[C:rs=\Ec:se=\E[0m:sf=\E[S:\
-	:so=\E[7m:sr=\E[T:ue=\E[0m:up=\E[A:us=\E[4m:vb=^G:\
-	:ve=\E[ p:vi=\E[0 p:
-
-# The legendary home of B1FF...
-vic20|vic|VIC-20 Personal Computer:\
-	:am:\
-	:co#22:li#20:\
-	:bl=^G:cl=^K^L:cr=^M:do=^J:ho=^L:nd=^\:sf=^J:up=^^:
-
-#### CompuColor
-#
-# These were consoles for a line of Z80-based micros dating from around 1977.
-#
-
-# These compucolors appear similar, but they at least have different
-# sized screens.  I don't know what's going on here.
-# (compucolor: removed obsolete ":bc=^Z:" -- esr)
-compucolor|isc8001|intecolor:\
-	:am:\
-	:co#80:li#47:\
-	:al=\EU:bl=^G:cl=\014:cr=\r:dl=\EV\034:do=\n:\
-	:ei=\022\EK:im=\023\EQ:kd=^J:kh=^H:kl=^Z:kr=^Y:ku=^\:\
-	:le=\032:nd=\031:sf=\n:ue=\022:up=\034:us=\021:
-# (compucolor2: mapped ":pt:" to default tabs,
-# removed obsolete ":bc=^Z:" -- esr)
-compucolor2|compucolorII:\
-	:am:pt:\
-	:co#64:li#32:\
-	:bl=^G:cl=^L:cm=\003%r%.%.:cr=^M:do=^J:ho=^H:le=^Z:\
-	:nd=^Y:sf=^J:ta=^I:up=^\:
-
-#### Exidy Sorcerer
-#
-
-# (exidy: mapped ":pt:" to default tabs -- esr)
-exidy|exidy2500|exidy sorcerer as dm2500:\
-	:am:\
-	:co#64:li#30:\
-	:al=^P^J^X:bl=^G:cd=^X:ce=^W:cl=^^:\
-	:..cm=\014%p2%'`'%^%c%p1%'`'%^%c:cr=^M:dc=^H:\
-	:dl=^P^Z^X:dm=^P:do=^J:ei=^X:ho=^B:ic=^\:im=^P:le=^H:\
-	:nd=^\:se=^X:sf=^J:so=^N:ta=^I:up=^Z:
-ex3000:\
-	:co#80:li#24:\
-	:bl=^G:cr=^M:do=^J:ho=^Q:sf=^J:
-# This came from the comp ctr who got it from some user.  Smart indeed!
-# (sexidy: looks like an Exidy Sorcerer in some bizarre emulation mode;
-# removed obsolete ":ma=^x^J:"; removed obsolete ":bc=^A:"; removed 
-# incorrect (and overridden) ":le=^H:" -- esr)
-sexidy|exidy smart:\
-	:bs:\
-	:co#64:li#24:\
-	:bl=^G:cl=^L:cr=^M:do=^J:ho=^Q:kd=^S:le=^A:nd=^S:\
-	:sf=^J:up=^W:
+	:le=\E[D:mb=\E[7;2m:md=\E[1m:me=\E[m:mh=\E[2m:\
+	:mr=\E[7m:nd=\E[C:se=\E[m:sf=\E[S:so=\E[7m:sr=\E[T:\
+	:ue=\E[m:up=\E[A:us=\E[4m:ve=\E[ p:vi=\E[0 p:
 
 #### Osborne
 #
@@ -7326,7 +7566,7 @@ sexidy|exidy smart:\
 #	
 # I've already had several comments...
 # The Osborne-1 with the 80-col option is capable of being 
-# 52,80, or 104 characters wide; default to 80 for compatibility 
+# 52, 80, or 104 characters wide; default to 80 for compatibility 
 # with most systems.
 #	
 # The tab is destructive on the Ozzie; make sure to 'stty -tabs'.
@@ -7337,9 +7577,30 @@ ozzie|osborne|osborne1|osborne 1:\
 	:dl=\ER:do=^J:ei=:ic=\EQ:im=:kd=^J:kl=^H:kr=^L:ku=^K:\
 	:le=^H:nd=^L:se=\E(:sf=^J:so=\E):ue=\Em:up=^K:us=\El:
 
-#### Console types for UNIX clones
+#### Console types for obsolete UNIX clones
+#
+# Coherent, Minix, Venix, and several lesser-known kin were OSs for 8088
+# machines that tried to emulate the UNIX look'n'feel.  Coherent and Venix
+# were commercial, Minix an educational tool sold in conjuction with a book.
+# Memory-segmentation limits and a strong tendency to look like V7 long after
+# it was obsolete made all three pretty lame.  Venix croaked early.  Coherent
+# and Minix were ported to 32-bit Intel boxes, only to be run over by a
+# steamroller named `Linux' (which, to be fair, traces some lineage to Minix). 
+# Coherent's vendor, the Mark Williams Company, went belly-up in 1994.
 #
 
+minix|minix console:\
+	:co#80:it#8:li#25:\
+	:AL=\E[%dLce=\E[K:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:\
+	:IC=\E[%d@:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:al=\E[L:\
+	:cd=\E[0J:cl=\E[H\E[0J:cm=\E[%i%d;%dH:cr=^M:dc=\E[P:\
+	:dl=\E[M:do=\E[B:ei=:ho=\E[H:ic=\E[@:im=:k0=\E[Y:\
+	:k1=\E[V:k2=\E[U:k3=\E[T:k4=\E[S:k5=\E[G:kb=^H:\
+	:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:\
+	:mb=\E[5m:md=\E[1m:me=\E[0m:mr=\E[7m:nd=\E[C:nw=^M^J:\
+	:se=\E[0m:sf=^J:so=\E[7m:sr=\EM:ta=^I:ue=\E[0m:\
+	:up=\E[A:us=\E[4m:
+
 # According to the Coherent 2.3 manual, the PC console is similar
 # to a z19. The differences seem to be (1) 25 lines, (2) no status
 # line, (3) standout is broken, (4) ins/del line is broken, (5)
@@ -7355,7 +7616,7 @@ pc-coherent|pcz19|coherent|IBM PC console running Coherent:\
 # According to the Venix 1.1 manual, the PC console is similar
 # to a DEC vt52.  Differences seem to be (1) arrow keys send 
 # different strings, (2) enhanced standout, (3) added insert/delete line.
-# Note in particular that it doesn't have automatic margins (am).
+# Note in particular that it doesn't have automatic margins.
 # There are other keys (f1-f10, pgup, pgdn, backtab, insch, delch)
 # not described here.
 pc-venix|venix|IBM PC console running Venix:\
@@ -7369,20 +7630,6 @@ pc-venix|venix|IBM PC console running Venix:\
 #
 # If you know anything more about any of these, please tell me.
 
-# I don't know which, if either, of these sols to believe.
-# ^S is an arrow key!  Boy is this guy in for a surprise...
-sol|sol1|sol terminal computer:\
-	:am:\
-	:co#64:li#16:\
-	:bl=^G:cl=^K:cm=\E\021%.\E\022%.:cr=^M:do=^J:ho=^N:\
-	:kd=^Z:kl=^A:kr=^S:ku=^W:le=^H:nd=^S:sf=^J:up=^W:
-sol2|sol terminal computer (version 2):\
-	:am:mi:xn:\
-	:co#64:li#16:\
-	:al=20\EL:bl=^G:cd=20\EJ:ce=\EK:cl=20\EE:\
-	:cm=\EY%+ %+ :cr=^M:dc=\EN:dl=20\EM:do=^J:ei=\EO:\
-	:ho=\EH:im=\E@:kd=\ED:kh=\EH:kl=\EL:kr=\ER:ku=\EU:\
-	:le=^H:nd=\EC:sf=\n:ta=^I:up=\EA:ve=\EX:vs=^N^Lv:
 # basis from Peter Harrison, Computer Graphics Lab, San Francisco
 #   ucbvax!ucsfmis!harrison ...uucp / ucbvax!ucsfmis!harrison@BERKELEY ...ARPA
 # (basis: removed obsolete ":ma=^K^P^R^L^L :nl=5000*^J:" -- esr)
@@ -7391,20 +7638,12 @@ basis|BASIS108 computer with terminal translation table active:\
 	:kr=^L:ku=^K:se=\E):so=\E(:tc=adm3a:
 # luna's BMC terminal emulator
 luna|luna68k|LUNA68K Bitmap console:\
-	:co#88:li#46:\
-	:tc=ansi-mini:
-microkit|mkt|microkit terminal computer:\
-	:am:mi:xn:\
-	:co#40:li#23:\
-	:al=\El:bl=^G:cd=\Ej:ce=\Ek:cl=\Ee:cm=\Ey%+ %+ :\
-	:cr=^M:dc=\En:dl=\Em:do=^J:ei=\Eo:ho=\Eh:im=\E@:\
-	:kd=\Ed:kh=\Eh:kl=\El:kr=\Er:ku=\Eu:le=^H:nd=\Ec:\
-	:sf=^J:ta=^I:up=\Ea:ve=\Ex:vs=\016\014zv:
+	:co#88:li#46:\tc=ansi-mini:
 megatek|pegasus workstation terminal emulator:\
 	:am:os:\
 	:co#83:li#60:\
-	:
-# The Xerox 820 was an early Z80 micro that went nowhere (I think)
+# The Xerox 820 was a Z80 micro with a snazzy XEROX PARC-derived 
+# interface (pre-Macintosh by several years) that went nowhere.
 xerox820|x820|Xerox 820:\
 	:am:\
 	:co#80:li#24:\
@@ -7416,79 +7655,22 @@ xerox820|x820|Xerox 820:\
 
 # 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:"; mapped ":pt:" to "" -- esr)
+# also deleted unnecessary ":ug#0:sg#0:" -- esr)
 m2-nam|minitel|minitel-2|minitel-2-nam|France Telecom Minitel:\
-	:am@:bs:pt:xn:\
+	:xn:\
 	:co#80:it#8:li#24:\
 	:ae=\E(B:al=\E[L:as=\E(0:cd=\E[J:ce=\E[K:cl=\E[H\E[J:\
 	:cm=\E[%i%d;%dH:dc=\E[P:dl=\E[M:ei=\E[4l:ho=\E[H:\
 	:im=\E[4h:ip=7:is=\E[1;24r\E[24;1H:k1=\EOP:k2=\EOQ:\
 	:k3=\EOR:k4=\EOS:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:\
-	:ku=\E[A:nd=\E[C:se=\E[m:sf=^J:so=\E[7m:sr=\EM:\
-	:ue=\E[m:up=\E[A:us=\E[4m:
-# From: Joel Rubin <jmrubin@coral.berkeley.edu>
-# This is a preliminary TERMCAP for VIDTEX, a terminal program sold by 
-# Compuserve.  Line and column numbers are computer-dependent (I have a
-# Commodore '64); you should use the meta-B option to shut off clean-breaking
-# of lines.  No key codes included since some of them are programmable and
-# most are machine-specific.  Works on vi if you don't use clean-breaking.
-# Very similar to the IBM 3101 termcap.  Escape-D used for backspace because
-# control-H is destructive backspace.  There seem to be a few weirdnesses
-# (especially at the beginning of a wrapped line), and the cursor does not,
-# unfortunately, flash.
-# (vid: mapped ":pt:" to default tabs; changed :bc: to :le: -- esr)
-vid|vidtex|Compuserve vidtex program:\
-	:am:pt:\
-	:co#40:li#25:\
-	:cd=\EJ:ce=\EK:cl=^L:cm=\EY%+ %+ :ho=\EH:le=\ED:\
-	:nd=\EC:up=\EA:
-# This (inherited from the Emacs termcap.dat file) is probably *way* obsolete!
-rsvidtx|Radio Shack VIDEOTEX:\
-	:co#32:li#16:\
-	:cd=\EJ:ce=\EK:cl=\EH\EJ:..cm=\EY%+ %+ :cr=^M:do=^J:\
-	:kb=^H:kd=^J:kl=^H:nd=\EC:nw=^M^J:sf=^J:ta=^I:up=\EA:
+	:ku=\E[A:le=^H:nd=\E[C:se=\E[m:sf=^J:so=\E[7m:sr=\EM:\
+	:ta=^I:ue=\E[m:up=\E[A:us=\E[4m:
 
 ######## OBSOLETE VDT TYPES
 #
 # These terminals are *long* dead -- these entries are retained for
 # historical interest only.
 
-#### AED
-#
-# Advanced Electronic Devices made its name manufacturing super-expensive
-# vector-graphics displays and frame buffers in the late 1970s.  They used
-# to be in Sunnyvale CA 94086 on Pastoria Avenue.  They're long gone now.
-#
-
-# From: Giles Billingsley <gilesb%ucbcad@berkeley.edu>
-# rewritten 8/82 for newer AEDs and better operation of vi, etc.
-# (bel/cr/cub1/cud1/ind added from SCO entry, which doesn't have db or the
-# humongous is2, thus they are commented out here -- esr)
-aed|AED|aed512|AED512|aed 512:\
-	:bs:\
-	:co#64:li#40:\
-	:bl=^G:cl=^L:cr=^M:do=^J:le=^H:nd=\Ei0800\001:\
-	:se=\E[00C80\001:\
-	:sf=\E;1100\072004=000200??;1300'\200\001\n\E\072004=0002??00;1200\001\n:\
-	:so=\E\07200>8000140[80C00\001:\
-	:te=\E\07200>8000100{804<0??00001000L80\072004=000200??\001:\
-	:ti=\E\07200>8000140{<04<0??00001010L<0\072004=0002??00\001:\
-	:uc=\Ei???>l0800i0102\001:ue=\E\07200>8000100\001:\
-	:up=^K:us=\E\07200>8000140\001:\
-	:vb=\EK0001??0000K0001202080\001:\
-	:ve=\E\072004=000200??\001:
-aed-ucb|AED-UCB|aed512-ucb|AED512-UCB|aed 512 w/o UCB ROM:\
-	:bs:db:\
-	:co#64:li#40:\
-	:cl=^L:if=/usr/share/tabset/aed512:nd=\Ei0800\001:\
-	:se=\E[00C80\001:so=\E\07200>8000140[80C00\001:\
-	:te=\E\07200>8000100{804<0??00001000L80\072004=000200??\001:\
-	:ti=\E\07200>8000140{<04<0??00001010L<0\072004=0002??00\001:\
-	:uc=\Ei???>l0800i0102\001:ue=\E\07200>8000100\001:\
-	:up=^K:us=\E\07200>8000140\001:\
-	:vb=\EK0001??0000K0001202080\001:\
-	:ve=\E\E\E\E\E\E\E\072004=000200??\001:
-
 #### Amtek Business Machines
 #
 
@@ -7496,7 +7678,7 @@ aed-ucb|AED-UCB|aed512-ucb|AED512-UCB|aed 512 w/o UCB ROM:\
 # but these caps were commented out in 8.3; also, removed overridden
 # ":do=^J:" -- esr)
 abm80|amtek business machines 80:\
-	:am:bs:bw:\
+	:am:bw:\
 	:co#80:li#24:\
 	:al=\E^Z:bt=^T:cd=\E^X:ce=\E^O:cl=\E^\:\
 	:cm=\E\021%r%+ %+ :dl=\E^S:do=\E^K:ho=\E^R:le=^H:\
@@ -7504,7 +7686,25 @@ abm80|amtek business machines 80:\
 
 #### Bell Labs blit terminals
 #
-# These were AT&T's official entries.
+# These were AT&T's official entries.  The 5620 FAQ maintained by 
+# David Breneman <daveb@dgtl.com> has this to say:
+#
+#  Actually, in the beginning was the Jerq, and the Jerq was white with a
+#  green face, and Locanthi and Pike looked upon the Jerq and said the Jerq
+#  was good.  But lo, upon the horizon loomed a mighty management-type person
+#  (known now only by the initials VP) who said, the mighty Jerq must stay
+#  alone, and could not go forth into the world. So Locanthi and Pike put the
+#  Jerq to sleep, cloned its parts, and the Blit was brought forth unto the
+#  world. And the Jerq lived the rest of its days in research, but never
+#  strayed from those paths.
+#
+#  In all seriousness, the Blit was originally known as the Jerq, but when
+#  it started to be shown outside of the halls of the Bell Labs Research
+#  organization, the management powers that be decided that the name could
+#  not remain. So it was renamed to be Blit. This was in late 1981.
+#
+# (The AT&T 5620 was the commercialized Blit.  Its successors were the 630,
+# 730, and 730+.)
 #
 
 blit|jerq|blit running teletype rom:\
@@ -7518,8 +7718,8 @@ blit|jerq|blit running teletype rom:\
 
 cbblit|fixterm|blit running columbus code:\
 	:co#88:\
-	:cd=\EJ:ei=\ER:ic@:im=\EQ:pO=\EP%03:pf=^T:po=^R:\
-	:se=\EV!:so=\EU!:ue=\EV":us=\EU":vb=\E^G:tc=blit:
+	:cd=\EJ:ei=\ER:ic@:im=\EQ:se=\EV!:so=\EU!:ue=\EV":\
+	:us=\EU":vb=\E^G:tc=blit:
 
 oblit|ojerq|first version of blit rom:\
 	:am:da:db:eo:mi:ul:xo:\
@@ -7529,11 +7729,6 @@ oblit|ojerq|first version of blit rom:\
 	:ei=\ER:im=\EQ:kb=^H:le=\ED:nd=\EC:sf=^J:ta=^I:\
 	:up=\EA:vb=\E^G:
 
-daleblit|daleterm|blit running Dale DeJager's ROM:\
-	:da@:db@:\
-	:kd=\EB:kl=\ED:kr=\EC:ku=\EA:se=\EV!:so=\EU!:ue=\EV":\
-	:us=\EU":tc=oblit:
-
 #### Bolt, Beranek & Newman (bbn)
 #
 # The BitGraph was a product of the now-defunct BBN Computer Corporation.
@@ -7552,48 +7747,40 @@ daleblit|daleterm|blit running Dale DeJager's ROM:\
 # paints lines in on the bottom line of the screen, so you get 
 # this big white gap.
 
-bitgraph|bbn bitgraph 3.10:\
-	:tc=bg3.10rv:
-bg3.10rv|bgrv|bbn bitgraph 2.0 (reverse video):\
-	:tc=bg2.0rv:
-bg3.10nv|bgnv|bbn bitgraph 2.0 (normal video):\
-	:tc=bg2.0nv:
-bg3.10|bgn|bbn bitgraph 2.0 (no init):\
-	:tc=bg2.0:
-bg2.0rv|bbn bitgraph 2.0 (reverse video):\
-	:is=\E>\E[?5h\E[?7h:vb=\E[?5l\E[?5h:tc=bg2.0:
-bg2.0nv|bbn bitgraph 2.0 (normal video):\
+bitgraph|bg2.0nv|bg3.10nv|bbn bitgraph 2.0 or later (normal video):\
 	:is=\E>\E[?5l\E[?7h:vb=\E[?5h\E[?5l:tc=bg2.0:
-bg2.0|bbn bitgraph 2.0 (no init):\
+bg2.0rv|bg3.10rv|bbn bitgraph 2.0 (reverse video):\
+	:is=\E>\E[?5h\E[?7h:vb=\E[?5l\E[?5h:tc=bg2.0:
+bg2.0|bg3.10|bbn bitgraph 2.0 or later (no init):\
 	:xn:\
 	:co#85:li#64:\
 	:al=\E[L:bl=^G:cd=\E[J:ce=\E[K:cl=\E[H\E[J:\
 	:cm=%i\E[%d;%dH:cr=^M:cs=\E[%i%d;%dr:dl=\E[M:do=\E[B:\
 	:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:kd=\E[B:ke=\E>:\
 	:kl=\E[D:kr=\E[C:ks=\E=:ku=\E[A:le=^H:nd=\E[C:rc=\E8:\
-	:sc=\E7:se=\E[0m:sf=\n:so=\E[7m:ta=^I:up=\E[A:
+	:sc=\E7:se=\E[m:sf=\n:so=\E[7m:ta=^I:up=\E[A:
+
 bg1.25rv|bbn bitgraph 1.25 (reverse video):\
 	:is=\E>\E[?5h\E[?7h:vb=\E[?5l\E[?5h:tc=bg1.25:
 bg1.25nv|bbn bitgraph 1.25 (normal video):\
 	:is=\E>\E[?5l\E[?7h:vb=\E[?5h\E[?5l:tc=bg1.25:
+# (bg1.25: I added <rmam>/<smam> based on the init string -- esr)
 bg1.25|bbn bitgraph 1.25:\
 	:co#85:li#64:\
 	:al=\E[L:bl=^G:cd=\E[J:ce=\E[K:cl=\E[H\E[J:\
 	:cm=%i\E[%d;%dH:cr=^M:dl=\E[M:do=\E[B:k1=\EP:k2=\EQ:\
 	:k3=\ER:k4=\ES:kd=\EB:ke=\E>:kl=\ED:kr=\EC:ks=\E=:\
-	:ku=\EA:le=^H:ll=\E[64;1H:nd=\E[C:se=\E[0m:sf=\n:\
+	:ku=\EA:le=^H:ll=\E[64;1H:nd=\E[C:se=\E[m:sf=\n:\
 	:so=\E[7m:ta=^I:up=\E[A:
 
 #### Chromatics
 #
 
-# cg7900: Following is revised version. As I mentioned, I recompiled 
-# curses in order to accomadate the large amount of definition.
-# I have put the long strings in ti/te. Ti sets up a window 
+# I have put the long strings in <smcup>/<rmcup>. Ti sets up a window 
 # that is smaller than the screen, and puts up a warning message 
 # outside the window. Te erases the warning message, puts the 
 # window back to be the whole screen, and puts the cursor at just
-# below the small window. A defined vs and ve to really turn 
+# below the small window. I defined <cnorm> and <civis> to really turn 
 # the cursor on and off, but I have taken this out since I don't 
 # like the cursor being turned off when vi exits.   
 cg7900|chromatics|chromatics 7900:\
@@ -7606,7 +7793,7 @@ cg7900|chromatics|chromatics 7900:\
 	:so=\001C4\\\054\001c7\\\054:\
 	:te=\001W0\\\05440\\\05485\\\05448\\\054\014\001W0\\\0540\\\05485\\\05448\\\054\001M0\\\05440\\\054:\
 	:ti=\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:\
-	:uc=\001\001_\001\200:up=^K:
+	:uc=\001\001_^A\200:up=^K:
 
 #### Computer Automation
 #
@@ -7623,14 +7810,14 @@ ca22851|computer automation 22851:\
 
 # This entry has correct padding and the undocumented "ri" capability
 cyb83|xl83|cybernex xl-83:\
-	:am:bs:\
+	:am:\
 	:co#80:li#24:\
 	:bl=^G:cd=\020:ce=\017:cl=\014:cm=\027%+ %+ :cr=^M:\
 	:do=^J:ho=^K:kd=^J:kl=^H:kr=^I:ku=^N:le=^H:nd=^I:\
 	:sf=^J:sr=^N:up=^N:
 # (mdl110: removed obsolete ":ma=^Z^P:" and overridden ":cd=145^NA^W:" -- esr)
 cyb110|mdl110|cybernex mdl-110:\
-	:am:bs:\
+	:am:\
 	:co#80:li#24:\
 	:al=\016A\016\035:bl=^G:cd=\016@\026:ce=\016@\026:\
 	:cl=\030:cm=\020%+ %+ :cr=^M:dc=\016A\036:\
@@ -7646,7 +7833,7 @@ cyb110|mdl110|cybernex mdl-110:\
 #
 
 dp3360|datapoint|datapoint 3360:\
-	:am:bs:\
+	:am:\
 	:co#82:li#25:\
 	:bl=^G:cd=^_:ce=^^:cl=^]^_:cr=^M:do=^J:ho=^]:le=^H:\
 	:nd=^X:sf=^J:up=^Z:
@@ -7675,23 +7862,19 @@ vt50h|dec vt50h:\
 	:co#80:li#12:\
 	:bl=^G:cd=\EJ:ce=\EK:cl=\EH\EJ:cm=\EY%+ %+ :cr=^M:\
 	:do=^J:le=^H:nd=\EC:sf=^J:sr=\EI:ta=^I:up=\EA:
-vt52|dec vt52:\
-	:co#80:it#8:li#24:\
-	:bl=^G:cd=\EJ:ce=\EK:cl=\EH\EJ:cm=\EY%+ %+ :cr=^M:\
-	:do=^J:kb=^H:kd=\EB:kl=\ED:kr=\EC:ku=\EA:le=^H:\
-	:nd=\EC:sf=^J:sr=\EI:ta=^I:up=\EA:
-vt61|vt-61|vt61.5:\
+vt61|vt-61|vt61.5|dec vt61:\
 	:co#80:li#24:\
 	:bl=^G:cd=\EJ:ce=\EK:cl=\EH\EJ:cm=\EY%+ %+ :cr=\r:\
 	:do=^J:kd=\EB:kl=\ED:kr=\EC:ku=\EA:le=^H:nd=\EC:\
 	:sf=\n:sr=\EI:ta=^I:up=\EA:
 
 # The gigi does standout with red!
+# (gigi: I added <rmam>/<smam> based on the init string, corrected cub1 -- esr)
 gigi|vk100|dec gigi graphics terminal:\
 	:am:xn:\
 	:co#84:li#24:\
-	:DO=\E[%dB:LE=\E[%r%dD:RI=\E[%dC:UP=\E[%dA:bl=^G:\
-	:cd=\E[J:ce=\E[K:cl=\E[;H\E[2J:cm=\E[%i%d;%dH:cr=^M:\
+	:DO=\E[%dB:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:bl=^G:\
+	:cd=\E[J:ce=\E[K:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cr=^M:\
 	:do=^J:is=\E>\E[?3l\E[?4l\E[?5l\E[?20l\E[?7h\E[?8h:\
 	:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:kd=\EOB:\
 	:ke=\E[?1l\E>:kh=\E[H:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:\
@@ -7703,15 +7886,13 @@ gigi|vk100|dec gigi graphics terminal:\
 # grossly-overpriced failure (among other things, DEC's OS didn't include
 # a format program, so you had to buy pre-formatted floppies from DEC at
 # a hefty premium!).
-# (pro350: mapped ":pt:" to default tabs -- esr)
 pro350|decpro|dec pro console:\
-	:bs:pt:\
-	:co#80:li#24:\
+	:co#80:it#8:li#24:\
 	:ae=\EG:as=\EF:cd=\EJ:ce=\EK:cl=\EH\EJ:cm=\EY%+ %+ :\
 	:do=\EB:ho=\EH:k0=\EE:k1=\EF:k2=\EG:k3=\EH:k4=\EI:\
 	:k5=\EJ:k6=\Ei:k7=\Ej:kd=\EB:kh=\EH:kl=\ED:kr=\EC:\
-	:ku=\EA:nd=\EC:se=\E^N:so=\E^H:sr=\EI:ue=\E^C:up=\EA:\
-	:us=\E^D:
+	:ku=\EA:le=^H:nd=\EC:se=\E^N:so=\E^H:sr=\EI:ta=^I:\
+	:ue=\E^C:up=\EA:us=\E^D:
 
 dw1|decwriter I:\
 	:hc:os:\
@@ -7732,7 +7913,7 @@ dw2|decwriter|dw|decwriter II:\
 # \E[1;66r	full vertical page can be printed
 # \E[4g		clear vertical tab stops
 # \E>		disable alternate keypad mode (so it transmits numbers!)
-# \E[%i%du	set tab stop at column %d (origin == 1)
+# \E[%i%p1%du	set tab stop at column %d (origin == 1)
 #		(Full syntax is \E[n;n;n;n;n;...;nu where each 'n' is 
 #		a tab stop)
 #
@@ -7767,19 +7948,17 @@ delta|dd5000|delta data 5000:\
 #### Digital Data Research (ddr)
 #
 
-# (ddr: mapped ":pt:" to default tabs -- esr)
+# (ddr: I added <rmam>/<smam> based on the init string -- esr)
 ddr|rebus3180|ddr3180|Rebus/DDR 3180 vt100 emulator:\
-	:am:bs:pt:xn:\
-	:co#80:li#24:vt#3:\
-	:cd=50\E[J:ce=3\E[K:cl=50\E[;H\E[2J:cm=5\E[%i%d;%dH:\
+	:am:xn:\
+	:co#80:it#8:li#24:vt#3:\
+	:cd=50\E[J:ce=3\E[K:cl=50\E[H\E[2J:cm=5\E[%i%d;%dH:\
 	:cs=\E[%i%d;%dr:do=^J:ho=\E[H:is=\E[1;24r\E[24;1H:\
 	:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:kb=^H:kd=\E[B:\
 	:ke=\E[?1l\E>:kl=\E[D:kr=\E[C:ks=\E[?1h\E=:ku=\E[A:\
 	:le=^H:mb=2\E[5m:md=2\E[1m:me=2\E[m:mr=2\E[7m:\
-	:nd=2\E[C:rc=\E8:\
-	:rs=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:sc=\E7:se=\E[m:\
-	:sf=5\ED:so=\E[7m:sr=5\EM:ue=2\E[m:up=2\E[A:\
-	:us=2\E[4m:
+	:nd=2\E[C:rc=\E8:sc=\E7:se=\E[m:sf=5\ED:so=\E[7m:\
+	:sr=5\EM:ta=^I:ue=2\E[m:up=2\E[A:us=2\E[4m:
 
 #### General Electric (ge)
 #
@@ -7792,16 +7971,50 @@ terminet1200|terminet300|tn1200|tn300|terminet|GE terminet 1200:\
 #### Heathkit/Zenith
 #
 
+# Here is a description of the H19 DIP switches:
+#
+# S401
+# 0-3 = baud rate as follows:
+# 
+#         3       2       1       0
+#	---	---	---	--- 
+#         0       0       1       1       300 baud
+#         0       1       0       1       1200 baud
+#         1       0       0       0       2400 baud
+#         1       0       1       0       4800 baud
+#         1       1       0       0       9600 baud
+#         1       1       0       1       19.2K baud
+# 
+# 4 = parity (0 = no parity)
+# 5 = even parity (0 = odd parity)
+# 6 = stick parity (0 = normal parity)
+# 7 = full duplex (0 = half duplex)
+# 
+# S402 
+# 0 = block cursor (0 = underscore cursor)
+# 1 = no key click (0 = keyclick)
+# 2 = wrap at end of line (0 = no wrap)
+# 3 = auto LF on CR (0 = no LF on CR)
+# 4 = auto CR on LF (0 = no CR on LF)
+# 5 = ANSI mode (0 = VT52 mode)
+# 6 = keypad shifted (0 = keypad unshifted)
+# 7 = 50Hz refresh (1 = 60Hz refresh)
+# 
+# Factory Default settings are as follows:
+#          7 6 5 4 3 2 1 0
+# S401     1 0 0 0 1 1 0 0
+# S402     0 0 0 0 0 0 0 0
+# (h19: I added <rmam>/<smam> based on the init string -- esr)
 h19-a|heath-ansi|heathkit-a|heathkit h19 ansi mode:\
 	:am:mi:ms:\
 	:co#80:it#8:li#24:\
 	:ae=\E[11m:al=\E[1L:as=\E[10m:bl=^G:cd=\E[J:ce=\E[K:\
 	:cl=\E[2J:cm=\E[%i%d;%dH:cr=^M:dc=\E[1P:dl=\E[1M:\
 	:do=\E[1B:ei=\E[4l:ho=\E[H:im=\E[4h:\
-	:is=\E<\E[>1;2;3;4;5;6;7;8;9l\E[0m\E[11m\E[?7h:\
+	:is=\E<\E[>1;2;3;4;5;6;7;8;9l\E[m\E[11m\E[?7h:\
 	:k1=\EOS:k2=\EOT:k3=\EOU:k4=\EOV:k5=\EOW:k6=\EOP:\
 	:k7=\EOQ:k8=\EOR:kb=^H:kd=\E[1B:kh=\E[H:kl=\E[1D:\
-	:kr=\E[1C:ku=\E[1A:le=^H:nd=\E[1C:se=\E[0m:sf=^J:\
+	:kr=\E[1C:ku=\E[1A:le=^H:nd=\E[1C:se=\E[m:sf=^J:\
 	:so=\E[7m:sr=\EM:ta=^I:up=\E[1A:ve=\E[>4l:vs=\E[>4h:
 h19-bs|heathkit w/keypad shifted:\
 	:ke=\Eu:ks=\Et:tc=h19-b:
@@ -7874,34 +8087,52 @@ z29|zenith29|z29b|zenith z29b:\
 	:k8=\ER:k9=\E0I:kb=^H:kd=\EB:kh=\EH:kl=\ED:kr=\EC:\
 	:ku=\EA:le=^H:nd=\EC:se=\Eq:sf=\n:so=\Ep:sr=\EI:\
 	:ta=^I:ue=\Es0:up=\EA:us=\Es8:ve=\Ey4:vs=\Ex4:
+# From: Jeff Bartig <jeffb@dont.doit.wisc.edu> 31 Mar 1995
+z39-a|z39a|zenith39-a|zenith39-ansi|Zenith 39 in ANSI mode:\
+	:am:es:hs:mi:ms:xo:\
+	:co#80:li#24:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:K1=\EOw:\
+	:K2=\EOy:K3=\EOu:K4=\EOq:K5=\EOs:LE=\E[%dD:RI=\E[%dC:\
+	:UP=\E[%dA:ae=\E(B:al=\E[1L:as=\E(0:bl=^G:bt=\E[1Z:\
+	:cd=\E[0J:ce=\E[0K:cl=\E[2J\E[H:cm=\E[%i%d;%dH:cr=^M:\
+	:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[1P:dl=\E[1M:do=\E[B:\
+	:ds=\E[>1l:ei=\E[4l:fs=\E[u:ho=\E[H:im=\E[4h:\
+	:is=\E<\E[>1;3;5;6;7l\E[0m\E[2J:k1=\EOS:k2=\EOT:\
+	:k3=\EOU:k4=\EOV:k5=\EOW:k6=\EOP:k7=\EOQ:k8=\EOR:\
+	:k9=\EOX:kb=^H:kd=\E[B:ke=\E[>7l:kh=\E[H:kl=\E[D:\
+	:kr=\E[C:ks=\E[>7h:ku=\E[A:le=^H:ll=\E[24;1H:\
+	:mb=\E[5m:md=\E[1m:me=\E[0m:mh=\E[2m:mr=\E[7m:\
+	:nd=\E[C:rc=\E[u:sc=\E[s:se=\E[0m:sf=^J:so=\E[7m:\
+	:st=\EH:ta=^I:ts=\E[s\E[>1h\E[25;%i%p1%dH:ue=\E[0m:\
+	:up=\E[A:us=\E[4m:ve=\E[>5l:vi=\E[>5h:
 
 # From: Brad Brahms <Brahms@USC-ECLC>
 z100|h100|z110|z-100|h-100|heath/zenith z-100 pc with color monitor:\
 	:ve=\Ey4\Em70:vs=\Ex4\Em71:tc=z100bw:
-# (z100bw: removed obsolete ":kn#10:"; mapped ":pt:" to default tabs -- esr)
+# (z100bw: removed obsolete ":kn#10:" -- esr)
 z100bw|h100bw|z110bw|z-100bw|h-100bw|heath/zenith z-100 pc:\
-	:bs:mi:ms:pt:\
-	:co#80:li#24:\
+	:mi:ms:\
+	:co#80:it#8:li#24:\
 	:ae=\EG:al=5*\EL:as=\EF:cd=\EJ:ce=\EK:cl=5*\EE:\
 	:cm=1*\EY%+ %+ :dc=1*\EN:dl=5*\EM:do=\EB:ei=\EO:\
 	:ho=\EH:im=\E@:k0=\EJ:k1=\ES:k2=\ET:k3=\EU:k4=\EV:\
 	:k5=\EW:k6=\EP:k7=\EQ:k8=\ER:k9=\EOI:kb=^H:kd=\EB:\
-	:kh=\EH:kl=\ED:kr=\EC:ku=\EA:nd=\EC:se=\Eq:so=\Ep:\
-	:sr=\EI:up=\EA:ve=\Ey4:vs=\Ex4:
-p19:\
+	:kh=\EH:kl=\ED:kr=\EC:ku=\EA:le=^H:nd=\EC:se=\Eq:\
+	:so=\Ep:sr=\EI:ta=^I:up=\EA:ve=\Ey4:vs=\Ex4:
+p19|h19-b with il1/dl1:\
 	:al=2*\EL:dl=2*\EM:tc=h19-b:
 # From: <ucscc!B.fiatlux@ucbvax.berkeley.edu>
-# (ztx: mapped ":pt:" to default tabs; removed duplicate :sr: -- esr)
-ztx|ztx11|zt-1|htx11|ztx-1-a|ztx-10/11:\
-	:am:bs:es:hs:pt:\
-	:co#80:li#24:\
+# (ztx: removed duplicate :sr: -- esr)
+ztx|ztx11|zt-1|htx11|ztx-1-a|ztx-10 or 11:\
+	:am:es:hs:\
+	:co#80:it#8:li#24:\
 	:al=\EL:cd=\EJ:ce=\EK:cl=\EE:cm=\EY%+ %+ :dl=\EM:\
 	:do=^J:ds=\Ey1:fs=\Ek\Ey5:ho=\EH:\
 	:is=\Ej\EH\Eq\Ek\Ev\Ey1\Ey5\EG\Ey8\Ey9\Ey>:k0=\ES:\
 	:k1=\EB:k2=\EU:k3=\EV:k4=\EW:k5=\EP:k6=\EQ:k7=\ER:\
 	:kb=^H:kd=\EB:kl=\ED:kr=\EC:ku=\EA:le=^H:nd=\EC:\
-	:se=\Eq:so=\Es5:sr=\EI:ts=\Ej\Ex5\Ex1\EY8%+ \Eo:\
-	:ue=\Eq:up=\EA:us=\Es2:
+	:se=\Eq:so=\Es5:sr=\EI:ta=^I:\
+	:ts=\Ej\Ex5\Ex1\EY8%+ \Eo:ue=\Eq:up=\EA:us=\Es2:
 
 #### IMS International (ims)
 #
@@ -7912,8 +8143,6 @@ ztx|ztx11|zt-1|htx11|ztx-1-a|ztx-10/11:\
 # From: Erik Fair <fair@ucbarpa.berkeley.edu>  Sun Oct 27 07:21:05 1985
 ims950-b|bare ims950 no init string:\
 	:is@:tc=ims950:
-ims950-ns|ims950 w/no standout:\
-	:se@:so@:ue@:us@:tc=ims950:
 # (ims950: removed obsolete ":ko@:" -- esr)
 ims950|ims televideo 950 emulation:\
 	:xn@:\
@@ -7924,15 +8153,14 @@ ims950-rv|ims tvi950 rev video:\
 	:xn@:\
 	:k0@:k1@:k2@:k3@:k4@:k5@:k6@:k7@:k8@:k9@:kb@:kd@:kh@:\
 	:kl@:kr@:ku@:vb@:tc=tvi950-rv:
-# (ims-ansi: mapped ":pt:" to default tabs -- esr)
 ims-ansi|ultima2|ultimaII|IMS Ultima II:\
-	:am:bs:pt:\
-	:co#80:li#24:\
-	:cd=\E[0J:ce=\E[0K:cl=\E[;H\E[2J:cm=\E[%i%2;%2H:\
+	:am:\
+	:co#80:it#8:li#24:\
+	:cd=\E[0J:ce=\E[0K:cl=\E[H\E[2J:cm=\E[%i%2;%2H:\
 	:do=\ED:if=/usr/share/tabset/vt100:\
-	:is=\E[0m\E[>14l\E[?1;?5;20l\E>\E[1m\r:kd=\E[B:\
-	:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:se=\E[0m\E[1m:\
-	:so=\E[7m:sr=\EM:ue=\E[0m\E[1m:up=\EM:us=\E[4m:
+	:is=\E[m\E[>14l\E[?1;?5;20l\E>\E[1m\r:kd=\E[B:\
+	:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:se=\E[m\E[1m:\
+	:so=\E[7m:sr=\EM:ta=^I:ue=\E[m\E[1m:up=\EM:us=\E[4m:
 
 #### Intertec Data Systems
 #
@@ -7955,12 +8183,43 @@ intertube|intertec|Intertec InterTube:\
 # The intertube 2 has the "full duplex" problem like the tek 4025: if you
 # are typing and a command comes in, the keystrokes you type get interspersed
 # with the command and it messes up
-it2|intertube2|intertec data systems intertube 2:\
-	:am:\
-	:co#80:li#25:\
-	:bl=^G:ce=\EK:ch=\020%+^J:cl=^L:cm=\016%.\020%+^J:\
-	:cr=^M:cv=\013%.:do=^J:ho=^A:le=^H:ll=^K^X\r:nd=^F:\
-	:se=\E0@:sf=^J:so=\E0P:up=^Z:
+intertube2|intertec data systems intertube 2:\
+	:ce=\EK:cm=\016%.\020%+^J:ll=^K^X\r:tc=intertube:
+
+#### Ithaca Intersystems
+#
+# This company made S100-bus personal computers long ago in the pre-IBM-PC
+# past.  They used to be reachable at:
+#
+#	Ithaca Intersystems
+#	1650 Hanshaw Road
+#	Ithaca, New York 14850
+#
+# However, the outfit went bankrupt years ago.
+#
+
+# The Graphos III was a color graphics terminal frome 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.
+
+# (graphos: removed obsolete and syntactically incorrect :kn=4: -- esr)
+graphos|graphos III:\
+	:am:mi:\
+	:co#80:it#8:li#24:\
+	:AL=\E[%dL:DL=\E[%dM:DO=\E[%dB:LE=\E[%dD:RI=\E[%dC:\
+	:UP=\E[%dA:al=\E[L:cd=\E[J:ce=\E[K:cl=\E[H\E[2J:\
+	:cm=\E[%i%d;%dH:cr=^M:dc=\E[P:dl=\E[M:dm=\E[4h:\
+	:do=\E[B:ed=\E[4l:ei=\E[4l:ho=\E[H:\
+	:if=/usr/share/tabset/init.graphos:im=\E[4h:k1=\EOP:\
+	:k2=\EOQ:k3=\EOR:k4=\EOS:kb=^H:kd=\E[B:kh=\E[H:\
+	:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:nd=\E[C:nw=^M\ED:\
+	:rc=\E8:sc=\E7:se=\E[m:sf=\ED:so=\E[7m:sr=\EM:ta=^I:\
+	:up=\E[A:ve=\Ez56;2;0;0z\Ez73z\Ez4;1;1z:\
+	:vs=\Ez4;2;1z\Ez56;2;80;24z:
+graphos-30|graphos III with 30 lines:\
+	:li#30:\
+	:vs=\Ez4;2;1z\Ez56;2;80;30z:tc=graphos:
 
 #### Modgraph
 #
@@ -7980,14 +8239,13 @@ modgraph|mod|modgraph terminal emulating vt100:\
 	:co#80:li#24:\
 	:is=\E^9;0s\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:\
 	:sr=5\EM\E[K:vs=\E^9;0s\E^7;1s:tc=vt100:
-# (modgraph2: mapped ":pt:" to default tabs -- esr)
-# The GX-1000 manual is dated 1984
-modgraph2|modgraph gx-1000, set to 80x24, keypad not enabled:\
-	:am:bs:da:db:pt:\
-	:co#80:li#24:\
+# The GX-1000 manual is dated 1984.  This looks rather like a VT-52.
+modgraph2|modgraph gx-1000 80x24 with keypad not enabled:\
+	:am:da:db:\
+	:co#80:it#8:li#24:\
 	:cd=50\EJ:ce=3\EK:cl=50\EH\EJ:cm=5\EY%+ %+ :\
 	:is=\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:\
-	:nd=2\EC:sr=5\EI:up=2\EA:
+	:le=^H:nd=2\EC:sr=5\EI:ta=^I:up=2\EA:
 
 #### Morrow Designs
 # 
@@ -8011,54 +8269,55 @@ mt70|mt-70|Morrow MD-70; native Morrow mode:\
 	:cl=^Z:cm=\E=%+ %+ :cr=^M:ct=\E0:dc=\EW:dl=\ER:do=^J:\
 	:ei=:ho=^^:i1=\E"2\EG0\E]:ic=\EQ:im=:k1=^A@\r:\
 	:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:k6=^AE\r:\
-	:k7=^AF\r:k8=^AG\r:k9=^AH\r:kb=^H:kd=^AK\r:kh=^AN\r:\
-	:kl=^AL\r:kr=^AM\r:ku=^AJ\r:le=^H:me=\EG0:mh=\EG2:\
-	:mr=\EG4:nd=^L:nw=^_:se=\EG0:sf=^J:so=\EG4:ta=^I:\
-	:ti=\E"2\EG0\E]:up=^K:us=\EG1:vb=\EK1\EK0:ve=\E"2:\
-	:vi=\E"0:
-
-#### Netronics
-#
-# The Netronics Smarterm 80 was a kit-built terminal that came in at least two
-# flavors, a first 40-column version, and a second 64-column version released
-# about 1983.
-
-# (netx: removed obsolete ":ma=j^Jk^Pl :" -- esr)
-netx|netronics:\
-	:bs:\
-	:co#64:li#16:\
-	:bl=^G:cd=\006\005:ce=\005:cl=\014:cm=\E=%+@%+@:\
-	:cr=^M:do=^J:ho=^D:le=^H:nd=\E+@A:sf=^J:sr=\E=@@\013:\
-	:up=^K:
-smartvid|Netronics Smartvid 80:\
-	:am:bw:eo:ms:xs:\
-	:co#80:li#24:sg#1:ug#1:\
-	:ae=\EGB:as=\EG@:bl=^G:bt=\EI:cd=\EY:ce=\ET:cl=^L:\
-	:cm=\E=%+ %+ :cr=^M:dc=\EW:dl=\ER:do=^J:ei=\ED:ho=^Z:\
-	:ic=\EQ:im=\EC:le=^H:ll=^Z^K:nd=^A:se=\EG@:sf=^J:\
-	:so=\EGC:sr=^K:ta=\Ei:te=^Z^K:ue=\EG@:up=^K:us=\EGA:\
-	:ve=^Z^K:
-smarterm|smarterm-s|netronics smarterm 80x24 naked terminal:\
-	:am:ul:\
-	:co#80:li#24:sg#1:ug#1:\
-	:al=\EE:bl=^G:bt=\EI:cd=\EY:ce=\ET:cl=^L:\
-	:cm=\E=%+ %+ :cr=^M:dc=\EW:dl=\ER:do=^J:ei=\ED:ho=^Z:\
-	:ic=\EQ:im=\EC:le=^H:nd=^A:sf=^J:ta=^I:ue=\EG@:\
-	:us=\EGA:
+	:k7=^AF\r:k8=^AG\r:k9=^AH\r:kD=\177:kb=^H:kd=^AK\r:\
+	:kh=^AN\r:kl=^AL\r:kr=^AM\r:ku=^AJ\r:le=^H:me=\EG0:\
+	:mh=\EG2:mr=\EG4:nd=^L:nw=^_:se=\EG0:sf=^J:so=\EG4:\
+	:ta=^I:ti=\E"2\EG0\E]:up=^K:us=\EG1:vb=\EK1\EK0:\
+	:ve=\E"2:vi=\E"0:
 
 #### Omron
 #
 # This company is still around in 1995, manufacturing point-of-sale systems.
 
 omron|Omron 8025AG:\
-	:am:bs:da:db:\
+	:am:da:db:\
 	:co#80:li#24:\
 	:al=\EL:bl=^G:cd=\ER:ce=\EK:cl=\EJ:cr=^M:dc=\EP:\
 	:dl=\EM:do=^J:ho=\EH:le=^H:nd=\EC:se=\E4:sf=\ES:\
 	:so=\Ef:sr=\ET:up=\EA:vs=\EN:
 
+#### Signetics
+#
+
+# From University of Wisconsin
+vsc|Signetics Vsc Video driver by RMC:\
+	:am:ms:\
+	:co#80:it#8:li#26:\
+	:ce=\E[K:cl=50\E[;H\E[2J:cm=\E[%i%d;%dH:cr=^M:do=^J:\
+	:ho=\E[H:kb=^H:kd=^J:kl=^H:le=^H:me=^_!:mr=^_ :\
+	:nd=\E[C:nw=^M^J:se=^_!:sf=^J:so=^_ :ta=^I:ue=^_#:\
+	:up=\E[A:us=^_":
+
 #### Soroc
 #
+# Alan Frisbie <frisbie@flying-disk.com> writes:
+#
+# As you may recall, the Soroc logo consisted of their name,
+# with the letter "S" superimposed over an odd design.   This
+# consisted of a circle with a slightly smaller 15 degree (approx.)
+# wedge with rounded corners inside it.   The color was sort of
+# a metallic gold/yellow.
+# 
+# If I had been more of a beer drinker it might have been obvious
+# to me, but it took a clue from their service department to make
+# me exclaim, "Of course!"   The circular object was the top of
+# a beer can (the old removable pop-top style) and "Soroc" was an
+# anagram for "Coors".
+# 
+# I can just imagine the founders of the company sitting around
+# one evening, tossing back a few and trying to decide what to
+# call their new company and what to use for a logo.
+# 
 
 # (soroc120: removed obsolete ":ma=^K^P^R^L^L :" -- esr)
 soroc120|iq120|soroc iq120:\
@@ -8144,11 +8403,11 @@ synertek|ktm|synertek380|synertek ktm 3/80 tubeless terminal:\
 #
 
 # The tab 132 uses xon/xoff, so no padding needed.
-# :ks:/:ke: have nothing to do with arrow keys.
-# :is: sets 80 col mode, normal video, autowrap on (for :am:).
+# <smkx>/<rmkx> have nothing to do with arrow keys.
+# <is2> sets 80 col mode, normal video, autowrap on (for <am>).
 # Seems to be no way to get rid of status line.
 # The manual for this puppy was dated June 1981.  It claims to be VT52-
-# compatible.
+# compatible but looks more vt100-like.
 tab132|tab|tab132-15|tab 132/15:\
 	:da:db:\
 	:co#80:dN@:li#24:lm#96:\
@@ -8183,19 +8442,15 @@ tab132-w-rv|tab132 in reverse-video/wide mode:\
 #
 
 t3700|dumb teleray 3700:\
-	:bs:\
 	:co#80:li#24:\
 	:bl=^G:cl=^L:cr=^M:do=^J:le=^H:sf=^J:
-# (t3800: mapped ":pt:" to default tabs -- esr)
 t3800|teleray 3800 series:\
-	:bs:pt:\
-	:co#80:li#24:\
+	:co#80:it#8:li#24:\
 	:bl=^G:cd=\EJ:ce=\EK:cl=^L:cm=\EY%+ %+ :cr=^M:do=^J:\
 	:ho=\EH:le=^H:ll=\EY7 :nd=\EC:sf=^J:ta=^I:up=^K:
-# (t1061: mapped ":pt:" to default tabs -- esr)
 t1061|teleray|teleray 1061:\
 	:am:km:xs:xt:\
-	:co#80:li#24:sg#1:ug#1:\
+	:co#80:it#8:li#24:sg#1:ug#1:\
 	:al=\EL:bl=^G:cd=\EJ:ce=\EK:cl=\014:cm=\EY%+ %+ :\
 	:cr=^M:ct=\EG:dc=\EQ:dl=\EM:do=^J:ei=:ho=\EH:ic=\EP:\
 	:im=:ip=:\
@@ -8214,14 +8469,14 @@ t1061f|teleray 1061 with fast PROMs:\
 # programs handle such lossage properly.
 # Note: this is NOT the old termcap's "t1061f with fast proms."
 # From: J. Lepreau <lepreau@utah-cs> Tue Feb  1 06:39:37 1983, Univ of Utah
-# (t10: mapped ":pt:" to default tabs;
-# removed overridden ":so@:se@:us@:ue@:" -- esr)
+# (t10: removed overridden ":so@:se@:us@:ue@:" -- esr)
 t10|teleray 10 special:\
-	:bs:km:pt:xs:xt:\
-	:co#80:li#24:sg#2:ug#1:\
+	:km:xs:xt:\
+	:co#80:it#8:li#24:sg#2:ug#2:\
 	:al=\EL:cd=\EJ:ce=\EK:cl=30\Ej:cm=\EY%+ %+ :dc=\EQ:\
-	:dl=\EM:ei=:ho=\EH:ic=\EP:im=:nd=\EC:pc=\200:se=\ER@:\
-	:sf=\Eq:so=\ERD:sr=\Ep:ue=\ER@:up=\EA:us=\ERH:
+	:dl=\EM:ei=:ho=\EH:ic=\EP:im=:le=^H:nd=\EC:pc=\200:\
+	:se=\ER@:sf=\Eq:so=\ERD:sr=\Ep:ta=^I:ue=\ER@:up=\EA:\
+	:us=\ERH:
 # teleray 16 - map the arrow keys for vi/rogue, shifted to up/down page, and
 # back/forth words. Put the function keys (f1-f10) where they can be
 # found, and turn off the other magic keys along the top row, except
@@ -8241,18 +8496,14 @@ t16|teleray 16:\
 #### Texas Instruments (ti)
 #
 
-ti700|ti733|ti735|ti silent 700:\
-	:bs:hc:os:\
-	:co#80:dC#162:\
-	:bl=^G:cr=\r:do=^J:le=^H:sf=^J:
-ti743|ti745|ti silent 745:\
-	:bs:hc:os:\
+# The Silent 700 was so called because it was built around a quiet thermal
+# printer.  It was portable, equipped with an acoustic coupler, and pretty
+# neat for its day.
+ti700|ti733|ti735|ti745|ti800|ti silent 700/733/735/745 or omni 800:\
+	:hc:os:\
 	:co#80:\
-	:bl=^G:cr=^M:do=^J:le=^H:sf=^J:
-ti800|ti omni 800:\
-	:bs:hc:os:\
-	:co#132:\
-	:bl=^G:cr=^M:do=^J:le=^H:sf=^J:
+	:bl=^G:cr=\r:do=^J:le=^H:sf=^J:
+
 ti924|Texas Instruments 924 VDT 8859/1 7 bit CTRL:\
 	:am:xo:\
 	:co#80:it#8:li#24:\
@@ -8260,11 +8511,11 @@ ti924|Texas Instruments 924 VDT 8859/1 7 bit CTRL:\
 	:cm=%i\E[%d;%dH:cr=^M:cs=%i\E[%d;%dr:ct=\E[3g:\
 	:dl=\E[M:do=\E[B:ho=\E[H:k1=\EOP:k2=\EOQ:k3=\EOR:\
 	:k4=\EOS:k5=\E[16~:k6=\E[17~:k7=\E[18~:k8=\E[19~:\
-	:k9=\E[20~:kb=^H:kd=\E[B:kl=\E[D:kr=\E[C:ku=\E[A:\
-	:le=\E[D:mb=\E[5m:md=\E[1m:me=\E[0m:mr=\E[7m:nd=\E[C:\
-	:rc=\E8:sc=\E7:se=\E[m:sf=\ED:so=\E[7m:sr=\EM:st=\EH:\
-	:ta=^I:ue=\E[m:up=\E[A:us=\E[4m:ve=\E[?25h:\
-	:vi=\E[?25l:vs=\E[?31h:
+	:k9=\E[20~:kD=\E[P:kI=\E[@:kb=^H:kd=\E[B:kl=\E[D:\
+	:kr=\E[C:ku=\E[A:le=\E[D:mb=\E[5m:md=\E[1m:me=\E[m:\
+	:mr=\E[7m:nd=\E[C:rc=\E8:sc=\E7:se=\E[m:sf=\ED:\
+	:so=\E[7m:sr=\EM:st=\EH:ta=^I:ue=\E[m:up=\E[A:\
+	:us=\E[4m:ve=\E[?25h:vi=\E[?25l:vs=\E[?31h:
 ti924-8|Texas Instruments 924 VDT 8859/1 8 bit CTRL:\
 	:am:xo:\
 	:co#80:it#8:li#24:\
@@ -8272,37 +8523,31 @@ ti924-8|Texas Instruments 924 VDT 8859/1 8 bit CTRL:\
 	:cm=%i\E[%d;%dH:cr=^M:cs=%i\E[%d;%dr:ct=\E[3g:\
 	:dl=\E[M:do=\E[B:ho=\E[H:k1=P\217>:k2=Q\217>:\
 	:k3=R\217>:k4=S\217>:k5=~\23316>:k6=~\23317>:\
-	:k7=~\23318>:k8=~\23319>:k9=~\23320>:kb=^H:kd=\E[B:\
-	:kl=\E[D:kr=\E[C:ku=\E[A:le=\E[D:mb=\E[5m:md=\E[1m:\
-	:me=\E[0m:mr=\E[7m:nd=\E[C:rc=\E8:sc=\E7:se=\E[m:\
-	:sf=\ED:so=\E[7m:sr=\EM:st=\EH:ta=^I:ue=\E[m:up=\E[A:\
-	:us=\E[4m:ve=\E[?25h:vi=\E[?25l:vs=\E[?31h:
+	:k7=~\23318>:k8=~\23319>:k9=~\23320>:kD=P\233>:\
+	:kI=@\233>:kb=^H:kd=\E[B:kl=\E[D:kr=\E[C:ku=\E[A:\
+	:le=\E[D:mb=\E[5m:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:\
+	:rc=\E8:sc=\E7:se=\E[m:sf=\ED:so=\E[7m:sr=\EM:st=\EH:\
+	:ta=^I:ue=\E[m:up=\E[A:us=\E[4m:ve=\E[?25h:\
+	:vi=\E[?25l:vs=\E[?31h:
 ti924w|Texas Instruments 924 VDT 7 bit - 132 column mode:\
-	:co#132:\
-	:tc=ti924:
+	:co#132:\tc=ti924:
 ti924-8w|Texas Instruments 924 VDT 8 bit - 132 column mode:\
-	:co#132:\
-	:tc=ti924-8:
-em931-9|Texas Instruments 924 Emulator in the 931 Mode:\
-	:tc=ti931:
-em924|Texas Instruments 924 Emulator in the 924 Mode:\
-	:tc=ti924:
-em931|Texas Instruments 931 Emulator:\
-	:tc=ti931:
+	:co#132:\tc=ti924-8:
 ti931|Texas Instruments 931 VDT:\
 	:am:xo:\
 	:co#80:li#24:\
-	:LE=ENTR:al=\EN:bl=^G:cd=\EJ:ce=\EI:cl=\EL:\
-	:cm=\EY%+ %+ :cr=^M:dc=\EQ:dl=\EO:do=\EB:ei=:ho=\EH:\
-	:ic=\ER\EP\EM:im=:is=\EGB\E(@B@@\E):k1=\Ei1:k2=\Ei2:\
-	:k3=\Ei3:k4=\Ei4:k5=\Ei5:k6=\Ei6:k7=\Ei7:k8=\Ei8:\
-	:k9=\Ei9:kd=\EB:kl=\ED:kr=\EC:ku=\EA:le=\ED:mb=\E4P:\
-	:me=\E4@:mk=\E4H:mr=\E4B:nd=\EC:se=\E4@:sf=\Ea:\
+	:al=\EN:bl=^G:cd=\EJ:ce=\EI:cl=\EL:cm=\EY%+ %+ :\
+	:cr=^M:dc=\EQ:dl=\EO:do=\EB:ei=:ho=\EH:ic=\ER\EP\EM:\
+	:im=:is=\EGB\E(@B@@\E):k1=\Ei1:k2=\Ei2:k3=\Ei3:\
+	:k4=\Ei4:k5=\Ei5:k6=\Ei6:k7=\Ei7:k8=\Ei8:k9=\Ei9:\
+	:kD=\EQ:kI=\EP:kd=\EB:kl=\ED:kr=\EC:ku=\EA:le=\ED:\
+	:mb=\E4P:me=\E4@:mr=\E4B:nd=\EC:se=\E4@:sf=\Ea:\
 	:so=\E4A:sr=\Eb:ue=\E4@:up=\EA:us=\E4D:ve=\E4@:
 ti926|Texas Instruments 926 VDT 8859/1 7 bit CTRL:\
 	:cs@:sf=\E[1S:sr=\E[1T:tc=ti924:
+# (ti926-8: I corrected this from the broken SCO entry -- esr)
 ti926-8|Texas Instruments 926 VDT 8859/1 8 bit CTRL:\
-	:cs@:sf=S\2331>:sr=T\2331>:tc=ti924-8:
+	:cs@:sf=\2331S:sr=\2331T:tc=ti924-8:
 ti_ansi|basic entry for ti928:\
 	:am:eo:xn:xo:\
 	:co#80:it#8:li#25:\
@@ -8310,45 +8555,71 @@ ti_ansi|basic entry for ti928:\
 	:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:dc=\E[P:dl=\E[M:\
 	:do=\E[B:ei=:ho=\E[H:ic=\E[@:im=:k0=\E[V:k1=\E[M:\
 	:k2=\E[N:k3=\E[O:k4=\E[P:k5=\E[Q:k6=\E[R:k7=\E[S:\
-	:k8=\E[T:k9=\E[U:kb=^H:kd=\E[B:kh=\E[H:kl=\E[D:\
-	:kr=\E[C:ku=\E[A:le=^H:mb=\E[5m:md=\E[1m:me=\E[m:\
-	:nd=\E[C:se=\E[m:sf=\E[S:so=\E[7m:sr=\E[T:ta=^I:\
-	:ue=\E[m:up=\E[A:us=\E[4m:
+	:k8=\E[T:k9=\E[U:kN=\E[G:kP=\E[I:kb=^H:kd=\E[B:\
+	:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:mb=\E[5m:\
+	:md=\E[1m:me=\E[m:nd=\E[C:se=\E[m:sf=\E[S:so=\E[7m:\
+	:sr=\E[T:ta=^I:ue=\E[m:up=\E[A:us=\E[4m:
 #
 #       928 VDT 7 bit control mode
 #
-ti928|Texas Instruments 928 VDT 8859/1 7 bit CTRL::\
+ti928|Texas Instruments 928 VDT 8859/1 7 bit CTRL:\
 	:k1=\E[17~:k2=\E[18~:k3=\E[19~:k4=\E[20~:k5=\E[21~:\
-	:k6=\E[23~:k7=\E[24~:k8=\E[25~:k9=\E[26~:tc=ti_ansi:
+	:k6=\E[23~:k7=\E[24~:k8=\E[25~:k9=\E[26~:kD=\E[P:\
+	:kI=\E[@:kN=\E[S:kP=\E[T:tc=ti_ansi:
 #
 #       928 VDT 8 bit control mode
 #
-ti928-8|Texas Instruments 928 VDT 8859/1 8 bit CTRL::\
+ti928-8|Texas Instruments 928 VDT 8859/1 8 bit CTRL:\
 	:k1=\23317~:k2=\23318~:k3=\23319~:k4=\23320~:\
 	:k5=\23321~:k6=\23323~:k7=\23324~:k8=\23325~:\
-	:k9=\23326~:kh=\233H:tc=ti_ansi:
+	:k9=\23326~:kD=\233P:kI=\233@:kN=\233S:kP=\233T:\
+	:kh=\233H:tc=ti_ansi:
 
 #### Zentec (zen)
 #
 
 # (zen30: removed obsolete ":ma=^L ^R^L^K^P:" -- esr)
 zen30|z30|zentec 30:\
-	:am:bs:mi:ul:\
+	:am:mi:ul:\
 	:co#80:li#24:\
 	:al=\EE:bl=^G:cd=\EY:ce=\ET:cl=\E*:cm=\E=%+ %+ :\
 	:cr=^M:dc=\EW:dl=\ER:do=^J:ei=\Er:ho=^^:im=\Eq:le=^H:\
 	:nd=^L:se=\EG0:sf=^J:so=\EG6:up=^K:
-# (zen50: this had unknown capabilities
+# (zen50: this had extension capabilities
 #	:BS=^U:CL=^V:CR=^B:
 # UK/DK/RK/LK/HM were someone's aliases for ku/kd/kl/kr/kh,
 # which were also in the original entry -- esr)
 # (zen50: removed obsolete ":ma=^Hh^Ll^Jj^Kk:" -- esr)
 zen50|z50|zentec zephyr:\
-	:am:bs:\
+	:am:\
 	:co#80:li#24:sg#1:\
 	:al=\EE:cd=\EY:ce=\ET:cl=\E+:cm=\E=%+ %+ :dc=\EW:\
 	:dl=\ER:ei=:ic=\EQ:im=:kd=^J:kh=^^:kl=^H:kr=^L:ku=^K:\
-	:se=\EGO:so=\EG4:up=^K:
+	:le=^H:se=\EGO:so=\EG4:up=^K:
+
+######## OBSOLETE UNIX CONSOLES
+#
+
+#### Masscomp consoles
+#
+# Masscomp has gone out of business.  Their product line was purchased by
+# comany in Georgia (US) called "XS International", parts and service may
+# still be available through them.
+#
+
+# (masscomp: ":MT:" changed to ":km:";  -- esr)
+masscomp|masscomp workstation console:\
+	:km:mi:\
+	:co#80:it#8:li#24:\
+	:al=\E[L:cd=\E[J:ce=\E[K:cl=\E[2J:cm=\E[%i%d;%dH:\
+	:dc=\E[P:dl=\E[M:do=\E[B:ei=\E[4l:im=\E[4h:\
+	:is=\EGc\EGb\EGw:kb=^H:kd=\EOB:kl=\EOD:kr=\EOC:\
+	:ku=\EOA:le=^H:nd=\E[C:se=\E[m:so=\E[7m:ta=^I:\
+	:ue=\EGau:up=\E[A:us=\EGu:
+masscomp1|masscomp large screen version 1:\
+	:co#104:li#36:\tc=masscomp:
+masscomp2|masscomp large screen version 2:\
+	:co#64:li#21:\tc=masscomp:
 
 ######## OTHER OBSOLETE TYPES
 #
@@ -8365,11 +8636,11 @@ zen50|z50|zentec zephyr:\
 # so we have to save their status in the static registers A, B and H
 # respectively, to be able to restore them when color changes
 # (because any color change turns off ALL attributes)
-# 3. "enter_bold_mode" and "enter_reverse_mode" sequences alternates modes,
+# 3. <bold> and <rev> sequences alternate modes,
 # rather then simply  entering them.  Thus we have to check the
 # static register B and H to determine the status, before sending the 
 # escape sequence.
-# 4. sgr0 now must set the status of all 3 register (A,B,H) to zero
+# 4. <sgr0> now must set the status of all 3 register (A,B,H) to zero
 # and then reset colors
 # 5. implementation of the protect mode would badly penalize the performance.
 # we would have to use \E&bn sequence to turn off colors (as well as all
@@ -8388,13 +8659,13 @@ zen50|z50|zentec zephyr:\
 ctrm|C terminal emulator:\
 	:am:xo:\
 	:co#80:li#24:lm#0:pb#19200:vt#6:\
-	:al=\EL:bl=^G:bt=\Ei:cd=\EJ:ce=\EK:ch=\E&a%dC:\
-	:cl=\EH\EJ:cm=\E&a%r%dc%dY:cr=^M:ct=\E3:cv=\E&a%dY:\
-	:dc=\EP:dl=\EM:do=^J:ei=\ER:im=\EQ:ip=:is=\E&jA\r:\
-	:k1=\Ep\r:k2=\Eq\r:k3=\Er\r:k4=\Es\r:k5=\Et\r:\
-	:k6=\Eu\r:k7=\Ev\r:k8=\Ew\r:kb=^H:kd=\Ew\r:ke=\E&jA:\
-	:kh=\Ep\r:kl=\Eu\r:kr=\Ev\r:ks=\E&jB:ku=\Et\r:le=^H:\
-	:mb=\E&dA%{1}%PA:md=%?%gH%{0}%=%t\E&dH%{1}%PH%;:\
+	:al=\EL:bl=^G:bt=\Ei:cd=\EJ:ce=\EK:cl=\EH\EJ:\
+	:cm=\E&a%r%dc%dY:cr=^M:ct=\E3:dc=\EP:dl=\EM:do=^J:\
+	:ei=\ER:im=\EQ:ip=:is=\E&jA\r:k1=\Ep\r:k2=\Eq\r:\
+	:k3=\Er\r:k4=\Es\r:k5=\Et\r:k6=\Eu\r:k7=\Ev\r:\
+	:k8=\Ew\r:kb=^H:kd=\Ew\r:ke=\E&jA:kh=\Ep\r:kl=\Eu\r:\
+	:kr=\Ev\r:ks=\E&jB:ku=\Et\r:le=^H:mb=\E&dA%{1}%PA:\
+	:md=%?%gH%{0}%=%t\E&dH%{1}%PH%;:\
 	:me=\E&d@%{0}%PA%{0}%PB%{0}%PH:\
 	:mr=%?%gB%{0}%=%t\E&dB%{1}%PB%;:nd=\EC:\
 	:..sa=\E&d@%{0}%PA%{0}%PB%{0}%PD%{0}%PH\n%?%p1%p3%p5%|%|%t\E&dB%{1}%PB%;\n%?%p4%t\E&dA%{1}%PA%;\n%?%p6%t\E&dH%{1}%PH%;\n%?%p2%t\E&dD%;:\
@@ -8402,19 +8673,19 @@ ctrm|C terminal emulator:\
 
 # gs6300 - can't use blue foreground, it clashes with underline;
 # it's simulated with cyan
-gs6300|emots|AT&T PC6300 with EMOTS Terminal Emulator:\
+gs6300|emots|AT&T PC6300 with EMOTS terminal emulator:\
 	:am:ms:xo:\
 	:co#80:it#8:li#24:\
 	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
 	:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:ae=\E[10m:al=\E[L:\
 	:as=\E[11m:bl=^G:cd=\E[J:ce=\E[K:cl=\E[H\E[J:\
 	:cm=\E[%i%d;%dH:cr=^M:dc=\E[P:dl=\E[M:do=^J:ei=:\
-	:ho=\E[H:ic=\E[@:im=:is=\E[0m:k1=\E[0s:k2=\E[24s:\
+	:ho=\E[H:ic=\E[@:im=:is=\E[m:k1=\E[0s:k2=\E[24s:\
 	:k3=\E[1s:k4=\E[23s:k5=\E[2s:k6=\E[22s:k7=\E[3s:\
 	:k8=\E[21s:kb=^H:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:\
 	:ku=\E[A:le=^H:mb=\E[5m:md=\E[1m:me=\E[m\E[10m:\
-	:mr=\E[7m:nd=\E[C:pf=\E[4i:po=\E[5i:sf=^J:so=\E[1m:\
-	:sr=\E[L:ta=^I:up=\E[A:us=\E[4m:
+	:mr=\E[7m:nd=\E[C:sf=^J:so=\E[1m:sr=\E[L:ta=^I:\
+	:up=\E[A:us=\E[4m:
 
 # From: <earle@smeagol.UUCP> 29 Oct 85 05:40:18 GMT
 # MS-Kermit with Heath-19 emulation mode enabled
@@ -8424,40 +8695,40 @@ h19k|h19kermit|heathkit emulation provided by Kermit (no auto margin):\
 	:it@:\
 	:ta@:tc=h19-u:
 
-# pc52 - can't use blue foreground, it clashes with underline;
-# it's simulated with cyan
-# bold means: white on black bold, so it not allowed with colors
-# rev means: black on white, also not allowed
-# smso and dim are simulated with colors, ditto
-# smul is allowed, even though it always means white foreground:
-# it is too important to leave out.
-pc52|dec vt52 for PC:\
-	:am:ms:\
-	:co#80:it#8:li#25:\
-	:al=\EL:bl=^G:cd=\EJ:ce=\EK:cl=\EH\EJ:cm=\EY%+ %+ :\
-	:cr=^M:dl=\EM:do=^J:k1=\Ea:k2=\Eb:k3=\Ec:k4=\Ed:\
-	:k5=\Ee:k6=\Ef:k7=\Eg:k8=\Eh:k9=\Ei:kb=^H:kd=\ED:\
-	:kl=\EL:kr=\ER:ku=\EU:le=^H:mb=\Eo:md=\Ebo\Ec0:\
-	:me=\Eb7\Ec0\Et:mh=\Eb3\Ec0:mr=\Ep:nd=\EC:\
-	:se=\Eb7\Ec0:sf=^J:so=\Eb6\Ec4:sr=\EI:ta=^I:up=\EA:\
-	:us=\Es:
+# Apple Macintosh with Versaterm, a terminal emulator formerly
+# distributed by Peripherals Computers & Supplies, Inc
+# 2232 Perkiomen Ave., Mt. Penn, PA 19606, (215) 779-0522
+# The number no longer reaches them and they are no longer listed.
+versaterm|versaterm vt100 emulator for the macintosh:\
+	:am:xn:\
+	:co#80:it#8:li#24:\
+	:al=9\E[1L:bl=^G:cd=50\E[J:ce=3\E[K:cl=50\E[;H\E[2J:\
+	:cm=5\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:dc=7\E[1P:\
+	:dl=9\E[1M:do=^J:ei=:ho=\E[H:ic=7\E[1@:im=:\
+	:is=\E[1;24r\E[24;1H:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:\
+	:kb=^H:kd=\EOB:ke=\E>\E[?1l:kl=\EOD:kr=\EOC:\
+	:ks=\E=\E[?1h:ku=\EOA:le=^H:mb=2\E[5m:md=2\E[1m:\
+	:me=2\E[m:mr=2\E[7m:nd=2\E[C:nw=^M^J:rc=\E8:sc=\E7:\
+	:se=2\E[m:so=2\E[7m:sr=5\EM:ta=^I:ue=2\E[m:up=2\E[A:\
+	:us=2\E[4m:
 
 # vs100 emulator using tsim
 # From: <lai@decwrl.dec.com>
-# (vs100t: had Al/Dl in front of obvious AL/DL capabilities;
-# also mapped ":pt:" to default tabs -- esr)
-vs100t|tsim|vs100-tsim:\
-	:am:bs:pt:\
-	:co#80:li#24:\
+# (vs100t: had Al/Dl in front of obvious AL/DL capabilities -- esr)
+vs100t|tsim|vs100-tsim|tsim vs100 emulator:\
+	:am:\
+	:co#80:it#8:li#24:\
 	:AL=\E+%+ :DL=\E-%+ :al=\EI:cd=\EQ:ce=\EL:cl=\EE:\
 	:cm=\EM%+ %+ :cs=\ES%+ %+ :dc=\Ed:dl=\ED:do=^J:ei=:\
-	:ho=\EH:ic=\Ei:im=:is=\ER:nd=\En:rs=\ER:se=\Er:\
-	:so=\Eh:ue=\Ev:up=^K:us=\Eu:
+	:ho=\EH:i1=\ER:ic=\Ei:im=:le=^H:nd=\En:se=\Er:so=\Eh:\
+	:ta=^I:ue=\Ev:up=^K:us=\Eu:
 
 # From: Rick Thomas <ihnp4!btlunix!rbt>
+# (xtalk: I added <rmam>/<smam> based on the init string.
+# I also removed <xmc>#1, I don't believe it on a PC display -- esr)
 xtalk|IBM PC with xtalk communication program (versions up to 3.4):\
 	:am:mi:ms:xo:\
-	:co#80:it#8:li#24:sg#1:vt#3:\
+	:co#80:it#8:li#24:vt#3:\
 	:DO=\E[%dB:K1=\EOq:K2=\EOr:K3=\EOs:K4=\EOp:K5=\EOn:\
 	:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:ae=^O:al=\E[L:as=^N:\
 	:bl=^G:cd=\E[J:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:\
@@ -8468,38 +8739,6 @@ xtalk|IBM PC with xtalk communication program (versions up to 3.4):\
 	:se=\E[m :sf=^J:so=\E[7m :sr=\EM:st=\EH:ta=^I:\
 	:up=\E[A:
 
-# YTERM standard version 1.0.
-# Straight old ascii keyboard except function keys are Yale (e.g.,ASCII.KBD).
-# Only 80 tab columns (else yterm 1.1 bug).  No :xn: in 1.0.
-# Cannot use termcap :sr=\EM: because vi will not work, too bad.
-# vi string is given so that yterm is reset each vi startup.
-# (yterm10: removed obsolete ":EP:" and ":ma=h^JjklH:" capabilities;
-# mapped ":pt:" to default tabs -- esr)
-# From: greg small <gts@populi.berkeley.edu> 9-25-84
-yterm10|yterm 1.0 UCB ascii.kbd:\
-	:am:bs:pt:\
-	:co#80:li#24:\
-	:cd=^K:ce=^]:cl=^L:cm=\036%r%+ %+ :ho=^Y:\
-	:is=\017\E[7i\E[m\E[?7h\E[?3g\r\EHY0  for \EHYTERM 1.\EH0 with A\EHSCII.KBD\EH 9-13-84\EH        \EH        \EH        \EH        \EH\n:\
-	:k0=\E0:k1=\E1:k2=\E2:k3=\E3:k4=\E4:k5=\E5:k6=\E6:\
-	:k7=\E7:k8=\E8:k9=\E9:kd=^J:kh=^^:kl=^H:kr=^L:ku=^K:\
-	:nd=^\:rc=\E8:sc=\E7:se=\E[m:so=\E[7m:ue=\E[m:up=^_:\
-	:us=\E[4m:\
-	:vs=\017\E[7i\E[m\E[?7h\E[?3g\r\EHY0      \EH        \EH        \EH        \EH        \EH        \EH        \EH        \EH        \EH\r:
-# YTERM variant version 1.1.  Version 1.1 has :xn:.
-# From: greg small <gts@populi.berkeley.edu> 9-13-84
-yterm11|yterm 1.1 UCB ascii.kbd:\
-	:xn:\
-	:is=\017\E[7i\E[m\E[?7h\E[?3g\r\EHY1  for \EHYTERM 1.\EH1 with A\EHSCII.KBD\EH 9-13-84\EH        \EH        \EH        \EH        \EH\n:tc=yterm10:
-# YTERM 1.0 variant no autowrap or tabs
-# X does not remember autowrap or tabs when T is deleted and restarted.
-# (yterm: changed ":pt@:" to ":it@:" -- esr)
-yterm10nat|yterm 1.0 UCB ascii.kbd no autowrap or tabs:\
-	:am@:\
-	:it@:\
-	:is=\017\E[7i\E[m\E[?7l\E[?3g\rY2  for YTERM 1.0 with ASCII.KBD 9-20-84 no autowrap or tabs\n:\
-	:vs=\017\E[7i\E[m\E[?7l\E[?3g\rY2\r:tc=yterm10:
-
 # The official PC terminal emulator program of the AT&T Product Centers.
 # Note - insert mode commented out - doesn't seem to work on AT&T PC.
 simterm|attpc running simterm:\
@@ -8511,32 +8750,19 @@ simterm|attpc running simterm:\
 
 #### Daisy wheel printers
 #
-
 # This section collects Diablo, DTC, Xerox, Qume, and other daisy
 # wheel terminals.  These are now largely obsolete.
 #
-# This is an "experimental" entry for the SRI Agiles.
-# It has been tried in a minimal way -- the Agile did not blow up!
-# However, it has not been exhaustively tested.
-# Anyone who tries it and finds it wanting should get in touch with:
-# From: Ralph Keirstead <ralph@sri-unix>
-#	EK352; SRI International; 333 Ravenswood Avenue; Menlo Park, CA 94025
-# (agile: I removed an incorrect ":pl:" -- esr)
-agile|agiles|sri agiles:\
-	:hc:os:\
-	:co#132:\
-	:bl=^G:cr=^M:ct=\E2:do=^J:hd=\E9:hu=\E0:is=\EE\EF\EJ:\
-	:kb=^H:le=^H:sf=^J:st=\E1:ta=^I:up=\E^J:
-# (1620: mapped ":pt:" to default tabs -- esr)
+
 diablo1620|diablo1720|diablo450|ipsi|diablo 1620:\
-	:bs:hc:os:pt:\
-	:co#132:\
-	:ch=\E\011%i%.:ct=\E2:do=^J:hd=\ED:hu=\EU:\
+	:hc:os:\
+	:co#132:it#8:\
+	:ct=\E2:do=^J:hd=\ED:hu=\EU:\
 	:if=/usr/share/tabset/xerox1720:kb=^H:le=^H:st=\E1:\
-	:up=\E^J:
+	:ta=^I:up=\E^J:
 diablo1620-m8|diablo1640-m8|diablo 1620 w/8 column left margin:\
 	:co#124:\
-	:do=^J:is=\r        \E9:tc=diablo1620:
+	:is=\r        \E9:tc=diablo1620:
 diablo1640|diablo1730|diablo1740|diablo630|x1700|diablo|xerox|diablo 1640:\
 	:bl=^G:if=/usr/share/tabset/xerox1730:se=\E&:so=\EW:\
 	:ue=\ER:us=\EE:tc=diablo1620:
@@ -8544,16 +8770,16 @@ diablo1640-lm|diablo-lm|xerox-lm|diablo 1640 with indented left margin:\
 	:co#124:\
 	:if=/usr/share/tabset/xerox1730-lm:se=\E&:so=\EW:\
 	:ue=\ER:us=\EE:tc=diablo1620:
-diablo1740-lm|630-lm|1730-lm|x1700-lm:\
+diablo1740-lm|630-lm|1730-lm|x1700-lm|diablo 1740 printer:\
 	:tc=diablo1640-lm:
-# DTC 382 with VDU.  Has no :cd: so we fake it with :ce:.  Standout
-# (so="^P \002^PF:") works but won't go away without dynamite (":se=^P \200:").
+# DTC 382 with VDU.  Has no <ed> so we fake it with <el>.  Standout
+# <smso>=^P\s\002^PF works but won't go away without dynamite <rmso>=^P\s\200.
 # The terminal has tabs, but I'm getting tired of fighting the braindamage. 
 # If no tab is set or the terminal's in a bad mood, it glitches the screen
 # around all of memory.  Note that return puts a blank ("a return character")
 # in the space the cursor was at, so we use ^P return (and thus ^P newline for
-# newline).  Note also that if you turn off pt and let Unix expand tabs,
-# curses won't work (current version) because it doesn't turn off this bit,
+# newline).  Note also that if you turn off :pt: and let Unix expand tabs,
+# curses won't work (some old BSD versions) because it doesn't clear this bit,
 # and cursor addressing sends a tab for row/column 9.  What a losing terminal!
 # I have been unable to get tabs set in all 96 lines - it always leaves at
 # least one line with no tabs in it, and once you tab through that line,
@@ -8571,42 +8797,40 @@ dtc300s|DTC 300s:\
 	:co#132:\
 	:bl=^G:cr=^M:ct=\E3:do=^J:ff=^L:hd=\Eh:hu=\EH:kb=^H:\
 	:le=^H:sf=^J:st=\E1:ta=^I:up=^Z:
-gsi:\
+gsi|mystery gsi terminal:\
 	:hc:os:\
 	:co#132:\
 	:bl=^G:cr=^M:do=^J:hd=\Eh:hu=\EH:le=^H:sf=^J:ta=^I:\
 	:up=^Z:
 aj830|aj832|aj|anderson jacobson:\
-	:bs:hc:os:\
+	:hc:os:\
 	:bl=^G:cr=^M:do=^J:hd=\E9:hu=\E8:le=^H:sf=^J:up=\E7:
 # From: Chris Torek <chris@gyre.umd.edu> Thu, 7 Nov 85 18:21:58 EST
-aj510|AJ510|Anderson-Jacobson model 510:\
-	:am:bs:mi:\
+aj510|Anderson-Jacobson model 510:\
+	:am:mi:\
 	:co#80:li#24:\
 	:al=2*\E&I:cd=\E'P:ce=\E'L:cl=^L:cm=\E#%+ %+ :\
 	:dc=.1*\E'D:dl=2*\E&D:ei=\E'J:ic=:im=\E'I:ip=.1*:\
-	:kd=\EZ:kl=\EW:kr=\EX:ku=\EY:nd=\EX:pc=\177:se=\E"I:\
-	:so=\E"I:te=\E"N:ti=\E"N:ue=\E"U:up=\EY:us=\E"U:
+	:kd=\EZ:kl=\EW:kr=\EX:ku=\EY:le=^H:nd=\EX:pc=\177:\
+	:se=\E"I:so=\E"I:te=\E"N:ti=\E"N:ue=\E"U:up=\EY:\
+	:us=\E"U:
 # From: <cbosg!ucbvax!pur-ee!cincy!chris> Thu Aug 20 09:09:18 1981
 # This is incomplete, but it's a start.
-# (5520: mapped ":pt:" to default tabs -- esr)
 nec5520|nec|spinwriter|nec 5520:\
-	:bs:hc:os:pt:\
-	:co#132:\
+	:hc:os:\
+	:co#132:it#8:\
 	:bl=^G:cr=^M:ct=\E3:do=^J:ff=^L:hd=\E]s\n\E]W:\
 	:hu=\E]s\E9\E]W:kb=^H:le=^H:sf=^J:st=\E1:ta=^I:\
 	:up=\E9:
-# (qume5: mapped ":pt:" to default tabs -- esr)
 qume5|qume|Qume Sprint 5:\
-	:bs:hc:os:pt:\
-	:co#80:\
+	:hc:os:\
+	:co#80:it#8:\
 	:bl=^G:cr=^M:ct=\E3:do=^J:ff=^L:hd=\Eh:hu=\EH:kb=^H:\
 	:le=^H:sf=^J:st=\E1:ta=^I:up=^Z:
-# I suspect the xerox1720 is the same as the diablo 1620.
-# (x1720: mapped ":pt:" to default tabs -- esr)
+# I suspect the xerox 1720 is the same as the diablo 1620.
 xerox1720|x1720|x1750|xerox 1720:\
-	:bs:hc:os:pt:\
-	:co#132:\
+	:hc:os:\
+	:co#132:it#8:\
 	:bl=^G:cr=^M:ct=\E2:do=^J:ff=^L:le=^H:sf=^J:st=\E1:\
 	:ta=^I:
 
@@ -8616,24 +8840,21 @@ xerox1720|x1720|x1750|xerox 1720:\
 # and a date on the serial-number plate) please send it!
 
 cad68-3|cgc3|cad68 basic monitor transparent mode size 3 chars:\
-	:am:bs:\
+	:am:\
 	:co#73:li#36:\
-	:cl=^Z:ho=^^:nd=^L:up=^K:
+	:cl=^Z:ho=^^:le=^H:nd=^L:up=^K:
 cad68-2|cgc2|cad68 basic monitor transparent mode size 2 chars:\
-	:am:bs:\
+	:am:\
 	:co#85:li#39:\
 	:cl=^Z:ho=^^:k1=\E5:k2=\E6:k3=\E7:k4=\E8:kd=\E2:\
-	:kl=\E3:kr=\E4:ku=\E1:nd=^L:se=\Em^C:so=\Em^L:up=^K:
-cdi|cdi1203:\
-	:am:bs:hc:os:\
-	:co#80:\
-	:bl=^G:cr=\r:do=^J:le=^H:sf=^J:
-cops10|cops|cops-10:\
+	:kl=\E3:kr=\E4:ku=\E1:le=^H:nd=^L:se=\Em^C:so=\Em^L:\
+	:up=^K:
+cops10|cops|cops-10|cops 10:\
 	:am:bw:\
 	:co#80:li#24:\
-	:bl=^G:cd=^W:ce=^V:cl=30^X:cm=\020%+ %+ :cr=^M:do=^J:\
-	:kb=^H:kd=^J:kh=^Y:kl=^H:kr=^L:ku=^K:le=^H:nd=^L:\
-	:sf=^J:up=^K:
+	:bl=^G:cd=^W:ce=^V:cl=30\030:cm=\020%+ %+ :cr=^M:\
+	:do=^J:kb=^H:kd=^J:kh=^Y:kl=^H:kr=^L:ku=^K:le=^H:\
+	:nd=^L:sf=^J:up=^K:
 # (d132: removed duplicate ":ic=\E5:" -- esr)
 d132|datagraphix|datagraphix 132a:\
 	:da:db:in:\
@@ -8645,47 +8866,31 @@ d132|datagraphix|datagraphix 132a:\
 # 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
 # emulations.
-# (d800: mapped ":pt:" to default tabs -- esr)
 d800|Direct 800/A:\
-	:am:bs:da:db:ms:pt:xs:\
-	:co#80:li#24:\
-	:ae=\E[0m:as=\E[1m:bl=^G:cd=\E[J:ce=\E[K:\
+	:am:da:db:ms:xs:\
+	:co#80:it#8:li#24:\
+	:ae=\E[m:as=\E[1m:bl=^G:cd=\E[J:ce=\E[K:\
 	:cl=\E[1;1H\E[2J:cm=\E[%i%d;%dH:cr=^M:do=^J:k1=\EOP:\
 	:k2=\EOQ:k3=\EOR:k4=\EOS:k5=\EOT:k6=\EOU:k7=\EOV:\
 	:k8=\EOW:kd=\E[B:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:\
-	:nd=\E[C:se=\E[0m:sf=\ED:so=\E[7m:sr=\EM:ta=^I:\
-	:ue=\E[0m:up=\E[A:us=\E[4m:ve=\E[>12h:vs=\E[>12l:
+	:nd=\E[C:se=\E[m:sf=\ED:so=\E[7m:sr=\EM:ta=^I:\
+	:ue=\E[m:up=\E[A:us=\E[4m:ve=\E[>12h:vs=\E[>12l:
 digilog|digilog 333:\
-	:bs:\
 	:co#80:li#16:\
 	:bl=^G:ce=^X:cr=^M:do=^J:ho=^N:le=^H:nd=^I:sf=^J:\
 	:up=^O:
 env230|envision230|envision 230 graphics terminal:\
-	:am:mi:ms:xo:\
-	:co#80:it#8:li#24:vt#3:\
-	:DO=\E[%dB:K1=\EOq:K2=\EOr:K3=\EOs:K4=\EOp:K5=\EOn:\
-	:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:ae=^O:as=^N:bl=^G:\
-	:cd=\E[J:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:\
-	:cs=\E[%i%d;%dr:ct=\E[3g:do=^J:ho=\E[H:k0=\EOy:\
-	:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:k5=\EOt:k6=\EOu:\
-	:k7=\EOv:k8=\EOl:k9=\EOw:kb=^H:kd=\EOB:ke=\E[?1l\E>:\
-	:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:ku=\EOA:le=^H:mb=\E[5m:\
-	:md=\E[1m:me=\E[m\017:mr=\E[7m:nd=\E[C:pf=\E[4i:\
-	:po=\E[5i:ps=\E[0i:rc=\E8:\
-	:..sa=\E[%?%p1%t;1%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;m:\
-	:sc=\E7:se=\E[0m<2>:sf=^J:so=\E[1m<2>:sr=\EM:st=\EH:\
-	:ta=^I:ue=\E[m:up=\E[A:us=\E[4m:
+	:xn@:\
+	:..sa=\E[%?%p1%t;1%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;m:tc=vt100:
 # These execuports were impact-printer ttys with a 30- or maybe 15-cps acoustic
 # coupler attached, the whole rig fitting in a suitcase and more or less
 # portable.  Hot stuff for c.1977 :-) -- esr
 ep48|ep4080|execuport 4080:\
-	:am:bs:os:\
+	:am:os:\
 	:co#80:\
 	:bl=^G:cr=^M:do=^J:hd=^\:hu=^^:le=^H:sf=^J:
 ep40|ep4000|execuport 4000:\
-	:am:bs:os:\
-	:co#136:\
-	:bl=^G:cr=^M:do=^J:hd=^\:hu=^^:le=^H:sf=^J:
+	:co#136:\tc=ep4080:
 # Adam Thompson <thompson@xanth.magic.mb.ca> tells us:
 # Informer series - these are all portable units, resembling older
 # automatic bread-baking machines.  The terminal looks like a `clamshell'
@@ -8699,35 +8904,28 @@ ep40|ep4000|execuport 4000:\
 # color terminals built for IBM bisync protocols.
 # From: Paul Leondis <unllab@amber.berkeley.edu>
 ifmr|Informer D304:\
-	:am:bs:\
+	:am:\
 	:co#80:li#24:\
 	:cd=\E/:ce=\EQ:cl=\EZ:cm=\EY%r%+ %+ :dc=\E\\:do=^J:\
-	:ei=:ho=\EH:ic=\E[:im=:nd=\EC:se=\EK:so=\EJ:sr=\En:\
-	:up=\EA:
-# This used to say "de#001202" which presumably refers to the stty bits
-# that need to be set for some version of Unix.  We need the real delay
-# requirements in MS.
-mw2|Multiwriter 2:\
-	:hc:os:\
-	:co#132:\
-	:bl=^G:cr=^M:do=^J:sf=^J:
+	:ei=:ho=\EH:ic=\E[:im=:le=^H:nd=\EC:se=\EK:so=\EJ:\
+	:sr=\En:up=\EA:
 # Entry largely based on wy60 and has the features of wy60ak.
-# (untranslatable capabilities removed to fit entry within 1023 bytes)
-opus3n1+|Esprit  Opus3n1+ in wy60 mode with ANSI arrow keys +:\
+opus3n1+|Esprit Opus3n1+ in wy60 mode with ANSI arrow keys:\
 	:am:bw:hs:km:mi:ms:ul:xo:\
 	:co#80:li#24:ws#80:\
 	:ae=\EH^C:al=\EE:as=\EH^B:bl=^G:bt=\EI:cd=\EY:ce=\ET:\
 	:cl=\E*:cm=\Ea%i%dR%dC:cr=^M:ct=\E0:dc=\EW:dl=\ER:\
 	:do=^J:ds=\Ez(\r:ei=\Er:fs=^M:ho=\036:\
 	:if=/usr/share/tabset/std:im=\Eq:ip=:\
-	:is=\E`\072\Ee(\EO\Ee6\Ec41\E~4\Ec21\Ed/\Ezz&\E[A\037\Ezz'\E[B\037\Ezz(\E[D\037\Ezz)\E[C\037\Ezz<\E[Q\037\Ezz`\E[F\037\EA1*\EZH12:\
+	:is=\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:\
 	:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:\
-	:k6=^AE\r:k7=^AF\r:k8=^AG\r:k9=^AH\r:kb=^H:kd=\E[B:\
-	:kh=^^:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:mb=\EG2:\
-	:me=\E(\EH\003\EG0\EcD:mh=\EGp:mk=\EG1:mp=\E):\
-	:mr=\EG4:nd=^L:nw=\r\n:pf=^T:po=^R:ps=\EP:se=\EG0:\
-	:sf=^J:so=\EG4:sr=\Ej:st=\E1:ta=\011:\
-	:ti=\Ezz&\E[A\037\Ezz'\E[B\037\Ezz(\E[D\037\Ezz)\E[C\037\Ezz<\E[Q\037:\
+	:k6=^AE\r:k7=^AF\r:k8=^AG\r:k9=^AH\r:kD=\EW:kI=\EQ:\
+	:kN=\EK:kP=\EJ:kb=^H:kd=\E[B:kh=^^:kl=\E[D:kr=\E[C:\
+	:ku=\E[A:le=^H:mb=\EG2:me=\E(\EH\003\EG0\EcD:mh=\EGp:\
+	:mr=\EG4:nd=^L:nw=\r\n:\
+	:..sa=%?%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:\
+	:se=\EG0:sf=^J:so=\EG4:sr=\Ej:st=\E1:ta=\011:\
+	:ti=\Ezz&\E[A\177\Ezz'\E[B\177\Ezz(\E[D\177\Ezz)\E[C\177\Ezz<\E[Q\177:\
 	:ts=\Ez(:uc=\EG8%p1%c\EG0:ue=\EG0:up=^K:us=\EG8:\
 	:ve=\E`1:vi=\E`0:
 # (ps300: changed ":pt@:" to "it@" -- esr)
@@ -8735,39 +8933,14 @@ ps300|Picture System 300:\
 	:xt:\
 	:it@:\
 	:se@:so@:ue@:us@:tc=vt100:
-ramtek|ramtek 6000:\
-	:am:\
-	:co#78:li#24:\
-	:bl=^G:cl=[alpha]\n[erase]\n:cr=^M:do=^J:le=^H:sf=^J:
-# Upper case terminal, uses lower case for control sequences!!!
-tec400|tec scope:\
-	:sg#1:\
-	:al=e:cd=s:ce=c:cl=f:..cm=l%p2%~%c%p1%~%c:dc=t:dl=u:\
-	:do=h:ei=:ho=i:ic=d:im=:le=w:nd=g:se=|:so={:up=x:
-# From: <ucbvax!geoff> Mon Sep 21 21:15:45 1981
-# This entry has been tested.
-tec500|tec 500:\
-	:am:bs:\
-	:co#80:li#24:\
-	:bl=^G:cl=\032:cm=\E=%+ %+ :cr=^M:do=^J:ho=^^:le=^H:\
-	:nd=^L:se=^\:sf=^J:so=^]:up=^K:
-# tec is untested, and taken from CB/Unix virtual terminal driver.
-# I would appreciate more information on this terminal, such as the
-# manufacturer and the model number.  There are too many tecs in here.
-# (tec: removed obsolete ":ma=^K^P^_ :" -- esr)
-tec:\
-	:am:bs:\
-	:co#80:li#24:\
-	:bl=^G:cl=^L:cr=^M:do=^J:ho=^^:le=^H:nd=^_:sf=^J:\
-	:up=^K:
 teletec|Teletec Datascreen:\
-	:am:bs:\
+	:am:\
 	:co#80:li#24:\
 	:bl=^G:cl=^L:cr=^M:do=^J:ho=^^:le=^H:nd=^_:sf=^J:\
 	:up=^K:
-# Terak made a PDP-11 based box with a bitmapped display that ran UCSD
-# Pascal as the native O/S. It was quite a nice box, and there were several
-# at Berkeley.
+# 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:\
 	:tc=dm1520:
 # From: Mark Dornfeld <romwa@ucbvax.berkeley.edu>
@@ -8776,128 +8949,19 @@ terak|Terak emulating Datamedia 1520:\
 #	edit keypad: FIND, INSERT HERE, REMOVE, SELECT, PREV SCREEN,
 #	NEXT SCREEN. The key definitions k6-k9 represent the PF1 to
 #	PF4 keys.
-# (v3220: mapped ":pt:" to default tabs, removed obsolete ":kn#10:" -- esr)
+# (v3220: removed obsolete ":kn#10:",
+# I added <rmam>/<smam> based on the init string -- esr)
 v3220|LANPAR Vision II model 3220/3221/3222:\
-	:am:bs:mi:pt:xn:\
-	:co#80:li#24:\
+	:am:mi:xn:\
+	:co#80:it#8:li#24:\
 	:al=\E[L:cd=\E[J:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:\
 	:dc=\E[P:dl=\E[M:ei=\E[4l:im=\E[4h:\
 	:is=\E>\E[?3l\E[?7h\E[?8h\E[p:k0=\E[1~:k1=\E[2~:\
 	:k2=\E[3~:k3=\E[4~:k4=\E[5~:k5=\E[6~:k6=\E[OP:\
 	:k7=\E[OQ:k8=\E[OR:k9=\E[OS:kd=\E[B:ke=\E>:kh=\E[H:\
-	:kl=\E[D:kr=\E[C:ks=\E=:ku=\E[A:nd=\E[C:se=\E[m:\
-	:so=\E[7m:sr=\EM:ue=\E[m:up=\E[A:us=\E[4m:
-# Does anybody know where these "wind" terminals came from?
-wind:\
-	:bs:\
-	:co#80:li#24:\
-	:cl=\EnP(\Eo:cm=\Ep%r%.%.:ho=\Ep\200\200:k1=\E5:\
-	:k2=\E6:k3=\E7:k4=\E8:kd=\E2:kl=\E3:kr=\E4:ku=\E1:\
-	:nd=^L:nl=^]:se=\Em^C:so=\Em^L:up=^K:
-wind16:\
-	:bs:\
-	:co#80:li#16:\
-	:cl=\EnP\020\Eo:cm=\Ep%r%.%.:ho=\Ep\200\200:nd=^L:\
-	:nl=^]:se=\Em^C:so=\Em^L:up=^K:
-wind40:\
-	:bs:\
-	:co#80:li#40:\
-	:cl=\EnP(\Eo:cm=\Ep%r%.%.:ho=\Ep\200\200:nd=^L:nl=^]:\
-	:se=\Em^C:so=\Em^L:up=^K:
-# (wind50: corrected :cl=\EnP\128\062\Eo: -- esr)
-wind50:\
-	:bs:\
-	:co#88:li#50:\
-	:cl=\EnP2\Eo:cm=\Ep%r%.%.:ho=\Ep\200\200:k1=\E5:\
-	:k2=\E6:k3=\E7:k4=\E8:kd=\E2:kl=\E3:kr=\E4:ku=\E1:\
-	:nd=^L:nl=^]:se=\Em^C:so=\Em^L:up=^K:
-# (xitex: removed obsolete ":ma=j^Jk^Pl :" -- esr)
-xitex|xitex sct-100:\
-	:bs:\
-	:co#64:li#16:\
-	:bl=^G:cd=\006\005:ce=\005:cl=\014:cm=\E=%+@%+@:\
-	:cr=^M:do=^J:ho=^D:le=^H:nd=\E+@A:sf=^J:sr=\E=@@\013:\
-	:up=^K:
-plasma|plasma panel:\
-	:am:bs:\
-	:co#85:li#45:\
-	:bl=^G:cl=^L:cr=^M:do=^J:ho=^^:le=^H:nd=^X:sf=^J:\
-	:up=^V:
-
-#### Homebrew and custom terminals
-#
-
-# Nu machine parameters taken from mit-vax.
-# 						smc - 5/21/85
-#
-nuterminal:\
-	:am:mi:ms:\
-	:co#80:it#8:li#24:\
-	:ae=\EG:al=1*\EL:as=\EF:cd=60\EJ:ce=10\EK:cl=60\EE:\
-	:..cm=\EY%+ %+ :cr=^M:dc=2.5*\EN:dl=1*\EM:do=\EB:\
-	:ei=\EO:ho=\EH:im=\E@:ip=2.5*:k1=\ES:k2=\ET:k3=\EU:\
-	:k4=\EV:k5=\EW:k6=\EP:k7=\EQ:k8=\ER:kb=^H:kd=\EB:\
-	:kh=\EH:kl=\ED:kr=\EC:ku=\EA:le=^H:nd=\EC:nw=^M^J:\
-	:se=\Eq:sf=^J:so=\Ep:sr=\EI:ta=^I:up=\EA:ve=\Ey4:\
-	:vs=\Ex4:
-nu24|nuwindow:\
-	:mi:ms:\
-	:co#86:it#8:li#24:\
-	:ae=\EG:al=1*\EL:as=\EF:cd=\EJ:ce=\EK:cl=\EE:\
-	:..cm=\EY%+ %+ :cr=^M:dl=1*\EM:do=\EB:ei=\EO:ho=\EH:\
-	:im=\E@:ip=2.5*:kb=^H:kd=\EB:kh=\EH:kl=\ED:kr=\EC:\
-	:ku=\EA:le=^H:nd=\EC:nw=^M^J:se=\Eq:sf=^J:so=\Ep:\
-	:sr=\EI:ta=^I:up=\EA:ve=\Ey4:vs=\Ex4:
-bnu|nu51|bnuwindow:\
-	:co#86:li#51:\
-	:tc=nuterminal:
-fnu|nu61|fnuwindow:\
-	:co#86:li#61:\
-	:tc=nuterminal:
-nunix-30|nu-telnet-30|nu-half -- Half nu screen thru telnet:\
-	:am:\
-	:co#78:it#8:li#30:\
-	:al=\EL:cd=\EJ:ce=\EK:cl=\EE:..cm=\EY%+ %+ :cr=^M:\
-	:dl=\EM:do=\EB:ho=\EH:ip=2.5*:kb=^H:kd=^J:kl=^H:\
-	:le=^H:nd=\EC:nw=^M^J:se=\Eq:sf=^J:so=\Ep:sr=\EI:\
-	:ta=^I:up=\EA:
-nunix-61|nu-telnet-61|nu-full| Full nu screen thru telnet:\
-	:co#78:li#61:\
-	:tc=nunix-30:
-
-bch|bc|bill croft homebrew:\
-	:am:bs:\
-	:co#96:li#72:\
-	:cl=^Z:cm=\E=%+ %+ :do=^J:ho=^^:le=^H:nd=^L:up=^K:\
-	:vb=:
-nucterm|rayterm|NUC homebrew:\
-	:am:bs:\
-	:co#80:li#24:\
-	:bl=^G:cd=^E:ce=^A:cl=\014:cr=^M:do=^J:ho=^B:le=^H:\
-	:ll=^K:nd=^C:sf=^J:up=^N:
-carlock|klc:\
-	:am:bs:\
-	:co#80:li#24:\
-	:al=^E:bl=^G:ce=^U:cl=\032:cm=\E=%+ %+ :cr=^M:\
-	:dc=\177:dl=^D:do=^J:ei=^T:ho=^^:im=^T:nd=^L:se=^V:\
-	:sf=^J:so=^V:up=^K:vb=\EV\EV:
-# uVAX
-qdss|qdcons|qdss glass tty:\
-	:am:bs:\
-	:co#128:li#57:\
-	:cl=1\032:cm=\E=%.%.:do=^J:le=^H:nd=^L:up=^K:
-# (ubell: removed obsolete ":ma=j^Jk^P^K^Pl :";
-# mapped ":pt:" to default tabs; removed obsolete ":bc=^Y:" -- esr)
-ubell|ubellchar:\
-	:am:bs:pt:\
-	:co#80:li#24:\
-	:bl=^G:ce=\Ed:cl=^Z:cm=\E=%+ %+ :cr=^M:do=^J:ho=^^:\
-	:le=^H:nd=^L:sf=^J:ta=^I:up=^K:
-ttywilliams:\
-	:am:\
-	:co#80:li#12:\
-	:bl=^G:ce=^_:cl=^^:cr=^M:do=^K:ho=^]:le=^Y:nd=^X:\
-	:sf=^J:up=^Z:
+	:kl=\E[D:kr=\E[C:ks=\E=:ku=\E[A:le=^H:nd=\E[C:\
+	:se=\E[m:so=\E[7m:sr=\EM:ta=^I:ue=\E[m:up=\E[A:\
+	:us=\E[4m:
 ######## ICH/ICH1 VERSUS RMIR/SMIR
 #
 # Some non-curses applications get confused if both ich/ich1 and rmir/smir
@@ -8912,9 +8976,27 @@ ttywilliams:\
 # one or the other as appropriate but never mixes the two.  Therefore we
 # have not corrected entries like `linux' and `xterm' that specify both.
 # If you see doubled characters from these, use the linux-nic and xterm-nic
-# entries that suppress ich/ich1.
+# entries that suppress ich/ich1.  And upgrade to ncurses!
 #
-######## ANSI/VT100/PC-TERM TERMINAL STANDARDS
+
+######## ANSI/VT100/ISO 6429/ECMA-48/PC-TERM TERMINAL STANDARDS
+#
+# ANSI X3.64 has been withdrawn and replaced by ECMA-48.  The ISO 6429 and
+# ECMA-48 standards are said to be almost identical, but are not the same
+# as X.364 (though for practical purposes they are close supersets of it).
+#
+# You can obtain ECMA-48 for free by sending email to helpdesk@ecma.ch
+# requesting the standard(s) you want (i.e. ECMA-48, "Control Functions for
+# Coded Character Sets"), include your snail-mail address, and you should
+# receive the document in due course.  Don't expect an email acknowledgement.
+#
+# Related standards include "X3.4-1977: American National Standard Code for
+# Information Interchange" (the ASCII standard) and "X3.41.1974: 
+# Code-Extension Techniques for Use with the 7-Bit Coded Character Set of
+# American National Standard for Information Interchange."
+#
+
+#### ANSI/VT100
 #
 # ANSI Standard (X3.64) Control Sequences for Video Terminals and Peripherals
 # 
@@ -8922,7 +9004,7 @@ ttywilliams:\
 # Richard Shuford, based on a 1984 Byte article.  Terminfo correspondences
 # and discussion of some terminfo-related issues have been added.
 #
-# The table is a complete list of the defined ANSI X.364 control sequences.
+# The table is a complete list of the defined ANSI X3.64 control sequences.
 # In the main table, \E stands for an escape (\033) character, SPC for space.
 # Pn stands for a single numeric parameter to be inserted in decimal ASCII.
 # Ps stands for a list of such parameters separated by semicolons
@@ -9111,26 +9193,6 @@ ttywilliams:\
 # its effect can always be predicted. The familiar characters carriage
 # return, linefeed, formfeed, etc., are defined as format effectors.
 #
-# The ANSI Standard
-# 
-# The complete document describing the standard,  "ANSI X3.64-1979:
-# Additional Controls for Use with the American National Standard
-# Code for Information Interchange," can be ordered for $13.50 (plus
-# $4 postage) from
-# 
-#      Standards Sales Department
-#      American National Standards Institute
-#      1430 Broadway
-#      New York, NY 10018
-#      212/354-3300
-# 
-# It's best to read the full standard before using it. It also helps
-# to have copies of the related standards "X3.4-1977: American
-# National Standard Code for Information Interchange" (the ASCII
-# standard) and "X3.41.1974: Code-Extension Techniques for Use with
-# the 7-Bit Coded Character Set of American National Standard for
-# Information Interchange."
-# 
 # NOTES ON THE DEC VT100 IMPLEMENTATION
 # 
 # Control sequences implemented in the VT100 are as follows:
@@ -9148,6 +9210,9 @@ ttywilliams:\
 #      Erase from cursor to end of screen         Esc [ 0 J    or Esc [ J
 #      Erase from beginning of screen to cursor   Esc [ 1 J
 #      Erase entire screen                        Esc [ 2 J
+#
+# Some brain-damaged terminal/emulators respond to Esc [ J as if it were
+# Esc [ 2 J, but this is wrong; the default is 0.
 # 
 # The VT100 responds to receiving the DA (Device Attributes) control
 # 
@@ -9171,11 +9236,12 @@ ttywilliams:\
 # where Pl is the line number and Pc is the column number (in decimal).
 # 
 # The specification for the DEC VT100 is document EK-VT100-UG-003.
+
+#### ANSI.SYS
 # 
-# NOTES ON `PC-TERM' COMPATIBILITY
-#
-# The MS-DOS ANSI.SYS driver has set the de-facto standard for attribute
-# and color values in the SGR string.  These are as follows:
+# 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.
 #
 # 0	all attributes off
 # 1	foreground bright
@@ -9191,15 +9257,94 @@ ttywilliams:\
 # 3n	set foreground color       / 0=black, 1=red,     2=green, 3=brown,
 # 4n	set background color       \ 4=blue,  5=magenta, 6=cyan,  7=white
 # Bright black becomes gray.  Bright brown becomes yellow,
-#	
+# These coincide with the prescriptions of the ISO 6429 standard.
+#
+# * If the 5 attribute is on and you set a background color (40-47) it is
+#   supposed to enable bright background.
+#
 # * Many VGA cards (such as the Paradise and compatibles) do the wrong thing
 #   when you try to set a "bright brown" (yellow) background with attribute
 #   5 (you get a blinking yellow foreground instead).  A few displays
 #   (including the System V console) support an attribute 6 that undoes this
-#   braindamage.
+#   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.
+#
+
+#### Intel Binary Compatibility Standard
+#
+# For comparison, here are the capabilities implied by the Intel Binary 
+# Compatibility Standard for UNIX systems (Intel order number 468366-001).
+# These recommendations are optional.  IBCS2 allows the leading escape to
+# be either the 7-bit \E[ given here or 8-bit (\0233), in accordance with
+# the ANSI X.364 standard.  Here are the iBCS2 capabilities (as described in
+# figure 9-3 of the standard).  Those expressed in the terminfo entry below
+# are followed with the corresponding capability in parens:
+#
+#	CSI <n>k	disable (n=0) or enable (n=1) keyclick
+#	CSI 2h   	lock keyboard
+#	CSI 2i  	send screen as input
+#	CSI 2l  	unlock keyboard
+#	CSI 6m  	enable background color intensity
+#	CSI <0-2>c	reserved
+#	CSI <0-59>m	select graphic rendition
+#	CSI <n>;<m>H	(cup) cursor to line n and column m
+#	CSI <n>;<m>f	cursor to line n and column m
+#	CSI <n>@	(ich) insert characters
+#	CSI <n>A	(cuu) cursor up n lines
+#	CSI <n>B	(cud) cursor down n lines
+#	CSI <n>C	(cuu) cursor right n characters
+#	CSI <n>D	(cud) cursor left n characters
+#	CSI <n>E	cursor down n lines and in first column
+#	CSI <n>F	cursor up n lines and in first column
+#	CSI <n>G	(hpa) position cursor at column n-1
+#	CSI <n>J	erase in display
+#	CSI <n>K	erase in line
+#	CSI <n>L	(il) insert line(s)
+#	CSI <n>P	(dch) delete characters
+#	CSI <n>S	(indn) scroll up n lines
+#	CSI <n>T	(rin) scroll down n lines
+#	CSI <n>X	(ech) erase characters
+#	CSI <n>Z	(cbt) back up n tab stops
+#	CSI <n>`	cursor to column n on line
+#	CSI <n>a	(cuu) cursor right n characters
+#	CSI <n>d	(vpa) cursor to line n
+#	CSI <n>e	cursor down n lines and in first column
+#	CSI <n>g	(cbt) clear all tabs
+#	CSI <n>z	make virtual terminal n active
+#	CSI ?7h 	turn automargin on
+#	CSI ?7l 	turn automargin off
+#	CSI s     	save cursor position
+#	CSI u   	restore cursor position to saved value
+#	CSI =<c>A	set overscan color
+#	CSI =<c>F	set normal foreground color
+#	CSI =<c>G	set normal background color
+#	CSI =<c>H	set reverse foreground color
+#	CSI =<c>I	set reverse foreground color
+#	CSI =<c>J	set graphic foreground color
+#	CSI =<c>K	set graphic foreground color
+#	CSI =<n>g	(dispc) display n from alternate graphics character set
+#	CSI =<p>;<d>B	set bell parameters
+#	CSI =<s>;<e>C	set cursor parameters
+#	CSI =<x>D	enable/disable intensity of background color
+#	CSI =<x>E	set/clear blink vs. bold background
+#	CSI 7     	(sc) save cursor position
+#	CSI 8   	(rc) restore cursor position to saved value
+#	CSI H		(hts) set tab stop
+#	CSI Q<n><string>	define function key string
+#				(string must begin and end with delimiter char)
+#	CSI c   	(clear) clear screen
+#
+# The lack of any specification for attributes in SGR (among other things)
+# makes this a wretchedly weak standard. The table above is literally 
+# everything iBSC2 has to say about terminal escape sequences; there is
+# no further discussion of their meaning or how to set the parameters
+# in these sequences at all.
+#
 
 ######## NONSTANDARD CAPABILITY TRANSLATIONS USED IN THIS FILE
 #
@@ -9252,26 +9397,26 @@ ttywilliams:\
 #	ie			end dim (not used in /etc/termcap)
 #	ig			dim glitch  (not used in /etc/termcap)
 #
-# XENIX also supposedly uses the following forms-drawing capabilities:
-#
-#	single	double type
-#	------	------	-------------
-#	gv	GV	vertical line (|)
-#	gh	GH	horizontal line (-)
-#	g1	G1	top right corner
-#	g4	G4	bottom right corner (_|)
-#	g2	G2	top left corner
-#	g3	G3	bottom left corner (|_)
-#	gd	GD	down-tick character (T)
-#	gl	GL	left-tick character (-|)
-#	gr	GR	right-tick character (|-)
-#	gc	GC	middle intersection (-|-)
-#	gu	GU	up-tick character (_|_)
-#
-# However, there is some confusion about case.  The scoansi entry uses
-# mixed-case versions of these, and the historical ibmpcx, lisa, trs16, and fos
-# entries have only the uppercase versions.  Accordingly, the ncurses tools
-# don't try to translate these.
+# Finally, XENIX also used the following forms-drawing capabilities:
+#
+#	single	double  type             ASCII approximation 
+#	------	------	-------------    -------------------
+#	GV	Gv	vertical line             |
+#	GH	Gv	horizontal line       -   _
+#	G1	G5	top right corner       _   |
+#	G2	G6	top left corner       | 
+#	G3	G7	bottom left corner         |_
+#	G4	G8	bottom right corner   _|
+#	GD	Gd	down-tick character        T
+#	GL	Gl	left-tick character   -|
+#	GR	Gr	right-tick character       |-
+#	GC	Gc	middle intersection   -|-
+#	GU	Gu	up-tick character          _|_
+#
+# 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}"
+# The double forms characters don't fit the SVr4 terminfo model.
 #
 # AT&T Extensions:
 #
@@ -9284,6 +9429,43 @@ ttywilliams:\
 # FL=:LO: (enable soft labels), FE=:LF: (disable soft labels), CI=:vi: (make
 # cursor invisible), and CV=:ve: (make cursor normal).
 #
+# HP Extensions
+#
+# The HP library (as of mid-1995, their term.h file version 70.1) appears to
+# have the System V capabilities up to SVr1 level.  After that, it supports
+# two nonstandard caps meml and memu corresponding to the old termcap :ml:,
+# :mu: capabilities.  After that, it supports caps plab_norm, label_on,
+# label_off, and key_f11..key_f63 capabilities like SVr4's.  This makes the
+# HP binary format incompatible with SVr4's.
+#
+# IBM Extensions
+#
+# There is a set of nonstandard terminfos used by IBM's AIX operating system.
+# The AIX terminfo library diverged from SVr1 terminfo, and replaces all
+# capabilities following prtr_non with the following special capabilties:
+# box[12], batt[12], colb[0123456789], colf[0123456789], f[01234567], kbtab,
+# kdo, kcmd, kcpn, kend, khlp, knl, knpn, kppn, kppn, kquit, ksel, kscl, kscr,
+# ktab, kmpf[123456789], apstr, ksf1..ksf10, kf11...kf63, kact, topl, btml,
+# rvert, lvert.   Some of these are identical to XPG4/SVr4 equivalents:
+# kcmd, kend, khlp, and kf11...kf63.  Two others (kbtab and ksel) can be
+# renamed (to kcbt and kslt).  The places in the box[12] capabilities
+# correspond to acsc chars, here is the mapping:
+#
+#	box1[0]  = ACS_ULCORNER
+#	box1[1]  = ACS_HLINE	
+#	box1[2]  = ACS_URCORNER
+#	box1[3]  = ACS_VLINE
+#	box1[4]  = ACS_LRCORNER
+#	box1[5]  = ACS_LLCORNER
+#	box1[6]  = ACS_TTEE
+#	box1[7]  = ACS_RTEE
+#	box1[8]  = ACS_BTEE
+#	box1[9]  = ACS_LTEE
+#	box1[10] = ACS_PLUS
+#
+# The box2 characters are the double-line versions of these forms graphics.
+# The AIX binary terminfo format is incompatible with SVr4's.
+#
 # TC Extensions:
 #
 # There is a set of extended termcaps associated with something
@@ -9291,9 +9473,31 @@ ttywilliams:\
 # Winfield Kansas.  This one also uses GS/GE for as/ae, and also uses
 # CF for civis and CO for cvvis.  Finally, they define a boolean :ct:
 # that flags color terminals.
-
+#
 ######## CHANGE HISTORY
 #
+# The last /etc/termcap version maintained by John Kunze was 8.3, dated 8/5/94.
+# Releases 9 and up are maintained by Eric S. Raymond as part of the ncurses
+# project.
+#
+# This file contains all the capability information present in John Kunze's
+# last version of the termcap master file, except as noted in the change 
+# comments at end of file.  Some information about very ancient obsolete
+# capabilities has been moved to comments.  Some all-numeric names of older
+# terminals have been retired.
+#
+# I changed :MT: to :km: (the 4.4BSD name) everywhere.  I commented out some
+# capabilities (EP, dF, dT, dV, kn, ma, ml, mu, xr, xx) that are no longer
+# used by BSD curses.
+#
+# The 9.1.0 version of this file was translated from my lightly-edited copy of
+# 8.3, then mechanically checked against 8.3 using Emacs Lisp code written for
+# the purpose.  Unless the ncurses tic implementation and the Lisp code were
+# making perfectly synchronized mistakes which I then failed to catch by
+# eyeball, the translation was correct and perfectly information-preserving.
+#
+# Here is a log of the changes since then:
+#
 # 9.1.0 (Wed Feb  1 04:50:32 EST 1995):
 #	* First terminfo master translated from 8.3.
 # 9.2.0 (Wed Feb  1 12:21:45 EST 1995):
@@ -9414,7 +9618,6 @@ ttywilliams:\
 #	* Regularize Prime terminal names.
 #	* Historical data on Synertek.
 #	* Freeze for ncurses-1.9.1.
-#
 # 9.6.1 (Sat May  6 02:00:52 EDT 1995):
 #	* Added true xterm-color entry, renamed djm's pseudo-color entry.
 #	* Eliminate whitespace in short name fields, this tanks some scripts.
@@ -9423,7 +9626,6 @@ ttywilliams:\
 #	  when ich1/ich is present (copes with an ancient vi bug).
 #	* Added `screen' entries from FSF's screen-3.6.2.
 #	* Added linux-nic and xterm-nic entries.
-#
 # 9.6.2 (Sat May  6 17:00:55 EDT 1995):
 #	* Change linux entry to use smacs=\E[11m and have an explicit acsc,
 #	  eliminating some special-case code in ncurses.
@@ -9464,6 +9666,121 @@ ttywilliams:\
 #	* Added Adam Thompson's VT320 entries, also his dtx-sas and z340.
 #	* Minor surgery, mostly on name strings, to shorten termcap version.
 #
+# 9.9.0 (Sat Sep 16 23:03:48 EDT 1995):
+#	* Added dec-vt100 for use with the EWAN emulator.
+#	* Added kmous to xterm for use with xterm's mouse-tracking facility.
+#	* Freeze for 1.9.5 alpha release.
+# 9.9.1 (Wed Sep 20 13:46:09 EDT 1995):
+#	* Changed xterm lines to 24, the X11R6 default.
+# 9.9.2 (Sat Sep 23 21:29:21 EDT 1995):
+#	* Added 7 newly discovered, undocumented acsc characters to linux
+#	  entry (the pryz{|} characters).
+#	* ncurses no longer steals A_PROTECT.  Simplify linux sgr accordingly.
+#	* Correct two typos in the xterm entries introduced in 9.9.1.
+#	* I finally figured out how to translate ko capabilities.  Done.
+#	* Added tvi921 entries from Tim Theisen.
+#	* Cleanup: dgd211 -> dg211, adm42-nl -> adm42-nsl.
+#	* Removed mystery tec entry, it was neither interesting nor useful.
+#	* shortened altos3, qvt203, tvi910+, tvi92D, tvi921-g, tvi955, vi200-f,
+#	  vi300-ss, att505-24, contel301, dm3045, f200vi, pe7000c, vc303a,
+#	  trs200, wind26, wind40, wind50, cdc456tst, dku7003, f110, dg211,
+#	  by making them relative to use capabilities
+#	* Added cuf1=^L to tvi925 from deleted variant tvi925a.
+#	* fixed cup in adm22 entry and parametrized strings in vt320-k3.
+#	* added it#8 to entries that used to have :pt: -- tvi912, vi200,
+#	  ampex80,
+#	* Translate all home=\E[;H capabilities to home=\E[H, they're 
+#	  equivalent.
+#	* Translate \E[0m -> \E[m in [rs]mso, [rs]mul, and init strings of
+#	  vt100 and ANSI-like terminals.
+# 9.9.3 (Tue Sep 26 20:11:15 EDT 1995):
+#	* Added it#8 and ht=\t to *all* entries with :pt:; the ncurses tic
+#	  does this now, too.
+#	* fviewpoint is gone, it duplicated screwpoint.
+#	* Added hp2627, graphos, graphos-30, hpex, ibmega, ibm8514, ibm8514-c,
+#	  ibmvga, ibmvga-c, minix, mm340, mt4520-rv, screen2, screen3, 
+#	  versaterm, vi500, vsc, vt131, vt340, vt400 entries from UW.
+#	  The UW vi50 replaces the old one, which becomes vi50adm,
+#	* No more embedded commas in name fields.
+#
+# 9.10.0 (Wed Oct  4 15:39:37 EDT 1995):
+#	* XENIX forms characters in fos, trs16, scoansi become acsc strings,
+#	* Introduced klone+* entries for describing Intel-console behavior.
+#	* Linux kbs is default-mapped to delete for some brain-dead reason.
+#	* -nsl -> -ns.  The -pp syntax is obsolete.
+#	* Eliminate [A-Z]* primaries in accordance with SVr4 terminfo docs.
+#	* Make xterm entry do application-keypad mode again.  I got complaints
+#	  that it was messing up someone's 3270 emulator.
+#	* Added some longname fields in order to avoid warning messages from
+#	  older tic implementations.
+#	* According to ctrlseqs.ms, xterm has a full vt100 graphics set.  Use
+#	  it! (This gives us pi, greater than, less than, and a few more.)
+#	* Freeze for ncurses-1.9.6 release.
+# 9.10.1 (Sat Oct 21 22:18:09 EDT 1995):
+#	* Add xon to a number of console entries, they're memory-mapped and
+#	  don't need padding.
+#	* Correct the use dependencies in the ansi series.
+#	* Hand-translate more XENIX capabilities.
+#	* Added hpterm entry for HP's X terminal emulator.
+#	* Added aixterm entries.
+#	* Shortened four names so everything fits in 14 chars.  
+#
+# 9.11.0 (Thu Nov  2 17:29:35 EST 1995):
+#	* Added ibcs2 entry and info on iBCS2 standard.
+#	* Corrected hpa/vpa in linux entry.  They still fail the worm test.
+#	* We can handle the HP meml/memu capability now.
+#	* Added smacs to klone entries, just as documentation.
+#	* Carrected ansi.sys and cit-500 entries.
+#	* Added z39, vt320-k311, v220c, and avatar entries.
+#	* Make pcansi use the ansi.sys invis capability.
+#	* Added DIP switch descriptions for vt100, adm31, tvi910, tvi920c,
+#	  tvi925, tvi950, dt80, ncr7900i, h19.
+#	* X3.64 has been withdrawn, change some references.
+#	* Removed function keys from ansi-m entry.
+#	* Corrected ansi.sys entry.
+#	* Freeze for ncurses-1.9.7 release.
+#
+# 9.11.1 (Tue Nov  6 18:18:38 EST 1995):
+#	* Added rmam/smam capabilities to many entries based on init strings.
+#	* Added correct hpa/vpa to linux.
+#	* Reduced several entries relative to vt52.
+#
+# 9.11.2 (Tue Nov  7 00:21:06 EST 1995):
+#	* Exiled some utterly unidentifiable custom and homebrew types to the
+#	  UFO file; also, obsolete small-screen hardware; also, entries which
+#	  look flat-out incorrect, garbled, or redundant.  These include the
+#	  following entries: carlock, cdc456tst, microkit, qdss, ramtek, tec, 
+#	  tec400, tec500, ubell, wind, wind16, wind40, wind50, plasma, agile,
+#	  apple, bch, daleblit, nucterm, ttywilliams, nuterminal, nu24, bnu,
+#	  fnu, nunix-30, nunix-61, exidy, ex3000, sexidy, pc52, sanyo55, 
+#	  yterm10, yterm11, yterm10nat, aed, aed-ucb, compucolor, compucolor2, 
+#	  vic20, dg1, act5s, netx, smartvid, smarterm, sol, sol2, dt200, 
+#	  trs80, trs100, trs200, trs600, xitex, rsvidtx, vid, att2300-x40, 
+#	  att2350-x40, att4410-nfk, att5410-ns, otty5410, att5425-nl-w, 
+#	  tty5425-fk, tty5425-w-fk, cita, c108-na, c108-rv-na, c100-rv-na, 
+#	  c108-na-acs, c108-rv-na-acs, ims950-ns, infotonKAS, ncr7900i-na, 
+#	  regent60na, scanset-n, tvi921-g, tvi925n, tvi925vbn, tvi925vb, 
+#	  vc404-na, vc404-s-na, vt420nam, vt420f-nam, vt420pc-nam, vt510nam, 
+#	  vt510pc-nam, vt520nam, vt525nam, xterm25, xterm50, xterm65, xterms.
+#	* Corrected pcvt25h as suggested by Brian C. Grayson
+#	  <bgrayson@pine.ece.utexas.edu>.
+#
+# 9.11.3 (Thu Nov  9 12:14:40 EST 1995):
+#	* Added kspd=\E[P, kcbt=\E[Z, to linux entry, changed kbs back to ^H. 
+#	* Added kent=\EOM to xterm entry.
+#
+# 9.11.4 (Fri Nov 10 08:31:35 EST 1995):
+#	* Corrected gigi entry.
+#	* Restored cuf/cud1 to xterm, their apparent bugginess was due to
+#	  bad hpa/vpa capabilities.
+#	* Corrected flash strings to have a uniform delay of .2 sec.  No
+#	  more speed-dependent NUL-padding!
+#	* terminfo capabilities in comments bracketed with <>.
+#
+# 9.11.5 (Fri Nov 10 15:35:02 EST 1995):
+#	* Replaced pcvt with the 3.11 pcvt entries.
+#	* Freeze for 1.9.7a.
+#
 ######## REORDER
 #
 # Older termcap distributions featured a kluge called `reorder' intended to