Update to xterm 267. Tested by shadchin@, jasper@, ajacoutot@.

27 files changed, 1962 insertions, 1214 deletions

diff --git a/app/xterm/MANIFEST b/app/xterm/MANIFEST
index 5f049085c..c5e1d32ec 100644
--- a/app/xterm/MANIFEST
+++ b/app/xterm/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-264, version xterm-264
+MANIFEST for xterm-267, version xterm-267
 --------------------------------------------------------------------------------
 MANIFEST                        this file
 256colres.h                     resource-definitions for 256-color mode
@@ -115,6 +115,21 @@ icons/xterm_32x32.xcf           gimp file, for editing 32x32 icon
 icons/xterm_32x32.xpm           32x32 monochrome icon
 icons/xterm_48x48.xcf           gimp file, for editing 48x48 icon
 icons/xterm_48x48.xpm           48x48 monochrome icon
+package/debian                  subdirectory
+package/debian/changelog        build-script
+package/debian/color.sed        build-script
+package/debian/compat           build-script
+package/debian/control          build-script
+package/debian/copyright        build-script
+package/debian/rules            build-script
+package/debian/source           subdirectory
+package/debian/source/format    build-script
+package/debian                  subdirectory
+package/debian/watch            build-script
+package/debian/xterm-dev.docs   build-script
+package/debian/xterm-xres.sed   build-script
+package                         subdirectory
+package/xterm.spec              build-script
 tektests                        subdirectory
 tektests/aitest.tek             tek4014 demo: draw a globe
 tektests/dmerc.tek              tek4014 demo: draws a Mercator projection with orbit
diff --git a/app/xterm/THANKS b/app/xterm/THANKS
index ae3dbfc1b..424dfa2cc 100644
--- a/app/xterm/THANKS
+++ b/app/xterm/THANKS
@@ -1,4 +1,4 @@
--- $XTermId: THANKS,v 1.1 2009/10/11 17:30:42 tom Exp $
+-- $XTermId: THANKS,v 1.2 2010/10/24 17:46:47 tom Exp $
 -- vile:txtmode fk=8bit
 There's no AUTHORS file in this distribution; it would be redundant since
 I (Thomas E. Dickey) have done more than 80% of the work on xterm since 1996.
@@ -10,6 +10,7 @@ For some insight, see
 
 Here's a list from xterm.log.html of people who have contributed changes.
 
+Adam M Costello
 Adam Sulmicki
 Alan Coopersmith
 Alex Hornung
@@ -17,6 +18,7 @@ Alexander Pohoyda
 Alexander V Lukyanov
 Andrea Odetti
 Andreas Jaeger
+Andreas Schwab
 Andrew Sumner
 Andrew Tipton
 Anton Kovalenko
@@ -30,6 +32,8 @@ Bram Moolenaar
 Branden Robinson
 Bruno Haible
 Caetano Jimenez Carezzato
+Chris Adams
+Chris Clayton
 Christian Biere
 Christian Weisgerber
 Chuck Blake
@@ -44,6 +48,7 @@ David Mathog
 David Wood
 David Yeo
 Denis Zaitsev
+Dennis Preiser
 Dennis Schneider
 Dr Werner Fink
 Ed Schouten
@@ -72,9 +77,11 @@ Jeff Chua
 Jeff Uphoff
 Jens Schweikhardt
 Jeremy Buhler
+Jeremy Huddleston
 Jeroen Ruigrok
 Jess Thrysoee
 Jim Paris
+Jochen Voss
 Joe Allen
 Joe Peterson
 Johnny Billquist
@@ -86,6 +93,7 @@ Kean Johnston
 Keith Packard
 Ken Martin
 Kevin Buhr
+Kevin Schoedel
 Kiyokazu Suto
 Larry Riedel
 Lee Olsen
@@ -100,6 +108,7 @@ Matthias Scheler
 Matthieu Herrb
 Matthieu Lagouge
 Max Mikhanosha
+Michael Riepe
 Michael Rohleder
 Michael Schroeder
 Mike Castle
@@ -127,6 +136,7 @@ Robert Brady
 Robert Earl
 Robin Cutshaw
 Ross Paterson
+Ryan Johnson
 Scott Sewall
 Semen A Ustimenko
 Sergei Laskavy
diff --git a/app/xterm/button.c b/app/xterm/button.c
index abaa880b0..fee568121 100644
--- a/app/xterm/button.c
+++ b/app/xterm/button.c
@@ -1,4 +1,4 @@
-/* $XTermId: button.c,v 1.389 2010/10/13 09:37:08 tom Exp $ */
+/* $XTermId: button.c,v 1.391 2010/11/11 11:50:13 tom Exp $ */
 
 /*
  * Copyright 1999-2009,2010 by Thomas E. Dickey
@@ -180,9 +180,10 @@ EmitMousePosition(TScreen * screen, Char line[], unsigned count, int value)
 		       ? EXT_MOUSE_LIMIT
 		       : MOUSE_LIMIT);
 
-    /* Add pointer position to key sequence
-
-     * In extended mode we encode large positions as two-byte UTF-8 
+    /*
+     * Add pointer position to key sequence
+     *
+     * In extended mode we encode large positions as two-byte UTF-8.
      *
      * NOTE: historically, it was possible to emit 256, which became
      * zero by truncation to 8 bits. While this was arguably a bug,
@@ -211,29 +212,30 @@ SendMousePosition(XtermWidget xw, XEvent * event)
     switch (screen->send_mouse_pos) {
     case MOUSE_OFF:
 	/* If send_mouse_pos mode isn't on, we shouldn't be here */
-	return False;
+	break;
 
     case BTN_EVENT_MOUSE:
     case ANY_EVENT_MOUSE:
-	/* xterm extension for motion reporting. June 1998 */
-	/* EditorButton() will distinguish between the modes */
-	switch (event->type) {
-	case MotionNotify:
-	    my_event->button = 0;
-	    /* FALLTHRU */
-	case ButtonPress:
-	    /* FALLTHRU */
-	case ButtonRelease:
-	    EditorButton(xw, my_event);
-	    result = True;
-	    break;
+	if (KeyModifiers(event) == 0 || KeyModifiers(event) == ControlMask) {
+	    /* xterm extension for motion reporting. June 1998 */
+	    /* EditorButton() will distinguish between the modes */
+	    switch (event->type) {
+	    case MotionNotify:
+		my_event->button = 0;
+		/* FALLTHRU */
+	    case ButtonPress:
+		/* FALLTHRU */
+	    case ButtonRelease:
+		EditorButton(xw, my_event);
+		result = True;
+		break;
+	    }
 	}
 	break;
 
     default:
 	/* Make sure the event is an appropriate type */
 	if (IsBtnEvent(event)) {
-
 	    switch (screen->send_mouse_pos) {
 	    case X10_MOUSE:	/* X10 compatibility sequences */
 
@@ -315,7 +317,6 @@ SendLocatorPosition(XtermWidget xw, XButtonEvent * event)
 
     /* Make sure the event is an appropriate type */
     if ((!IsBtnEvent(event) &&
-
 	 !screen->loc_filter) ||
 	(BtnModifiers(event) != 0 && BtnModifiers(event) != ControlMask))
 	return (False);
@@ -1116,54 +1117,18 @@ HandleKeyboardSelectEnd(Widget w,
 }
 
 /*
- * Like "select-end" (optionally copies the selection to the given targets),
- * but also sets the modes so that releasing the mouse button or moving the
- * mouse does not alter the selection.
+ * Copy the selection data to the given target(s).
  */
-static void
-do_select_stop(XtermWidget xw,
-	       XEvent * event,	/* must be XButtonEvent */
-	       String * params,	/* selections */
-	       Cardinal *num_params,
-	       Bool use_cursor_loc)
-{
-    TScreen *screen = TScreenOf(xw);
-
-    screen->selection_time = event->xbutton.time;
-    switch (screen->eventMode) {
-    case NORMAL:
-	(void) SendMousePosition(xw, event);
-	break;
-    case LEFTEXTENSION:
-    case RIGHTEXTENSION:
-	EndExtend(xw, event, params, *num_params, use_cursor_loc);
-	break;
-    }
-}
-
-void
-HandleSelectStop(Widget w,
-		 XEvent * event,	/* must be XButtonEvent */
-		 String * params,	/* selections */
-		 Cardinal *num_params)
-{
-    XtermWidget xw;
-
-    if ((xw = getXtermWidget(w)) != 0) {
-	do_select_stop(xw, event, params, num_params, False);
-    }
-}
-
 void
-HandleKeyboardSelectStop(Widget w,
-			 XEvent * event,	/* must be XButtonEvent */
-			 String * params,	/* selections */
-			 Cardinal *num_params)
+HandleCopySelection(Widget w,
+		    XEvent * event,
+		    String * params,	/* list of targets */
+		    Cardinal *num_params)
 {
     XtermWidget xw;
 
     if ((xw = getXtermWidget(w)) != 0) {
-	do_select_stop(xw, event, params, num_params, True);
+	SelectSet(xw, event, params, *num_params);
     }
 }
 
diff --git a/app/xterm/charproc.c b/app/xterm/charproc.c
index fd8b57573..098e47272 100644
--- a/app/xterm/charproc.c
+++ b/app/xterm/charproc.c
@@ -1,4 +1,4 @@
-/* $XTermId: charproc.c,v 1.1086 2010/10/13 23:04:01 tom Exp $ */
+/* $XTermId: charproc.c,v 1.1091 2010/11/11 11:41:26 tom Exp $ */
 
 /*
 
@@ -277,6 +277,7 @@ static XtActionsRec actionsList[] = {
     { "allow-send-events",	HandleAllowSends },
     { "bell",			HandleBell },
     { "clear-saved-lines",	HandleClearSavedLines },
+    { "copy-selection",		HandleCopySelection },
     { "create-menu",		HandleCreateMenu },
     { "delete-is-del",		HandleDeleteIsDEL },
     { "dired-button",		DiredButton },
@@ -300,16 +301,10 @@ static XtActionsRec actionsList[] = {
     { "select-cursor-end",	HandleKeyboardSelectEnd },
     { "select-cursor-extend",   HandleKeyboardSelectExtend },
     { "select-cursor-start",	HandleKeyboardSelectStart },
-#if 0
-    { "select-cursor-stop",	HandleKeyboardSelectStop },
-#endif
     { "select-end",		HandleSelectEnd },
     { "select-extend",		HandleSelectExtend },
     { "select-set",		HandleSelectSet },
     { "select-start",		HandleSelectStart },
-#if 0
-    { "select-stop",		HandleSelectStop },
-#endif
     { "send-signal",		HandleSendSignal },
     { "set-8-bit-control",	Handle8BitControl },
     { "set-allow132",		HandleAllow132 },
@@ -6383,13 +6378,13 @@ VTInitialize(Widget wrequest,
 #define DefaultFontNames TScreenOf(wnew)->menu_font_names[fontMenu_default]
     init_Sres(misc.default_font.f_n);
     init_Sres(misc.default_font.f_b);
-    DefaultFontNames[fNorm] = wnew->misc.default_font.f_n;
-    DefaultFontNames[fBold] = wnew->misc.default_font.f_b;
+    DefaultFontNames[fNorm] = x_strdup(wnew->misc.default_font.f_n);
+    DefaultFontNames[fBold] = x_strdup(wnew->misc.default_font.f_b);
 #if OPT_WIDE_CHARS
     init_Sres(misc.default_font.f_w);
     init_Sres(misc.default_font.f_wb);
-    DefaultFontNames[fWide] = wnew->misc.default_font.f_w;
-    DefaultFontNames[fWBold] = wnew->misc.default_font.f_wb;
+    DefaultFontNames[fWide] = x_strdup(wnew->misc.default_font.f_w);
+    DefaultFontNames[fWBold] = x_strdup(wnew->misc.default_font.f_wb);
 #endif
     TScreenOf(wnew)->MenuFontName(fontMenu_fontescape) = NULL;
     TScreenOf(wnew)->MenuFontName(fontMenu_fontsel) = NULL;
@@ -6458,13 +6453,17 @@ VTInitialize(Widget wrequest,
 	 * can be overridden to make these true resources.
 	 */
 	if (i >= MIN_ANSI_COLORS && i < NUM_ANSI_COLORS) {
-	    TScreenOf(wnew)->Acolors[i].resource
-		= ((char *) fake_resources[i - MIN_ANSI_COLORS].default_addr);
+	    TScreenOf(wnew)->Acolors[i].resource =
+		x_strtrim(fake_resources[i - MIN_ANSI_COLORS].default_addr);
 	    if (TScreenOf(wnew)->Acolors[i].resource == 0)
 		TScreenOf(wnew)->Acolors[i].resource = XtDefaultForeground;
 	} else
 #endif /* OPT_COLOR_RES2 */
+	{
 	    TScreenOf(wnew)->Acolors[i] = TScreenOf(request)->Acolors[i];
+	    TScreenOf(wnew)->Acolors[i].resource =
+		x_strtrim(TScreenOf(wnew)->Acolors[i].resource);
+	}
 
 #if OPT_COLOR_RES
 	TRACE(("Acolors[%d] = %s\n", i, TScreenOf(wnew)->Acolors[i].resource));
@@ -8424,7 +8423,7 @@ set_character_class(char *s)
     int base;			/* 8, 10, 16 (octal, decimal, hex) */
     int numbers;		/* count of numbers per range */
     int digits;			/* count of digits in a number */
-    static const char *errfmt = "%s:  %s in range string \"%s\" (position %d)\n";
+    static const char errfmt[] = "%s:  %s in range string \"%s\" (position %d)\n";
 
     if (!s || !s[0])
 	return -1;
@@ -8641,17 +8640,17 @@ DoSetSelectedFont(Widget w,
 	    memcpy(val, value, (size_t) len);
 	    val[len] = '\0';
 	    used = x_strtrim(val);
-	    TRACE(("DoSetSelectedFont(%s)\n", val));
+	    TRACE(("DoSetSelectedFont(%s)\n", used));
 	    /* Do some sanity checking to avoid sending a long selection
 	       back to the server in an OpenFont that is unlikely to succeed.
 	       XLFD allows up to 255 characters and no control characters;
 	       we are a little more liberal here. */
 	    if (len < 1000
-		&& !strchr(val, '\n')
-		&& (test = x_strdup(val)) != 0) {
+		&& !strchr(used, '\n')
+		&& (test = x_strdup(used)) != 0) {
 		TScreenOf(xw)->MenuFontName(fontMenu_fontsel) = test;
 		if (!xtermLoadFont(term,
-				   xtermFontName(val),
+				   xtermFontName(used),
 				   True,
 				   fontMenu_fontsel)) {
 		    failed = True;
@@ -8668,8 +8667,7 @@ DoSetSelectedFont(Widget w,
 				     oldFont);
 		Bell(xw, XkbBI_MinorError, 0);
 	    }
-	    if (used != val)
-		free(used);
+	    free(used);
 	    free(val);
 	}
     }
diff --git a/app/xterm/configure.in b/app/xterm/configure.in
index 08383b08d..06104314b 100644
--- a/app/xterm/configure.in
+++ b/app/xterm/configure.in
@@ -1,4 +1,4 @@
-dnl $XTermId: configure.in,v 1.266 2010/06/15 22:30:01 tom Exp $
+dnl $XTermId: configure.in,v 1.267 2010/11/09 01:00:48 tom Exp $
 dnl
 dnl -----------------------------------------------------------------------------
 dnl this file is part of xterm
@@ -551,7 +551,7 @@ CF_ARG_DISABLE(freetype,
 	[enable_freetype=yes])
 AC_MSG_RESULT($enable_freetype)
 if test "$enable_freetype" = yes ; then
-	CF_X_FREETYPE
+	CF_X_FONTCONFIG
 else
 	CPPFLAGS=`echo "$CPPFLAGS" | sed -e s/-DXRENDERFONT//`
 fi
diff --git a/app/xterm/ctlseqs.ms b/app/xterm/ctlseqs.ms
index 2531cf00e..a1118b919 100644
--- a/app/xterm/ctlseqs.ms
+++ b/app/xterm/ctlseqs.ms
@@ -1,6 +1,6 @@
 .\"#! troff -ms $1		-*- Nroff -*-
 .\" "Xterm Control Sequences" document
-.\" $XTermId: ctlseqs.ms,v 1.221 2010/08/26 08:26:09 tom Exp $
+.\" $XTermId: ctlseqs.ms,v 1.235 2010/11/19 00:51:33 tom Exp $
 .\"
 .\"
 .\" Copyright 1996-2009,2010 by Thomas E. Dickey
@@ -63,29 +63,50 @@
 .\" Originally written by Edward Moy, University of California,
 .\" Berkeley, edmoy@violet.berkeley.edu, for the X.V10R4 xterm.
 .\" The X Consortium staff has since updated it for X11.
-.\" Updated by Thomas E. Dickey for XFree86 3.2 - XFree86 4.3
+.\" Updated by Thomas E. Dickey for XFree86 3.2 - XFree86 4.3, and afterward.
 .\"
 .\" Run this file through troff and use the -ms macro package.
 .\"
 .if n .pl 9999v		\" no page breaks in nroff
 .ND
+.\" Start a list of controls
 .de St
 .sp
 .nr PD 0
 .nr PI 1.0i
 .nr VS 16
 ..
+.\" End a list of controls
 .de Ed
 .nr PD .3v
 .nr VS 12
 ..
+.\" Bulleted paragraph
 .de bP
 .IP \(bu 4
 ..
+.\" Normal leading paragraph
 .de lP
-.sp
+.if n .sp
 .LP
 ..
+.\" Normal internal paragraph
+.de sP
+.if n .sp
+.if t .sp 0.5
+..
+.\" Section header
+.de Sh
+.ds RH \\$1
+.br
+.SH
+\\$1
+..
+.\" Subsection header
+.de Ss
+.LP
+.B
+..
 .ds CH \" as nothing
 .ds LH Xterm Control Sequences
 .nr s 6*\n(PS/10
@@ -264,6 +285,7 @@
 .ds Pe \fIP\v'.3m'\h'-.2m'\s-2e\s0\v'-.3m'\fP
 .ds Pl \fIP\v'.3m'\h'-.2m'\s-2l\s0\v'-.3m'\fP
 .ds Pm \fIP\v'.3m'\h'-.2m'\s-2m\s0\v'-.3m'\fP
+.ds Pn \fIP\v'.3m'\h'-.2m'\s-2n\s0\v'-.3m'\fP
 .ds Pp \fIP\v'.3m'\h'-.2m'\s-2p\s0\v'-.3m'\fP
 .ds Pr \fIP\v'.3m'\h'-.2m'\s-2r\s0\v'-.3m'\fP
 .ds Ps \fIP\v'.3m'\h'-.2m'\s-2s\s0\v'-.3m'\fP
@@ -301,8 +323,7 @@ invisible-island.net (2006-2010)
 .am BT                  \" add page numbers after first page
 .ds CF %
 ..
-.SH
-Definitions
+.Sh "Definitions"
 .IP \*(Sc
 The literal character \fIc\fP.
 .IP \*(Cc
@@ -316,60 +337,56 @@ Individual values for the parameters are listed with \*(Ps .
 .IP \*(Pt
 A text parameter composed of printable characters.
 .
-.SH
-C1 (8-Bit) Control Characters
-.ds RH C1 (8-Bit) Control Characters
+.Sh "C1 (8-Bit) Control Characters"
 .LP
 The \fIxterm\fP program recognizes both 8-bit and 7-bit control characters.
 It generates 7-bit controls (by default) or 8-bit if S8C1T is enabled.
 The following pairs of 7-bit and 8-bit control characters are equivalent:
 .St
 .IP \\*(Es\\*D
-Index (\*(ID is 0x84)
+Index (\*(ID is 0x84).
 .IP \\*(Es\\*E
-Next Line (\*(Nl is 0x85)
+Next Line (\*(Nl is 0x85).
 .IP \\*(Es\\*H
-Tab Set (\*(Ht is 0x88)
+Tab Set (\*(Ht is 0x88).
 .IP \\*(Es\\*M
-Reverse Index (\*(RI is 0x8d)
+Reverse Index (\*(RI is 0x8d).
 .IP \\*(Es\\*N
-Single Shift Select of G2 Character Set (\*(S2 is 0x8e): affects next character only
+Single Shift Select of G2 Character Set (\*(S2 is 0x8e).  This affects next character only.
 .IP \\*(Es\\*O
-Single Shift Select of G3 Character Set (\*(S3 is 0x8f): affects next character only
+Single Shift Select of G3 Character Set (\*(S3 is 0x8f).  This affects next character only.
 .IP \\*(Es\\*P
-Device Control String (\*(Dc is 0x90)
+Device Control String (\*(Dc is 0x90).
 .IP \\*(Es\\*V
-Start of Guarded Area (\*(Sg is 0x96)
+Start of Guarded Area (\*(Sg is 0x96).
 .IP \\*(Es\\*W
-End of Guarded Area (\*(Eg is 0x97)
+End of Guarded Area (\*(Eg is 0x97).
 .IP \\*(Es\\*(XX
-Start of String (\*(SS is 0x98)
+Start of String (\*(SS is 0x98).
 .IP \\*(Es\\*Z
 Return Terminal ID (DECID is 0x9a).
 Obsolete form of \*(Cs\*c (DA).
 .IP \\*(Es\\*([[
-Control Sequence Introducer (\*(Cs is 0x9b)
+Control Sequence Introducer (\*(Cs is 0x9b).
 .IP \\*(Es\\*(bS
-String Terminator (\*(ST is 0x9c)
+String Terminator (\*(ST is 0x9c).
 .IP \\*(Es\\*(]]
-Operating System Command (\*(Os is 0x9d)
+Operating System Command (\*(Os is 0x9d).
 .IP \\*(Es\\*^
-Privacy Message (\*(PM is 0x9e)
+Privacy Message (\*(PM is 0x9e).
 .IP \\*(Es\\*_
-Application Program Command (\*(AP is 0x9f)
+Application Program Command (\*(AP is 0x9f).
 .Ed
 .sp
 .LP
 These control characters are used in the vtXXX emulation.
 .
-.SH
-VT100 Mode
-.ds RH VT100 Mode
+.Sh "VT100 Mode"
 .LP
 Most of these control sequences are standard VT102 control sequences,
 but there is support for later DEC VT terminals (i.e., VT220, VT320, VT420),
 as well as ISO 6429 and \fIaixterm\fP color controls.
-The only VT102 features not supported is auto-repeat,
+The only VT102 feature not supported is auto-repeat,
 since the only way X provides for this will affect all windows.
 There are additional control sequences to provide
 \fIxterm-\fPdependent functions, such as the scrollbar or window size.
@@ -381,18 +398,17 @@ discussion of character sets.
 .
 .St
 .\"
-.LP
-.B
+.Ss
 Single-character functions
 .\"
 .IP \\*(Be
-Bell (Ctrl-G)
+Bell (Ctrl-G).
 .
 .IP \\*(Bs
-Backspace (Ctrl-H)
+Backspace (Ctrl-H).
 .
 .IP \\*(Cr
-Carriage Return (Ctrl-M)
+Carriage Return (Ctrl-M).
 .
 .IP \\*(En
 Return Terminal Status (Ctrl-E).
@@ -400,35 +416,36 @@ Default response is an empty string, but may be overridden
 by a resource \fBanswerbackString\fP.
 .
 .IP \\*(Ff
-Form Feed or New Page (NP) (Ctrl-L) same as LF
+Form Feed or New Page (NP).  Ctrl-L is treated the same as LF.
 .
 .IP \\*(Lf
-Line Feed or New Line (NL) (Ctrl-J)
+Line Feed or New Line (NL).  (LF is Ctrl-J).
 .
 .IP \\*(Si
-Shift In (Ctrl-O) \(-> Switch to Standard Character Set: invokes the
+Shift In (Ctrl-O) \(-> Switch to Standard Character Set.  This invokes the
 G0 character set (the default).
 .
 .IP \\*(So
-Shift Out (Ctrl-N) \(-> Switch to Alternate Character Set: invokes the
+Shift Out (Ctrl-N) \(-> Switch to Alternate Character Set.  This invokes the
 G1 character set.
 .
 .IP \\*(Sp
 Space.
 .
 .IP \\*(Ta
-Horizontal Tab (HT) (Ctrl-I)
+Horizontal Tab (HT) (Ctrl-I).
 .
 .IP \\*(Vt
-Vertical Tab (Ctrl-K) same as LF
+Vertical Tab (Ctrl-K).  This is treated the same as LF.
 .Ed
 .\"
 .\"
 .\"
 .St
+.Ss
+Controls beginning with ESC
 .LP
-.B
-Controls beginning with ESC (other than those where ESC is part of a 7-bit equivalent to 8-bit C1 controls), ordered by the final character(s).
+This excludes controls where ESC is part of a 7-bit equivalent to 8-bit C1 controls, ordered by the final character(s).
 .\"
 .IP \\*(Es\\*(Sp\\*F
 7-bit controls (S7C1T).
@@ -446,65 +463,75 @@ Set ANSI conformance level 2 (dpANS X3.134.1).
 Set ANSI conformance level 3 (dpANS X3.134.1).
 .
 .IP \\*(Es\\*#\\*3
-DEC double-height line, top half (DECDHL)
+DEC double-height line, top half (DECDHL).
 .
 .IP \\*(Es\\*#\\*4
-DEC double-height line, bottom half (DECDHL)
+DEC double-height line, bottom half (DECDHL).
 .
 .IP \\*(Es\\*#\\*5
-DEC single-width line (DECSWL)
+DEC single-width line (DECSWL).
 .
 .IP \\*(Es\\*#\\*6
-DEC double-width line (DECDWL)
+DEC double-width line (DECDWL).
 .
 .IP \\*(Es\\*#\\*8
-DEC Screen Alignment Test (DECALN)
+DEC Screen Alignment Test (DECALN).
 .
 .IP \\*(Es\\*%\\*@
-Select default character set, ISO 8859-1 (ISO 2022)
+Select default character set.  That is ISO 8859-1 (ISO 2022).
 .
 .IP \\*(Es\\*%\\*G
-Select UTF-8 character set (ISO 2022)
+Select UTF-8 character set (ISO 2022).
 .
 .IP \\*(Es\\*(((\\*(Cc
-Designate G0 Character Set (ISO 2022)
+Designate G0 Character Set (ISO 2022, VT100).
+.br
+Final character \*(Cc for designating 94-character sets.
+In this list, \*0, \*A and \*(cB apply to VT100 and up, the remainder to VT220 and up:
+  \*(Cc = \*0 \(-> DEC Special Character and Line Drawing Set.
+  \*(Cc = \*A \(-> United Kingdom (UK).
+  \*(Cc = \*(cB \(-> United States (USASCII).
+  \*(Cc = \*4 \(-> Dutch.
+  \*(Cc = \*C or \*5 \(-> Finnish.
+  \*(Cc = \*R \(-> French.
+  \*(Cc = \*Q \(-> French Canadian.
+  \*(Cc = \*K \(-> German.
+  \*(Cc = \*Y \(-> Italian.
+  \*(Cc = \*E or \*6 \(-> Norwegian/Danish.
+  \*(Cc = \*Z \(-> Spanish.
+  \*(Cc = \*H or \*7 \(-> Swedish.
+  \*(Cc = \*= \(-> Swiss.
+.\" VT3xx and VT5xx (see vttest) add more selections, not implemented here.
 .IP \\*(Es\\*)\\*(Cc
-Designate G1 Character Set (ISO 2022)
+Designate G1 Character Set (ISO 2022, VT100).
+.br
+The same character sets apply as for \*(Es\*(((\*(Cc.
 .
 .IP \\*(Es\\**\\*(Cc
-Designate G2 Character Set (ISO 2022)
+Designate G2 Character Set (ISO 2022, VT220).
+.br
+The same character sets apply as for \*(Es\*(((\*(Cc.
 .
 .IP \\*(Es\\*+\\*(Cc
-Designate G3 Character Set (ISO 2022)
+Designate G3 Character Set (ISO 2022, VT220).
 .br
-Final character \*(Cc for designating 94-character sets
-(\*0, \*A and \*(cB apply to VT100 and up, the remainder to VT220 and up):
-  \*(Cc = \*0 \(-> DEC Special Character and Line Drawing Set
-  \*(Cc = \*A \(-> United Kingdom (UK)
-  \*(Cc = \*(cB \(-> United States (USASCII)
-  \*(Cc = \*4 \(-> Dutch
-  \*(Cc = \*C or \*5 \(-> Finnish
-  \*(Cc = \*R \(-> French
-  \*(Cc = \*Q \(-> French Canadian
-  \*(Cc = \*K \(-> German
-  \*(Cc = \*Y \(-> Italian
-  \*(Cc = \*E or \*6 \(-> Norwegian/Danish
-  \*(Cc = \*Z \(-> Spanish
-  \*(Cc = \*H or \*7 \(-> Swedish
-  \*(Cc = \*= \(-> Swiss
-.\" VT3xx and VT5xx (see vttest) add more selections, not implemented here.
+The same character sets apply as for \*(Es\*(((\*(Cc.
 .
 .IP \\*(Es\\*-\\*(Cc
-Designate G1 Character Set (VT300)
+Designate G1 Character Set (VT300).
+.br
+The same character sets apply as for \*(Es\*(((\*(Cc.
 .
 .IP \\*(Es\\*.\\*(Cc
-Designate G2 Character Set (VT300)
+Designate G2 Character Set (VT300).
+.br
+The same character sets apply as for \*(Es\*(((\*(Cc.
 .
 .IP \\*(Es\\*/\\*(Cc
-Designate G3 Character Set (VT300)
+Designate G3 Character Set (VT300).
 .br
 These work for 96-character sets only.
-  \*(Cc = \*A \(-> ISO Latin-1 Supplemental
+  \*(Cc = \*A \(-> ISO Latin-1 Supplemental.
 .\" VT5xx would implement these:
 .\"  \*(Cc = \*F \(-> ISO Greek Supplemental
 .\"  \*(Cc = \*H \(-> ISO Hebrew Supplemental
@@ -512,30 +539,30 @@ These work for 96-character sets only.
 .\"  \*(Cc = \*L \(-> ISO Latin-Cyrillic
 .
 .IP \\*(Es\\*7
-Save Cursor (DECSC)
+Save Cursor (DECSC).
 .
 .IP \\*(Es\\*8
-Restore Cursor (DECRC)
+Restore Cursor (DECRC).
 .
 .IP \\*(Es\\*=
-Application Keypad (DECPAM)
+Application Keypad (DECPAM).
 .
 .IP \\*(Es\\*>
-Normal Keypad (DECPNM)
+Normal Keypad (DECPNM).
 .
 .IP \\*(Es\\*F
-Cursor to lower left corner of screen (if
-enabled by the \fBhpLowerleftBugCompat\fP resource).
+Cursor to lower left corner of screen.  This is
+enabled by the \fBhpLowerleftBugCompat\fP resource.
 .
 .IP \\*(Es\\*c
-Full Reset (RIS)
+Full Reset (RIS).
 .
 .IP \\*(Es\\*l
 Memory Lock (per HP terminals).
 Locks memory above the cursor.
 .
 .IP \\*(Es\\*m
-Memory Unlock (per HP terminals)
+Memory Unlock (per HP terminals).
 .
 .IP \\*(Es\\*n
 Invoke the G2 Character Set as GL (LS2).
@@ -554,27 +581,25 @@ Invoke the G1 Character Set as GR (LS1R).
 .Ed
 .
 .St
-.LP
-.B
+.Ss
 Application Program-Control functions
 .IP \\*(AP\\*(Pt\\*s\\*(ST
-\fIxterm\fP implements no \*(AP functions; \*(Pt is ignored.
+None.  \fIxterm\fP implements no \*(AP functions; \*(Pt is ignored.
 \*(Pt need not be printable characters.
 .Ed
 .
 .St
-.LP
-.B
+.Ss
 Device-Control functions
 .IP \\*(Dc\\*(Ps\\*;\\*(Ps\\*|\\*(Pt\\*s\\*(ST
 User-Defined Keys (DECUDK).
 The first parameter:
-  \*(Ps = \*0 \(-> Clear all UDK definitions before starting (default)
-  \*(Ps = \*1 \(-> Erase Below (default)
+  \*(Ps = \*0 \(-> Clear all UDK definitions before starting (default).
+  \*(Ps = \*1 \(-> Erase Below (default).
 .br
 The second parameter:
-  \*(Ps = \*0 \(-> Lock the keys (default)
-  \*(Ps = \*1 \(-> Do not lock.
+  \*(Ps = \*0 \(<- Lock the keys (default).
+  \*(Ps = \*1 \(<- Do not lock.
 .br
 The third parameter is a ';'-separated list of strings denoting
 the key-code separated by a '/' from the hex-encoded key value.
@@ -627,78 +652,77 @@ The strings are encoded in hexadecimal (2 digits per character).
 .Ed
 .\"
 .St
-.LP
-.B
+.Ss
 Functions using \*(Cs, ordered by the final character(s)
 .IP \\*(Cs\\*(Ps\\*s\\*@
-Insert \*(Ps (Blank) Character(s) (default = 1) (ICH)
+Insert \*(Ps (Blank) Character(s) (default = 1) (ICH).
 .
 .IP \\*(Cs\\*(Ps\\*s\\*A
-Cursor Up \*(Ps Times (default = 1) (CUU)
+Cursor Up \*(Ps Times (default = 1) (CUU).
 .
 .IP \\*(Cs\\*(Ps\\*s\\*(cB
-Cursor Down \*(Ps Times (default = 1) (CUD)
+Cursor Down \*(Ps Times (default = 1) (CUD).
 .
 .IP \\*(Cs\\*(Ps\\*s\\*C
-Cursor Forward \*(Ps Times (default = 1) (CUF)
+Cursor Forward \*(Ps Times (default = 1) (CUF).
 .
 .IP \\*(Cs\\*(Ps\\*s\\*D
-Cursor Backward \*(Ps Times (default = 1) (CUB)
+Cursor Backward \*(Ps Times (default = 1) (CUB).
 .
 .IP \\*(Cs\\*(Ps\\*s\\*E
-Cursor Next Line \*(Ps Times (default = 1) (CNL)
+Cursor Next Line \*(Ps Times (default = 1) (CNL).
 .
 .IP \\*(Cs\\*(Ps\\*s\\*F
-Cursor Preceding Line \*(Ps Times (default = 1) (CPL)
+Cursor Preceding Line \*(Ps Times (default = 1) (CPL).
 .
 .IP \\*(Cs\\*(Ps\\*s\\*G
-Cursor Character Absolute  [column] (default = [row,1]) (CHA)
+Cursor Character Absolute  [column] (default = [row,1]) (CHA).
 .
 .IP \\*(Cs\\*(Ps\\*s\\*;\\*(Ps\\*s\\*H
-Cursor Position [row;column] (default = [1,1]) (CUP)
+Cursor Position [row;column] (default = [1,1]) (CUP).
 .
 .IP \\*(Cs\\*(Ps\\*s\\*I
-Cursor Forward Tabulation \*(Ps tab stops (default = 1) (CHT)
+Cursor Forward Tabulation \*(Ps tab stops (default = 1) (CHT).
 .
 .IP \\*(Cs\\*(Ps\\*s\\*J
-Erase in Display (ED)
-  \*(Ps = \*0 \(-> Erase Below (default)
-  \*(Ps = \*1 \(-> Erase Above
-  \*(Ps = \*2 \(-> Erase All
-  \*(Ps = \*3 \(-> Erase Saved Lines (xterm)
+Erase in Display (ED).
+  \*(Ps = \*0 \(-> Erase Below (default).
+  \*(Ps = \*1 \(-> Erase Above.
+  \*(Ps = \*2 \(-> Erase All.
+  \*(Ps = \*3 \(-> Erase Saved Lines (xterm).
 .
 .IP \\*(Cs\\*?\\*(Ps\\*s\\*J
-Erase in Display (DECSED)
-  \*(Ps = \*0 \(-> Selective Erase Below (default)
-  \*(Ps = \*1 \(-> Selective Erase Above
-  \*(Ps = \*2 \(-> Selective Erase All
+Erase in Display (DECSED).
+  \*(Ps = \*0 \(-> Selective Erase Below (default).
+  \*(Ps = \*1 \(-> Selective Erase Above.
+  \*(Ps = \*2 \(-> Selective Erase All.
 .
 .IP \\*(Cs\\*(Ps\\*s\\*K
-Erase in Line (EL)
-  \*(Ps = \*0 \(-> Erase to Right (default)
-  \*(Ps = \*1 \(-> Erase to Left
-  \*(Ps = \*2 \(-> Erase All
+Erase in Line (EL).
+  \*(Ps = \*0 \(-> Erase to Right (default).
+  \*(Ps = \*1 \(-> Erase to Left.
+  \*(Ps = \*2 \(-> Erase All.
 .
 .IP \\*(Cs\\*?\\*(Ps\\*s\\*K
-Erase in Line (DECSEL)
-  \*(Ps = \*0 \(-> Selective Erase to Right (default)
-  \*(Ps = \*1 \(-> Selective Erase to Left
-  \*(Ps = \*2 \(-> Selective Erase All
+Erase in Line (DECSEL).
+  \*(Ps = \*0 \(-> Selective Erase to Right (default).
+  \*(Ps = \*1 \(-> Selective Erase to Left.
+  \*(Ps = \*2 \(-> Selective Erase All.
 .
 .IP \\*(Cs\\*(Ps\\*s\\*L
-Insert \*(Ps Line(s) (default = 1) (IL)
+Insert \*(Ps Line(s) (default = 1) (IL).
 .
 .IP \\*(Cs\\*(Ps\\*s\\*M
-Delete \*(Ps Line(s) (default = 1) (DL)
+Delete \*(Ps Line(s) (default = 1) (DL).
 .
 .IP \\*(Cs\\*(Ps\\*s\\*P
-Delete \*(Ps Character(s) (default = 1) (DCH)
+Delete \*(Ps Character(s) (default = 1) (DCH).
 .
 .IP \\*(Cs\\*(Ps\\*s\\*S
-Scroll up \*(Ps lines (default = 1) (SU)
+Scroll up \*(Ps lines (default = 1) (SU).
 .
 .IP \\*(Cs\\*(Ps\\*s\\*T
-Scroll down \*(Ps lines (default = 1) (SD)
+Scroll down \*(Ps lines (default = 1) (SD).
 .
 .IP \\*(Cs\\*(Ps\\*s\\*;\\*(Ps\\*s\\*;\\*(Ps\\*s\\*;\\*(Ps\\*s\\*;\\*(Ps\\*s\\*T
 Initiate highlight mouse tracking.
@@ -710,54 +734,54 @@ Reset one or more features of the title modes to the default value.
 Normally, "reset" disables the feature.
 It is possible to disable the ability to reset features
 by compiling a different default for the title modes into \fIxterm\fP.
-  \*(Ps = \*0 \(-> Do not set window/icon labels using hexadecimal
-  \*(Ps = \*1 \(-> Do not query window/icon labels using hexadecimal
-  \*(Ps = \*2 \(-> Do not set window/icon labels using UTF-8
-  \*(Ps = \*3 \(-> Do not query window/icon labels using UTF-8
-(See discussion of "Title Modes")
+  \*(Ps = \*0 \(-> Do not set window/icon labels using hexadecimal.
+  \*(Ps = \*1 \(-> Do not query window/icon labels using hexadecimal.
+  \*(Ps = \*2 \(-> Do not set window/icon labels using UTF-8.
+  \*(Ps = \*3 \(-> Do not query window/icon labels using UTF-8.
+(See discussion of "Title Modes").
 .
 .IP \\*(Cs\\*(Ps\\*s\\*(XX
-Erase \*(Ps Character(s) (default = 1) (ECH)
+Erase \*(Ps Character(s) (default = 1) (ECH).
 .
 .IP \\*(Cs\\*(Ps\\*s\\*Z
-Cursor Backward Tabulation \*(Ps tab stops (default = 1) (CBT)
+Cursor Backward Tabulation \*(Ps tab stops (default = 1) (CBT).
 .
 .IP \\*(Cs\\*(Pm\\*s\\*`
-Character Position Absolute  [column] (default = [row,1]) (HPA)
+Character Position Absolute  [column] (default = [row,1]) (HPA).
 .
 .IP \\*(Cs\\*(Ps\\*s\\*b
-Repeat the preceding graphic character \*(Ps times (REP)
+Repeat the preceding graphic character \*(Ps times (REP).
 .
 .IP \\*(Cs\\*(Ps\\*s\\*c
-Send Device Attributes (Primary DA)
+Send Device Attributes (Primary DA).
   \*(Ps = \*0 or omitted \(-> request attributes from terminal.
 The response depends on the \fBdecTerminalID\fP resource setting.
   \(-> \*(Cs\*?\*1\*;\*2\*c (``VT100 with Advanced Video Option'')
   \(-> \*(Cs\*?\*1\*;\*0\*c (``VT101 with No Options'')
   \(-> \*(Cs\*?\*6\*c (``VT102'')
-  \(-> \*(Cs\*?\*6\*0\*;\*1\*;\*2\*;\*6\*;\*8\*;\*9\*;\*1\*5\*;\*c (``VT220'')
+  \(->\ \*(Cs\*?\*6\*0\*;\*1\*;\*2\*;\*6\*;\*8\*;\*9\*;\*1\*5\*;\*c (``VT220'')
 .br
 The VT100-style response parameters do not mean anything by themselves.
 VT220 parameters do, telling the host what features the terminal supports:
-  \(-> \*1 132-columns
-  \(-> \*2 Printer
-  \(-> \*6 Selective erase
-  \(-> \*8 User-defined keys
-  \(-> \*9 National replacement character sets
-  \(-> \*1\*5 Technical characters
-  \(-> \*2\*2 ANSI color, e.g., VT525
-  \(-> \*2\*9 ANSI text locator (i.e., DEC Locator mode)
+  \*(Ps = \*1 \(-> 132-columns.
+  \*(Ps = \*2 \(-> Printer.
+  \*(Ps = \*6 \(-> Selective erase.
+  \*(Ps = \*8 \(-> User-defined keys.
+  \*(Ps = \*9 \(-> National replacement character sets.
+  \*(Ps = \*1\*5 \(-> Technical characters.
+  \*(Ps = \*2\*2 \(-> ANSI color, e.g., VT525.
+  \*(Ps = \*2\*9 \(-> ANSI text locator (i.e., DEC Locator mode).
 .
 .IP \\*(Cs\\*>\\*(Ps\\*s\\*c
-Send Device Attributes (Secondary DA)
+Send Device Attributes (Secondary DA).
   \*(Ps = \*0 or omitted \(-> request the terminal's identification code.
 The response depends on the \fBdecTerminalID\fP resource setting.
 It should apply only to VT220 and up, but \fIxterm\fP extends this to VT100.
   \(-> \*(Cs\*s\*>\*(Pp\*s\*;\*(Pv\*s\*;\*(Pc\*s\*c
 .br
 where \*(Pp denotes the terminal type
-  \(-> \*0 (``VT100'')
-  \(-> \*1 (``VT220'')
+  \*(Pp = \*0 \(-> ``VT100''.
+  \*(Pp = \*1 \(-> ``VT220''.
 .br
 and \*(Pv is the firmware version (for \fIxterm\fP, this was originally
 the XFree86 patch number, starting with 95).
@@ -765,55 +789,55 @@ In a DEC terminal, \*(Pc indicates the ROM cartridge
 registration number and is always zero.
 .
 .IP \\*(Cs\\*(Pm\\*s\\*d
-Line Position Absolute  [row] (default = [1,column]) (VPA)
+Line Position Absolute  [row] (default = [1,column]) (VPA).
 .
 .IP \\*(Cs\\*(Ps\\*s\\*;\\*(Ps\\*s\\*f
-Horizontal and Vertical Position [row;column] (default = [1,1]) (HVP)
+Horizontal and Vertical Position [row;column] (default = [1,1]) (HVP).
 .
 .IP \\*(Cs\\*(Ps\\*s\\*g
-Tab Clear (TBC)
-  \*(Ps = \*0 \(-> Clear Current Column (default)
-  \*(Ps = \*3 \(-> Clear All
+Tab Clear (TBC).
+  \*(Ps = \*0 \(-> Clear Current Column (default).
+  \*(Ps = \*3 \(-> Clear All.
 .
 .IP \\*(Cs\\*(Pm\\*s\\*h
-Set Mode (SM)
-  \*(Ps = \*2 \(-> Keyboard Action Mode (AM)
-  \*(Ps = \*4 \(-> Insert Mode (IRM)
-  \*(Ps = \*1\*2 \(-> Send/receive (SRM)
-  \*(Ps = \*2\*0 \(-> Automatic Newline (LNM)
+Set Mode (SM).
+  \*(Ps = \*2 \(-> Keyboard Action Mode (AM).
+  \*(Ps = \*4 \(-> Insert Mode (IRM).
+  \*(Ps = \*1\*2 \(-> Send/receive (SRM).
+  \*(Ps = \*2\*0 \(-> Automatic Newline (LNM).
 .
 .IP \\*(Cs\\*?\\*(Pm\\*s\\*h
-DEC Private Mode Set (DECSET)
-  \*(Ps = \*1 \(-> Application Cursor Keys (DECCKM)
+DEC Private Mode Set (DECSET).
+  \*(Ps = \*1 \(-> Application Cursor Keys (DECCKM).
   \*(Ps = \*2 \(-> Designate USASCII for character sets G0-G3 (DECANM),
 and set VT100 mode.
-  \*(Ps = \*3 \(-> 132 Column Mode (DECCOLM)
-  \*(Ps = \*4 \(-> Smooth (Slow) Scroll (DECSCLM)
-  \*(Ps = \*5 \(-> Reverse Video (DECSCNM)
-  \*(Ps = \*6 \(-> Origin Mode (DECOM)
-  \*(Ps = \*7 \(-> Wraparound Mode (DECAWM)
-  \*(Ps = \*8 \(-> Auto-repeat Keys (DECARM)
+  \*(Ps = \*3 \(-> 132 Column Mode (DECCOLM).
+  \*(Ps = \*4 \(-> Smooth (Slow) Scroll (DECSCLM).
+  \*(Ps = \*5 \(-> Reverse Video (DECSCNM).
+  \*(Ps = \*6 \(-> Origin Mode (DECOM).
+  \*(Ps = \*7 \(-> Wraparound Mode (DECAWM).
+  \*(Ps = \*8 \(-> Auto-repeat Keys (DECARM).
   \*(Ps = \*9 \(-> Send Mouse X & Y on button press.
 See the section \fBMouse Tracking\fP.
-  \*(Ps = \*1\*0 \(-> Show toolbar (rxvt)
-  \*(Ps = \*1\*2 \(-> Start Blinking Cursor (att610)
-  \*(Ps = \*1\*8 \(-> Print form feed (DECPFF)
-  \*(Ps = \*1\*9 \(-> Set print extent to full screen (DECPEX)
-  \*(Ps = \*2\*5 \(-> Show Cursor (DECTCEM)
+  \*(Ps = \*1\*0 \(-> Show toolbar (rxvt).
+  \*(Ps = \*1\*2 \(-> Start Blinking Cursor (att610).
+  \*(Ps = \*1\*8 \(-> Print form feed (DECPFF).
+  \*(Ps = \*1\*9 \(-> Set print extent to full screen (DECPEX).
+  \*(Ps = \*2\*5 \(-> Show Cursor (DECTCEM).
   \*(Ps = \*3\*0 \(-> Show scrollbar (rxvt).
   \*(Ps = \*3\*5 \(-> Enable font-shifting functions (rxvt).
-  \*(Ps = \*3\*8 \(-> Enter Tektronix Mode (DECTEK)
-  \*(Ps = \*4\*0 \(-> Allow 80 \z\(<-\(-> 132 Mode
-  \*(Ps = \*4\*1 \(-> \fImore\fP(1) fix (see \fBcurses\fP resource)
-  \*(Ps = \*4\*2 \(-> Enable Nation Replacement Character sets (DECNRCM)
-  \*(Ps = \*4\*4 \(-> Turn On Margin Bell
-  \*(Ps = \*4\*5 \(-> Reverse-wraparound Mode
-  \*(Ps = \*4\*6 \(-> Start Logging
-(normally disabled by a compile-time option)
-  \*(Ps = \*4\*7 \(-> Use Alternate Screen Buffer (unless
-disabled by the \fBtiteInhibit\fP resource)
-  \*(Ps = \*6\*6 \(-> Application keypad (DECNKM)
-  \*(Ps = \*6\*7 \(-> Backarrow key sends backspace (DECBKM)
+  \*(Ps = \*3\*8 \(-> Enter Tektronix Mode (DECTEK).
+  \*(Ps = \*4\*0 \(-> Allow 80 \z\(<-\(-> 132 Mode.
+  \*(Ps = \*4\*1 \(-> \fImore\fP(1) fix (see \fBcurses\fP resource).
+  \*(Ps = \*4\*2 \(-> Enable Nation Replacement Character sets (DECNRCM).
+  \*(Ps = \*4\*4 \(-> Turn On Margin Bell.
+  \*(Ps = \*4\*5 \(-> Reverse-wraparound Mode.
+  \*(Ps = \*4\*6 \(-> Start Logging.
+This is normally disabled by a compile-time option.
+  \*(Ps = \*4\*7 \(-> Use Alternate Screen Buffer.  (This may be
+disabled by the \fBtiteInhibit\fP resource).
+  \*(Ps = \*6\*6 \(-> Application keypad (DECNKM).
+  \*(Ps = \*6\*7 \(-> Backarrow key sends backspace (DECBKM).
   \*(Ps = \*1\*0\*0\*0 \(-> Send Mouse X & Y on button press and release.
 See the section \fBMouse Tracking\fP.
   \*(Ps = \*1\*0\*0\*1 \(-> Use Hilite Mouse Tracking.
@@ -825,27 +849,27 @@ See the section \fBMouse Tracking\fP.
   \*(Ps = \*1\*0\*1\*1 \(-> Scroll to bottom on key press (rxvt).
   \*(Ps = \*1\*0\*3\*4 \(-> Interpret "meta" key, sets eighth bit.
 (enables the \fBeightBitInput\fP resource).
-  \*(Ps = \*1\*0\*3\*5 \(-> Enable special modifiers for Alt and NumLock keys
-(enables the \fBnumLock\fP resource).
-  \*(Ps = \*1\*0\*3\*6 \(-> Send ESC when Meta modifies a key
-(enables the \fBmetaSendsEscape\fP resource).
-  \*(Ps = \*1\*0\*3\*7 \(-> Send DEL from the editing-keypad Delete key
-  \*(Ps = \*1\*0\*3\*9 \(-> Send ESC when Alt modifies a key
-(enables the \fBaltSendsEscape\fP resource).
-  \*(Ps = \*1\*0\*4\*0 \(-> Keep selection even if not highlighted
-(enables the \fBkeepSelection\fP resource).
-  \*(Ps = \*1\*0\*4\*1 \(-> Use the CLIPBOARD selection
-(enables the \fBselectToClipboard\fP resource).
-  \*(Ps = \*1\*0\*4\*2 \(-> Enable Urgency window manager hint when Control-G is received
-(enables the \fBbellIsUrgent\fP resource).
-  \*(Ps = \*1\*0\*4\*3 \(-> Enable raising of the window when Control-G is received
+  \*(Ps = \*1\*0\*3\*5 \(-> Enable special modifiers for Alt and NumLock keys.
+(This enables the \fBnumLock\fP resource).
+  \*(Ps = \*1\*0\*3\*6 \(-> Send ESC when Meta modifies a key.
+(This enables the \fBmetaSendsEscape\fP resource).
+  \*(Ps = \*1\*0\*3\*7 \(-> Send DEL from the editing-keypad Delete key.
+  \*(Ps = \*1\*0\*3\*9 \(-> Send ESC when Alt modifies a key.
+(This enables the \fBaltSendsEscape\fP resource).
+  \*(Ps = \*1\*0\*4\*0 \(-> Keep selection even if not highlighted.
+(This enables the \fBkeepSelection\fP resource).
+  \*(Ps = \*1\*0\*4\*1 \(-> Use the CLIPBOARD selection.
+(This enables the \fBselectToClipboard\fP resource).
+  \*(Ps = \*1\*0\*4\*2 \(-> Enable Urgency window manager hint when Control-G is received.
+(This enables the \fBbellIsUrgent\fP resource).
+  \*(Ps = \*1\*0\*4\*3 \(-> Enable raising of the window when Control-G is received.
 (enables the \fBpopOnBell\fP resource).
-  \*(Ps = \*1\*0\*4\*7 \(-> Use Alternate Screen Buffer (unless
-disabled by the \fBtiteInhibit\fP resource)
-  \*(Ps = \*1\*0\*4\*8 \(-> Save cursor as in DECSC (unless
-disabled by the \fBtiteInhibit\fP resource)
+  \*(Ps = \*1\*0\*4\*7 \(-> Use Alternate Screen Buffer.  (This may be
+disabled by the \fBtiteInhibit\fP resource).
+  \*(Ps = \*1\*0\*4\*8 \(-> Save cursor as in DECSC.  (This may be
+disabled by the \fBtiteInhibit\fP resource).
   \*(Ps = \*1\*0\*4\*9 \(-> Save cursor as in DECSC
-and use Alternate Screen Buffer, clearing it first (unless
+and use Alternate Screen Buffer, clearing it first.  (This may be
 disabled by the \fBtiteInhibit\fP resource).
 This combines the effects of the \*1\*0\*4\*7 and \*1\*0\*4\*8 modes.
 Use this with terminfo-based applications rather than the \*4\*7 mode.
@@ -858,54 +882,54 @@ Use this with terminfo-based applications rather than the \*4\*7 mode.
   \*(Ps = \*2\*0\*0\*4 \(-> Set bracketed paste mode.
 .
 .IP \\*(Cs\\*(Pm\\*s\\*i
-Media Copy (MC)
-  \*(Ps = \*0 \(-> Print screen (default)
-  \*(Ps = \*4 \(-> Turn off printer controller mode
-  \*(Ps = \*5 \(-> Turn on printer controller mode
+Media Copy (MC).
+  \*(Ps = \*0 \(-> Print screen (default).
+  \*(Ps = \*4 \(-> Turn off printer controller mode.
+  \*(Ps = \*5 \(-> Turn on printer controller mode.
 .
 .IP \\*(Cs\\*?\\*(Pm\\*s\\*i
-Media Copy (MC, DEC-specific)
-  \*(Ps = \*1 \(-> Print line containing cursor
-  \*(Ps = \*4 \(-> Turn off autoprint mode
-  \*(Ps = \*5 \(-> Turn on autoprint mode
-  \*(Ps = \*1 \*0 \(-> Print composed display, ignores DECPEX
-  \*(Ps = \*1 \*1 \(-> Print all pages
+Media Copy (MC, DEC-specific).
+  \*(Ps = \*1 \(-> Print line containing cursor.
+  \*(Ps = \*4 \(-> Turn off autoprint mode.
+  \*(Ps = \*5 \(-> Turn on autoprint mode.
+  \*(Ps = \*1 \*0 \(-> Print composed display, ignores DECPEX.
+  \*(Ps = \*1 \*1 \(-> Print all pages.
 .
 .IP \\*(Cs\\*(Pm\\*s\\*l
-Reset Mode (RM)
-  \*(Ps = \*2 \(-> Keyboard Action Mode (AM)
-  \*(Ps = \*4 \(-> Replace Mode (IRM)
-  \*(Ps = \*1\*2 \(-> Send/receive (SRM)
-  \*(Ps = \*2\*0 \(-> Normal Linefeed (LNM)
+Reset Mode (RM).
+  \*(Ps = \*2 \(-> Keyboard Action Mode (AM).
+  \*(Ps = \*4 \(-> Replace Mode (IRM).
+  \*(Ps = \*1\*2 \(-> Send/receive (SRM).
+  \*(Ps = \*2\*0 \(-> Normal Linefeed (LNM).
 .
 .IP \\*(Cs\\*?\\*(Pm\\*s\\*l
-DEC Private Mode Reset (DECRST)
-  \*(Ps = \*1 \(-> Normal Cursor Keys (DECCKM)
+DEC Private Mode Reset (DECRST).
+  \*(Ps = \*1 \(-> Normal Cursor Keys (DECCKM).
   \*(Ps = \*2 \(-> Designate VT52 mode (DECANM).
-  \*(Ps = \*3 \(-> 80 Column Mode (DECCOLM)
-  \*(Ps = \*4 \(-> Jump (Fast) Scroll (DECSCLM)
-  \*(Ps = \*5 \(-> Normal Video (DECSCNM)
-  \*(Ps = \*6 \(-> Normal Cursor Mode (DECOM)
-  \*(Ps = \*7 \(-> No Wraparound Mode (DECAWM)
-  \*(Ps = \*8 \(-> No Auto-repeat Keys (DECARM)
-  \*(Ps = \*9 \(-> Don't send Mouse X & Y on button press
-  \*(Ps = \*1\*0 \(-> Hide toolbar (rxvt)
-  \*(Ps = \*1\*2 \(-> Stop Blinking Cursor (att610)
-  \*(Ps = \*1\*8 \(-> Don't print form feed (DECPFF)
-  \*(Ps = \*1\*9 \(-> Limit print to scrolling region (DECPEX)
-  \*(Ps = \*2\*5 \(-> Hide Cursor (DECTCEM)
+  \*(Ps = \*3 \(-> 80 Column Mode (DECCOLM).
+  \*(Ps = \*4 \(-> Jump (Fast) Scroll (DECSCLM).
+  \*(Ps = \*5 \(-> Normal Video (DECSCNM).
+  \*(Ps = \*6 \(-> Normal Cursor Mode (DECOM).
+  \*(Ps = \*7 \(-> No Wraparound Mode (DECAWM).
+  \*(Ps = \*8 \(-> No Auto-repeat Keys (DECARM).
+  \*(Ps = \*9 \(-> Don't send Mouse X & Y on button press.
+  \*(Ps = \*1\*0 \(-> Hide toolbar (rxvt).
+  \*(Ps = \*1\*2 \(-> Stop Blinking Cursor (att610).
+  \*(Ps = \*1\*8 \(-> Don't print form feed (DECPFF).
+  \*(Ps = \*1\*9 \(-> Limit print to scrolling region (DECPEX).
+  \*(Ps = \*2\*5 \(-> Hide Cursor (DECTCEM).
   \*(Ps = \*3\*0 \(-> Don't show scrollbar (rxvt).
   \*(Ps = \*3\*5 \(-> Disable font-shifting functions (rxvt).
-  \*(Ps = \*4\*0 \(-> Disallow 80 \z\(<-\(-> 132 Mode
-  \*(Ps = \*4\*1 \(-> No \fImore\fP(1) fix (see \fBcurses\fP resource)
-  \*(Ps = \*4\*2 \(-> Disable Nation Replacement Character sets (DECNRCM)
-  \*(Ps = \*4\*4 \(-> Turn Off Margin Bell
-  \*(Ps = \*4\*5 \(-> No Reverse-wraparound Mode
-  \*(Ps = \*4\*6 \(-> Stop Logging
-(normally disabled by a compile-time option)
-  \*(Ps = \*4\*7 \(-> Use Normal Screen Buffer
-  \*(Ps = \*6\*6 \(-> Numeric keypad (DECNKM)
-  \*(Ps = \*6\*7 \(-> Backarrow key sends delete (DECBKM)
+  \*(Ps = \*4\*0 \(-> Disallow 80 \z\(<-\(-> 132 Mode.
+  \*(Ps = \*4\*1 \(-> No \fImore\fP(1) fix (see \fBcurses\fP resource).
+  \*(Ps = \*4\*2 \(-> Disable Nation Replacement Character sets (DECNRCM).
+  \*(Ps = \*4\*4 \(-> Turn Off Margin Bell.
+  \*(Ps = \*4\*5 \(-> No Reverse-wraparound Mode.
+  \*(Ps = \*4\*6 \(-> Stop Logging.
+(This is normally disabled by a compile-time option).
+  \*(Ps = \*4\*7 \(-> Use Normal Screen Buffer.
+  \*(Ps = \*6\*6 \(-> Numeric keypad (DECNKM).
+  \*(Ps = \*6\*7 \(-> Backarrow key sends delete (DECBKM).
   \*(Ps = \*1\*0\*0\*0 \(-> Don't send Mouse X & Y on button press and
 release.
 See the section \fBMouse Tracking\fP.
@@ -916,31 +940,30 @@ See the section \fBMouse Tracking\fP.
   \*(Ps = \*1\*0\*0\*5 \(-> Disable Extended Mouse Mode.
   \*(Ps = \*1\*0\*1\*0 \(-> Don't scroll to bottom on tty output (rxvt).
   \*(Ps = \*1\*0\*1\*1 \(-> Don't scroll to bottom on key press (rxvt).
-  \*(Ps = \*1\*0\*3\*4 \(-> Don't interpret "meta" key
-(disables the \fBeightBitInput\fP resource).
-  \*(Ps = \*1\*0\*3\*5 \(-> Disable special modifiers for Alt and NumLock keys
-(disables the \fBnumLock\fP resource).
-  \*(Ps = \*1\*0\*3\*6 \(-> Don't send ESC when Meta modifies a key
-(disables the \fBmetaSendsEscape\fP resource).
-  \*(Ps = \*1\*0\*3\*7 \(-> Send VT220 Remove from the editing-keypad Delete key
-  \*(Ps = \*1\*0\*3\*9 \(-> Don't send ESC when Alt modifies a key
-(disables the \fBaltSendsEscape\fP resource).
-  \*(Ps = \*1\*0\*4\*0 \(-> Do not keep selection when not highlighted
-(disables the \fBkeepSelection\fP resource).
+  \*(Ps = \*1\*0\*3\*4 \(-> Don't interpret "meta" key.
+(This disables the \fBeightBitInput\fP resource).
+  \*(Ps = \*1\*0\*3\*5 \(-> Disable special modifiers for Alt and NumLock keys.
+(This disables the \fBnumLock\fP resource).
+  \*(Ps = \*1\*0\*3\*6 \(-> Don't send ESC when Meta modifies a key.
+(This disables the \fBmetaSendsEscape\fP resource).
+  \*(Ps = \*1\*0\*3\*7 \(-> Send VT220 Remove from the editing-keypad Delete key.
+  \*(Ps = \*1\*0\*3\*9 \(-> Don't send ESC when Alt modifies a key.
+(This disables the \fBaltSendsEscape\fP resource).
+  \*(Ps = \*1\*0\*4\*0 \(-> Do not keep selection when not highlighted.
+(This disables the \fBkeepSelection\fP resource).
   \*(Ps = \*1\*0\*4\*1 \(-> Use the PRIMARY selection.
-(disables the \fBselectToClipboard\fP resource).
-  \*(Ps = \*1\*0\*4\*2 \(-> Disable Urgency window manager hint when Control-G is received
-(disables the \fBbellIsUrgent\fP resource).
-  \*(Ps = \*1\*0\*4\*3 \(-> Disable raising of the window when Control-G is received
-(disables the \fBpopOnBell\fP resource).
+(This disables the \fBselectToClipboard\fP resource).
+  \*(Ps = \*1\*0\*4\*2 \(-> Disable Urgency window manager hint when Control-G is received.
+(This disables the \fBbellIsUrgent\fP resource).
+  \*(Ps = \*1\*0\*4\*3 \(-> Disable raising of the window when Control-G is received.
+(This disables the \fBpopOnBell\fP resource).
   \*(Ps = \*1\*0\*4\*7 \(-> Use Normal Screen Buffer, clearing screen
-first if in the Alternate Screen (unless
-disabled by the \fBtiteInhibit\fP resource)
-  \*(Ps = \*1\*0\*4\*8 \(-> Restore cursor as in DECRC (unless
-disabled by the \fBtiteInhibit\fP resource)
-  \*(Ps = \*1\*0\*4\*9 \(-> Use Normal Screen Buffer and restore cursor
-as in DECRC (unless
+first if in the Alternate Screen.  (This may be
+disabled by the \fBtiteInhibit\fP resource).
+  \*(Ps = \*1\*0\*4\*8 \(-> Restore cursor as in DECRC.  (This may be
 disabled by the \fBtiteInhibit\fP resource).
+  \*(Ps = \*1\*0\*4\*9 \(-> Use Normal Screen Buffer and restore cursor
+as in DECRC.  (This may be disabled by the \fBtiteInhibit\fP resource).
 This combines the effects of the \*1\*0\*4\*7 and \*1\*0\*4\*8 modes.
 Use this with terminfo-based applications rather than the \*4\*7 mode.
   \*(Ps = \*1\*0\*5\*0 \(-> Reset terminfo/termcap function-key mode.
@@ -952,65 +975,65 @@ Use this with terminfo-based applications rather than the \*4\*7 mode.
   \*(Ps = \*2\*0\*0\*4 \(-> Reset bracketed paste mode.
 .
 .IP \\*(Cs\\*(Pm\\*s\\*m
-Character Attributes (SGR)
-  \*(Ps = \*0 \(-> Normal (default)
-  \*(Ps = \*1 \(-> Bold
-  \*(Ps = \*4 \(-> Underlined
-  \*(Ps = \*5 \(-> Blink (appears as Bold)
-  \*(Ps = \*7 \(-> Inverse
-  \*(Ps = \*8 \(-> Invisible, i.e., hidden (VT300)
-  \*(Ps = \*2\*2 \(-> Normal (neither bold nor faint)
-  \*(Ps = \*2\*4 \(-> Not underlined
-  \*(Ps = \*2\*5 \(-> Steady (not blinking)
-  \*(Ps = \*2\*7 \(-> Positive (not inverse)
-  \*(Ps = \*2\*8 \(-> Visible, i.e., not hidden (VT300)
-  \*(Ps = \*3\*0 \(-> Set foreground color to Black
-  \*(Ps = \*3\*1 \(-> Set foreground color to Red
-  \*(Ps = \*3\*2 \(-> Set foreground color to Green
-  \*(Ps = \*3\*3 \(-> Set foreground color to Yellow
-  \*(Ps = \*3\*4 \(-> Set foreground color to Blue
-  \*(Ps = \*3\*5 \(-> Set foreground color to Magenta
-  \*(Ps = \*3\*6 \(-> Set foreground color to Cyan
-  \*(Ps = \*3\*7 \(-> Set foreground color to White
-  \*(Ps = \*3\*9 \(-> Set foreground color to default (original)
-  \*(Ps = \*4\*0 \(-> Set background color to Black
-  \*(Ps = \*4\*1 \(-> Set background color to Red
-  \*(Ps = \*4\*2 \(-> Set background color to Green
-  \*(Ps = \*4\*3 \(-> Set background color to Yellow
-  \*(Ps = \*4\*4 \(-> Set background color to Blue
-  \*(Ps = \*4\*5 \(-> Set background color to Magenta
-  \*(Ps = \*4\*6 \(-> Set background color to Cyan
-  \*(Ps = \*4\*7 \(-> Set background color to White
+Character Attributes (SGR).
+  \*(Ps = \*0 \(-> Normal (default).
+  \*(Ps = \*1 \(-> Bold.
+  \*(Ps = \*4 \(-> Underlined.
+  \*(Ps = \*5 \(-> Blink (appears as Bold).
+  \*(Ps = \*7 \(-> Inverse.
+  \*(Ps = \*8 \(-> Invisible, i.e., hidden (VT300).
+  \*(Ps = \*2\*2 \(-> Normal (neither bold nor faint).
+  \*(Ps = \*2\*4 \(-> Not underlined.
+  \*(Ps = \*2\*5 \(-> Steady (not blinking).
+  \*(Ps = \*2\*7 \(-> Positive (not inverse).
+  \*(Ps = \*2\*8 \(-> Visible, i.e., not hidden (VT300).
+  \*(Ps = \*3\*0 \(-> Set foreground color to Black.
+  \*(Ps = \*3\*1 \(-> Set foreground color to Red.
+  \*(Ps = \*3\*2 \(-> Set foreground color to Green.
+  \*(Ps = \*3\*3 \(-> Set foreground color to Yellow.
+  \*(Ps = \*3\*4 \(-> Set foreground color to Blue.
+  \*(Ps = \*3\*5 \(-> Set foreground color to Magenta.
+  \*(Ps = \*3\*6 \(-> Set foreground color to Cyan.
+  \*(Ps = \*3\*7 \(-> Set foreground color to White.
+  \*(Ps = \*3\*9 \(-> Set foreground color to default (original).
+  \*(Ps = \*4\*0 \(-> Set background color to Black.
+  \*(Ps = \*4\*1 \(-> Set background color to Red.
+  \*(Ps = \*4\*2 \(-> Set background color to Green.
+  \*(Ps = \*4\*3 \(-> Set background color to Yellow.
+  \*(Ps = \*4\*4 \(-> Set background color to Blue.
+  \*(Ps = \*4\*5 \(-> Set background color to Magenta.
+  \*(Ps = \*4\*6 \(-> Set background color to Cyan.
+  \*(Ps = \*4\*7 \(-> Set background color to White.
   \*(Ps = \*4\*9 \(-> Set background color to default (original).
-.sp
+.sP
 If 16-color support is compiled, the following apply.
 Assume that \fIxterm\fP's resources
 are set so that the ISO color codes are the first 8 of a set of 16.
 Then the \fIaixterm\fP colors are the bright versions of the ISO colors:
-  \*(Ps = \*9\*0 \(-> Set foreground color to Black
-  \*(Ps = \*9\*1 \(-> Set foreground color to Red
-  \*(Ps = \*9\*2 \(-> Set foreground color to Green
-  \*(Ps = \*9\*3 \(-> Set foreground color to Yellow
-  \*(Ps = \*9\*4 \(-> Set foreground color to Blue
-  \*(Ps = \*9\*5 \(-> Set foreground color to Magenta
-  \*(Ps = \*9\*6 \(-> Set foreground color to Cyan
-  \*(Ps = \*9\*7 \(-> Set foreground color to White
-  \*(Ps = \*1\*0\*0 \(-> Set background color to Black
-  \*(Ps = \*1\*0\*1 \(-> Set background color to Red
-  \*(Ps = \*1\*0\*2 \(-> Set background color to Green
-  \*(Ps = \*1\*0\*3 \(-> Set background color to Yellow
-  \*(Ps = \*1\*0\*4 \(-> Set background color to Blue
-  \*(Ps = \*1\*0\*5 \(-> Set background color to Magenta
-  \*(Ps = \*1\*0\*6 \(-> Set background color to Cyan
-  \*(Ps = \*1\*0\*7 \(-> Set background color to White
-.sp
+  \*(Ps = \*9\*0 \(-> Set foreground color to Black.
+  \*(Ps = \*9\*1 \(-> Set foreground color to Red.
+  \*(Ps = \*9\*2 \(-> Set foreground color to Green.
+  \*(Ps = \*9\*3 \(-> Set foreground color to Yellow.
+  \*(Ps = \*9\*4 \(-> Set foreground color to Blue.
+  \*(Ps = \*9\*5 \(-> Set foreground color to Magenta.
+  \*(Ps = \*9\*6 \(-> Set foreground color to Cyan.
+  \*(Ps = \*9\*7 \(-> Set foreground color to White.
+  \*(Ps = \*1\*0\*0 \(-> Set background color to Black.
+  \*(Ps = \*1\*0\*1 \(-> Set background color to Red.
+  \*(Ps = \*1\*0\*2 \(-> Set background color to Green.
+  \*(Ps = \*1\*0\*3 \(-> Set background color to Yellow.
+  \*(Ps = \*1\*0\*4 \(-> Set background color to Blue.
+  \*(Ps = \*1\*0\*5 \(-> Set background color to Magenta.
+  \*(Ps = \*1\*0\*6 \(-> Set background color to Cyan.
+  \*(Ps = \*1\*0\*7 \(-> Set background color to White.
+.sP
 If \fIxterm\fP is compiled with the 16-color support disabled, it supports
 the following, from \fIrxvt\fP:
-  \*(Ps = \*1\*0\*0 \(-> Set foreground and background color to default
-.sp
+  \*(Ps = \*1\*0\*0 \(-> Set foreground and background color to default.
+.sP
 If 88- or 256-color support is compiled, the following apply.
-  \*(Ps = \*3\*8 ; \*5 ; \*(Ps \(-> Set foreground color to the second \*(Ps
-  \*(Ps = \*4\*8 ; \*5 ; \*(Ps \(-> Set background color to the second \*(Ps
+  \*(Ps = \*3\*8 ; \*5 ; \*(Ps \(-> Set foreground color to the second \*(Ps.
+  \*(Ps = \*4\*8 ; \*5 ; \*(Ps \(-> Set background color to the second \*(Ps.
 .sp
 .
 .IP \\*(Cs\\*>\\*(Ps\\*;\\*(Ps\\*s\\*m
@@ -1020,16 +1043,18 @@ pressed with a given key.
 The first parameter identifies the resource to set/reset.
 The second parameter is the value to assign to the resource.
 If the second parameter is omitted, the resource is reset to its initial value.
-  \(-> \*1 modifyCursorKeys
-  \(-> \*2 modifyFunctionKeys
-  \(-> \*4 modifyOtherKeys
+  \*(Ps = \*1 \(-> modifyCursorKeys.
+  \*(Ps = \*2 \(-> modifyFunctionKeys.
+  \*(Ps = \*4 \(-> modifyOtherKeys.
 .br
 If no parameters are given, all resources are reset to their initial values.
 .
 .IP \\*(Cs\\*(Ps\\*s\\*n
-Device Status Report (DSR)
-  \*(Ps = \*5 \(-> Status Report \*(Cs\*0\*n (``OK'')
-  \*(Ps = \*6 \(-> Report Cursor Position (CPR) [row;column] as
+Device Status Report (DSR).
+  \*(Ps = \*5 \(-> Status Report.  Result (``OK'') is
+.br
+\*(Cs\*0\*n
+  \*(Ps = \*6 \(-> Report Cursor Position (CPR) [row;column].  Result is
 .br
 \*(Cs\*(Ir\*s\*;\*(Ic\*s\*R
 .
@@ -1040,30 +1065,31 @@ sequence.
 This corresponds to a resource value of "-1", which cannot be set with
 the other sequence.
 The parameter identifies the resource to be disabled:
-  \(-> \*1 modifyCursorKeys
-  \(-> \*2 modifyFunctionKeys
-  \(-> \*4 modifyOtherKeys
+  \*(Ps = \*1 \(-> modifyCursorKeys.
+  \*(Ps = \*2 \(-> modifyFunctionKeys.
+  \*(Ps = \*4 \(-> modifyOtherKeys.
+.br
 If the parameter is omitted, \fBmodifyFunctionKeys\fP is disabled.
 When \fBmodifyFunctionKeys\fP is disabled, \fIxterm\fP uses the
 modifier keys to make an extended sequence of functions rather
 than adding a parameter to each function key to denote the modifiers.
 .
 .IP \\*(Cs\\*?\\*(Ps\\*s\\*n
-Device Status Report (DSR, DEC-specific)
+Device Status Report (DSR, DEC-specific).
   \*(Ps = \*6 \(-> Report Cursor Position (CPR) [row;column] as
 \*(Cs\*?\*(Ir\*s\*;\*(Ic\*s\*R
 (assumes page is zero).
   \*(Ps = \*1\*5 \(-> Report Printer status as
-\*(Cs\*?\*1\*0\*s\*n (ready)
+\*(Cs\*?\*1\*0\*s\*n (ready).
 or
-\*(Cs\*?\*1\*1\*s\*n (not ready)
+\*(Cs\*?\*1\*1\*s\*n (not ready).
   \*(Ps = \*2\*5 \(-> Report UDK status as
 \*(Cs\*?\*2\*0\*s\*n (unlocked)
 or
-\*(Cs\*?\*2\*1\*s\*n (locked)
+\*(Cs\*?\*2\*1\*s\*n (locked).
   \*(Ps = \*2\*6 \(-> Report Keyboard status as
 .br
-\*(Cs\*?\*2\*7\*s\*;\*s\*1\*s\*;\*s\*0\*s\*;\*s\*0\*s\*n (North American)
+\*(Cs\*?\*2\*7\*s\*;\*s\*1\*s\*;\*s\*0\*s\*;\*s\*0\*s\*n (North American).
 .br
 The last two parameters apply to VT400 & up, and denote keyboard ready and LK01 respectively.
   \*(Ps = \*5\*3 \(-> Report Locator status as
@@ -1073,20 +1099,21 @@ The last two parameters apply to VT400 & up, and denote keyboard ready and LK01
 \*(Cs\*?\*5\*0\*s\*n No Locator, if not.
 .
 .IP \\*(Cs\\*>\\*(Ps\\*s\\*p
-Set resource value \fIpointerMode\fP,
-used by \fIxterm\fP to decide whether to
+Set resource value \fIpointerMode\fP.
+This is used by \fIxterm\fP to decide whether to
 hide the pointer cursor as the user types.
 Valid values for the parameter:
-  \*(Ps = \*0 \(-> never hide the pointer
-  \*(Ps = \*1 \(-> hide if the mouse tracking mode is not enabled
-  \*(Ps = \*2 \(-> always hide the pointer
+  \*(Ps = \*0 \(-> never hide the pointer.
+  \*(Ps = \*1 \(-> hide if the mouse tracking mode is not enabled.
+  \*(Ps = \*2 \(-> always hide the pointer.
 If no parameter is given, \fIxterm\fP uses the default,
 which is \*1.
 .
 .IP \\*(Cs\\*!\\*p
-Soft terminal reset (DECSTR)
+Soft terminal reset (DECSTR).
 .
 .IP \\*(Cs\\*(Ps\\*$\\*p
+.br
 Request ANSI mode (DECRQM).
 For VT300 and up, reply is
 .br
@@ -1111,44 +1138,44 @@ where \*(Ps is the mode number as in DECSET,
 \*(Pm is the mode value as in the ANSI DECRQM.
 .
 .IP \\*(Cs\\*(Ps\\*s\\*;\\*(Ps\\*s\\*(c"\\*p
-Set conformance level (DECSCL)
+Set conformance level (DECSCL).
 Valid values for the first parameter:
-  \*(Ps = \*6\*1 \(-> VT100
-  \*(Ps = \*6\*2 \(-> VT200
-  \*(Ps = \*6\*3 \(-> VT300
+  \*(Ps = \*6\*1 \(-> VT100.
+  \*(Ps = \*6\*2 \(-> VT200.
+  \*(Ps = \*6\*3 \(-> VT300.
 .br
 Valid values for the second parameter:
-  \*(Ps = \*0 \(-> 8-bit controls
-  \*(Ps = \*1 \(-> 7-bit controls (always set for VT100)
-  \*(Ps = \*2 \(-> 8-bit controls
+  \*(Ps = \*0 \(-> 8-bit controls.
+  \*(Ps = \*1 \(-> 7-bit controls (always set for VT100).
+  \*(Ps = \*2 \(-> 8-bit controls.
 .
 .IP \\*(Cs\\*(Ps\\*s\\*q
-Load LEDs (DECLL)
-  \*(Ps = \*0 \(-> Clear all LEDS (default)
-  \*(Ps = \*1 \(-> Light Num Lock
-  \*(Ps = \*2 \(-> Light Caps Lock
-  \*(Ps = \*3 \(-> Light Scroll Lock
-  \*(Ps = \*2 \*1 \(-> Extinguish Num Lock
-  \*(Ps = \*2 \*2 \(-> Extinguish Caps Lock
-  \*(Ps = \*2 \*3 \(-> Extinguish Scroll Lock
+Load LEDs (DECLL).
+  \*(Ps = \*0 \(-> Clear all LEDS (default).
+  \*(Ps = \*1 \(-> Light Num Lock.
+  \*(Ps = \*2 \(-> Light Caps Lock.
+  \*(Ps = \*3 \(-> Light Scroll Lock.
+  \*(Ps = \*2 \*1 \(-> Extinguish Num Lock.
+  \*(Ps = \*2 \*2 \(-> Extinguish Caps Lock.
+  \*(Ps = \*2 \*3 \(-> Extinguish Scroll Lock.
 .
 .IP \\*(Cs\\*(Ps\\*s\\*(Sp\\*q
-Set cursor style (DECSCUSR, VT520)
-  \*(Ps = \*0 \(-> blinking block
-  \*(Ps = \*1 \(-> blinking block (default)
-  \*(Ps = \*2 \(-> steady block
-  \*(Ps = \*3 \(-> blinking underline
-  \*(Ps = \*4 \(-> steady underline
+Set cursor style (DECSCUSR, VT520).
+  \*(Ps = \*0 \(-> blinking block.
+  \*(Ps = \*1 \(-> blinking block (default).
+  \*(Ps = \*2 \(-> steady block.
+  \*(Ps = \*3 \(-> blinking underline.
+  \*(Ps = \*4 \(-> steady underline.
 .
 .IP \\*(Cs\\*(Ps\\*s\\*(c"\\*q
 Select character protection attribute (DECSCA).
 Valid values for the parameter:
-  \*(Ps = \*0 \(-> DECSED and DECSEL can erase (default)
-  \*(Ps = \*1 \(-> DECSED and DECSEL cannot erase
-  \*(Ps = \*2 \(-> DECSED and DECSEL can erase
+  \*(Ps = \*0 \(-> DECSED and DECSEL can erase (default).
+  \*(Ps = \*1 \(-> DECSED and DECSEL cannot erase.
+  \*(Ps = \*2 \(-> DECSED and DECSEL can erase.
 .
 .IP \\*(Cs\\*(Ps\\*s\\*;\\*(Ps\\*s\\*r
-Set Scrolling Region [top;bottom] (default = full size of window) (DECSTBM)
+Set Scrolling Region [top;bottom] (default = full size of window) (DECSTBM).
 .
 .IP \\*(Cs\\*?\\*(Pm\\*s\\*r
 Restore DEC Private Mode Values.
@@ -1158,10 +1185,10 @@ The value of \*(Ps previously saved is restored.
 .IP \\*(Cs\\*(Pt\\*;\\*(Pl\\*;\\*(Pb\\*;\\*(Pr\\*;\\*(Ps\\*$\\*r
 Change Attributes in Rectangular Area (DECCARA), VT400 and up.
   \*(Pt\*;\*(Pl\*;\*(Pb\*;\*(Pr denotes the rectangle.
-  \*(Ps denotes the SGR attributes to change: 0, 1, 4, 5, 7
+  \*(Ps denotes the SGR attributes to change: 0, 1, 4, 5, 7.
 .
 .IP \\*(Cs\\*(cs
-Save cursor (ANSI.SYS)
+Save cursor (ANSI.SYS).
 .
 .IP \\*(Cs\\*?\\*(Pm\\*s\\*(cs
 Save DEC Private Mode Values.
@@ -1184,17 +1211,17 @@ Valid values for the first (and any additional parameters) are:
   \*(Ps = \*1\*1 \(-> Report \fIxterm\fP window state.
 If the \fIxterm\fP window is open (non-iconified), it returns \*(Cs\*1\*t.
 If the \fIxterm\fP window is iconified, it returns \*(Cs\*2\*t.
-  \*(Ps = \*1\*3 \(-> Report \fIxterm\fP window position as
+  \*(Ps = \*1\*3 \(-> Report \fIxterm\fP window position.  Result is
 \*(Cs\*3\*;\*(Ix\*s\*;\*(Iy\*s\*t
-  \*(Ps = \*1\*4 \(-> Report \fIxterm\fP window in pixels as
+  \*(Ps = \*1\*4 \(-> Report \fIxterm\fP window in pixels.  Result is
 \*(Cs\*s\*4\*s\*;\*s\fIheight\fP\*s\*;\*s\fIwidth\fP\*s\*t
-  \*(Ps = \*1\*8 \(-> Report the size of the text area in characters as
+  \*(Ps = \*1\*8 \(-> Report the size of the text area in characters.  Result is
 \*(Cs\*s\*8\*s\*;\*s\fIheight\fP\*s\*;\*s\fIwidth\fP\*s\*t
-  \*(Ps = \*1\*9 \(-> Report the size of the screen in characters as
+  \*(Ps = \*1\*9 \(-> Report the size of the screen in characters.  Result is
 \*(Cs\*s\*9\*s\*;\*s\fIheight\fP\*s\*;\*s\fIwidth\fP\*s\*t
-  \*(Ps = \*2\*0 \(-> Report \fIxterm\fP window's icon label as
+  \*(Ps = \*2\*0 \(-> Report \fIxterm\fP window's icon label.  Result is
 \*(Os\*s\*L\*s\fIlabel\fP\*s\*(ST
-  \*(Ps = \*2\*1 \(-> Report \fIxterm\fP window's title as
+  \*(Ps = \*2\*1 \(-> Report \fIxterm\fP window's title.  Result is
 \*(Os\*s\*l\*s\fIlabel\fP\*s\*(ST
   \*(Ps = \*2\*2\*s\*;\*s\*0 \(-> Save \fIxterm\fP icon and window title on stack.
   \*(Ps = \*2\*2\*s\*;\*s\*1 \(-> Save \fIxterm\fP icon title on stack.
@@ -1202,39 +1229,39 @@ If the \fIxterm\fP window is iconified, it returns \*(Cs\*2\*t.
   \*(Ps = \*2\*3\*s\*;\*s\*0 \(-> Restore \fIxterm\fP icon and window title from stack.
   \*(Ps = \*2\*3\*s\*;\*s\*1 \(-> Restore \fIxterm\fP icon title from stack.
   \*(Ps = \*2\*3\*s\*;\*s\*2 \(-> Restore \fIxterm\fP window title from stack.
-  \*(Ps >= \*2\*4 \(-> Resize to \*(Ps lines (DECSLPP)
+  \*(Ps >= \*2\*4 \(-> Resize to \*(Ps lines (DECSLPP).
 .
 .IP \\*(Cs\\*(Pt\\*;\\*(Pl\\*;\\*(Pb\\*;\\*(Pr\\*;\\*(Ps\\*$\\*t
 Reverse Attributes in Rectangular Area (DECRARA), VT400 and up.
   \*(Pt\*;\*(Pl\*;\*(Pb\*;\*(Pr denotes the rectangle.
-  \*(Ps denotes the attributes to reverse, i.e.,  1, 4, 5, 7
+  \*(Ps denotes the attributes to reverse, i.e.,  1, 4, 5, 7.
 .
 .IP \\*(Cs\\*>\\*(Ps\\*;\\*(Ps\\*s\\*t
 Set one or more features of the title modes.
 Each parameter enables a single feature.
-  \*(Ps = \*0 \(-> Set window/icon labels using hexadecimal
-  \*(Ps = \*1 \(-> Query window/icon labels using hexadecimal
-  \*(Ps = \*2 \(-> Set window/icon labels using UTF-8
-  \*(Ps = \*3 \(-> Query window/icon labels using UTF-8
+  \*(Ps = \*0 \(-> Set window/icon labels using hexadecimal.
+  \*(Ps = \*1 \(-> Query window/icon labels using hexadecimal.
+  \*(Ps = \*2 \(-> Set window/icon labels using UTF-8.
+  \*(Ps = \*3 \(-> Query window/icon labels using UTF-8.
 (See discussion of "Title Modes")
 .
 .IP \\*(Cs\\*(Ps\\*s\\*(Sp\\*t
-Set warning-bell volume (DECSWBV, VT520)
-  \*(Ps = \*0 or \*1 \(-> off
-  \*(Ps = \*2, \*3 or \*4 \(-> low
-  \*(Ps = \*5, \*6, \*7, or \*8 \(-> high
+Set warning-bell volume (DECSWBV, VT520).
+  \*(Ps = \*0 or \*1 \(-> off.
+  \*(Ps = \*2, \*3 or \*4 \(-> low.
+  \*(Ps = \*5, \*6, \*7, or \*8 \(-> high.
 .
 .IP \\*(Cs\\*u
-Restore cursor (ANSI.SYS)
+Restore cursor (ANSI.SYS).
 .
 .IP \\*(Cs\\*(Ps\\*s\\*(Sp\\*u
-Set margin-bell volume (DECSMBV, VT520)
-  \*(Ps = \*1 \(-> off
-  \*(Ps = \*2, \*3 or \*4 \(-> low
-  \*(Ps = \*0, \*5, \*6, \*7, or \*8 \(-> high
+Set margin-bell volume (DECSMBV, VT520).
+  \*(Ps = \*1 \(-> off.
+  \*(Ps = \*2, \*3 or \*4 \(-> low.
+  \*(Ps = \*0, \*5, \*6, \*7, or \*8 \(-> high.
 .
 .IP \\*(Cs\\*(Pt\\*;\\*(Pl\\*;\\*(Pb\\*;\\*(Pr\\*;\\*(Pp\\*;\\*(Pt\\*;\\*(Pl\\*;\\*(Pp\\*$\\*v
-Copy Rectangular Area (DECCRA, VT400 and up)
+Copy Rectangular Area (DECCRA, VT400 and up).
   \*(Pt\*;\*(Pl\*;\*(Pb\*;\*(Pr denotes the rectangle.
   \*(Pp denotes the source page.
   \*(Pt\*;\*(Pl denotes the target location.
@@ -1254,23 +1281,23 @@ If all parameters are omitted, any locator motion will be reported.
 DECELR always cancels any prevous rectangle definition.
 .
 .IP \\*(Cs\\*(Ps\\*s\\*x
-Request Terminal Parameters (DECREQTPARM)
+Request Terminal Parameters (DECREQTPARM).
 .br
 if \*(Ps is a "0" (default) or "1", and \fBxterm\fR is emulating VT100,
 the control sequence elicits a response of the same form
 whose parameters describe the terminal:
   \*(Ps \(-> the given \*(Ps incremented by 2.
-  \*1 \(-> no parity
-  \*1 \(-> eight bits
-  \*1 \*2 \*8 \(-> transmit 38.4k baud
-  \*1 \*2 \*8 \(-> receive 38.4k baud
-  \*1 \(-> clock multiplier
-  \*0 \(-> STP flags
+  \*(Pn = \*1 \(<- no parity.
+  \*(Pn = \*1 \(<- eight bits.
+  \*(Pn = \*1 \(<- \*2 \*8 transmit 38.4k baud.
+  \*(Pn = \*1 \(<- \*2 \*8 receive 38.4k baud.
+  \*(Pn = \*1 \(<- clock multiplier.
+  \*(Pn = \*0 \(<- STP flags.
 .
 .IP \\*(Cs\\*(Ps\\*s\\*x
 Select Attribute Change Extent (DECSACE).
-  \*(Ps = \*0 \(-> from start to end position, wrapped
-  \*(Ps = \*1 \(-> from start to end position, wrapped
+  \*(Ps = \*0 \(-> from start to end position, wrapped.
+  \*(Ps = \*1 \(-> from start to end position, wrapped.
   \*(Ps = \*2 \(-> rectangle (exact).
 .
 .IP \\*(Cs\\*(Pc\\*;\\*(Pt\\*;\\*(Pl\\*;\\*(Pb\\*;\\*(Pr\\*$\\*x
@@ -1279,75 +1306,75 @@ Fill Rectangular Area (DECFRA), VT420 and up.
   \*(Pt\*;\*(Pl\*;\*(Pb\*;\*(Pr denotes the rectangle.
 .
 .IP \\*(Cs\\*(Ps\\*s\\*;\\*(Pu\\*s\\*(qu\\*z
-Enable Locator Reporting (DECELR)
+Enable Locator Reporting (DECELR).
 .br
 Valid values for the first parameter:
-  \*(Ps = \*0 \(-> Locator disabled (default)
-  \*(Ps = \*1 \(-> Locator enabled
-  \*(Ps = \*2 \(-> Locator enabled for one report, then disabled
+  \*(Ps = \*0 \(-> Locator disabled (default).
+  \*(Ps = \*1 \(-> Locator enabled.
+  \*(Ps = \*2 \(-> Locator enabled for one report, then disabled.
 .br
 The second parameter specifies the coordinate unit for locator reports.
 .br
 Valid values for the second parameter:
-  \*(Pu = \*0 or omitted \(-> default to character cells
-  \*(Pu = \*1 \(-> device physical pixels
-  \*(Pu = \*2 \(-> character cells
+  \*(Pu = \*0 \(<- or omitted \(-> default to character cells.
+  \*(Pu = \*1 \(<- device physical pixels.
+  \*(Pu = \*2 \(<- character cells.
 .
 .IP \\*(Cs\\*(Pt\\*;\\*(Pl\\*;\\*(Pb\\*;\\*(Pr\\*$\\*z
 Erase Rectangular Area (DECERA), VT400 and up.
   \*(Pt\*;\*(Pl\*;\*(Pb\*;\*(Pr denotes the rectangle.
 .
 .IP \\*(Cs\\*(Pm\\*s\\*(qu\\*{
-Select Locator Events (DECSLE)
+Select Locator Events (DECSLE).
 .br
 Valid values for the first (and any additional parameters) are:
-  \*(Ps = \*0 \(-> only respond to explicit host requests (DECRQLP)
-             (default) also cancels any filter rectangle
-  \*(Ps = \*1 \(-> report button down transitions
-  \*(Ps = \*2 \(-> do not report button down transitions
-  \*(Ps = \*3 \(-> report button up transitions
-  \*(Ps = \*4 \(-> do not report button up transitions
+  \*(Ps = \*0 \(-> only respond to explicit host requests (DECRQLP).
+             (This is default).  It also cancels any filter rectangle.
+  \*(Ps = \*1 \(-> report button down transitions.
+  \*(Ps = \*2 \(-> do not report button down transitions.
+  \*(Ps = \*3 \(-> report button up transitions.
+  \*(Ps = \*4 \(-> do not report button up transitions.
 .
 .IP \\*(Cs\\*(Pt\\*;\\*(Pl\\*;\\*(Pb\\*;\\*(Pr\\*$\\*{
 Selective Erase Rectangular Area (DECSERA), VT400 and up.
   \*(Pt\*;\*(Pl\*;\*(Pb\*;\*(Pr denotes the rectangle.
 .
 .IP \\*(Cs\\*(Ps\\*s\\*(qu\\*|
-Request Locator Position (DECRQLP)
+Request Locator Position (DECRQLP).
 .br
 Valid values for the parameter are:
-  \*(Ps = \*0, 1 or omitted \(-> transmit a single DECLRP locator report
-.sp
+  \*(Ps = \*0, 1 or omitted \(-> transmit a single DECLRP locator report.
+.sP
 If Locator Reporting has been enabled by a DECELR, xterm will respond
 with a DECLRP Locator Report.
 This report is also generated on button
 up and down events if they have been enabled with a DECSLE, or when
 the locator is detected outside of a filter rectangle, if filter rectangles
 have been enabled with a DECEFR.
-.sp
+.sP
   \(-> \*(Cs\*(Pe\*s\*;\*(Pb\*s\*;\*(Pr\*s\*;\*(Pc\*s\*;\*(Pp\*s\*&\*s\*w
-.sp
+.sP
 Parameters are [event;button;row;column;page].
 .br
 Valid values for the event:
-  \*(Pe = \*0 \(-> locator unavailable - no other parameters sent
-  \*(Pe = \*1 \(-> request - xterm received a DECRQLP
-  \*(Pe = \*2 \(-> left button down
-  \*(Pe = \*3 \(-> left button up
-  \*(Pe = \*4 \(-> middle button down
-  \*(Pe = \*5 \(-> middle button up
-  \*(Pe = \*6 \(-> right button down
-  \*(Pe = \*7 \(-> right button up
-  \*(Pe = \*8 \(-> M4 button down
-  \*(Pe = \*9 \(-> M4 button up
-  \*(Pe = \*1\*0 \(-> locator outside filter rectangle
+  \*(Pe = \*0 \(-> locator unavailable - no other parameters sent.
+  \*(Pe = \*1 \(-> request - xterm received a DECRQLP.
+  \*(Pe = \*2 \(-> left button down.
+  \*(Pe = \*3 \(-> left button up.
+  \*(Pe = \*4 \(-> middle button down.
+  \*(Pe = \*5 \(-> middle button up.
+  \*(Pe = \*6 \(-> right button down.
+  \*(Pe = \*7 \(-> right button up.
+  \*(Pe = \*8 \(-> M4 button down.
+  \*(Pe = \*9 \(-> M4 button up.
+  \*(Pe = \*1\*0 \(-> locator outside filter rectangle.
 .br
 ``button'' parameter is a bitmask indicating which buttons are pressed:
-  \*(Pb = \*0 \(-> no buttons down
-  \*(Pb & \*1 \(-> right button down
-  \*(Pb & \*2 \(-> middle button down
-  \*(Pb & \*4 \(-> left button down
-  \*(Pb & \*8 \(-> M4 button down
+  \*(Pb = \*0 \(<- no buttons down.
+  \*(Pb & \*1 \(<- right button down.
+  \*(Pb & \*2 \(<- middle button down.
+  \*(Pb & \*4 \(<- left button down.
+  \*(Pb & \*8 \(<- M4 button down.
 .br
 ``row'' and ``column'' parameters are the coordinates of the locator
 position in the xterm window, encoded as ASCII decimal.
@@ -1357,8 +1384,7 @@ The ``page'' parameter is not used by xterm, and will be omitted.
 .Ed
 .
 .St
-.LP
-.B
+.Ss
 Operating System Controls
 .
 .IP \\*(Os\\*(Ps\\*s\\*;\\*(Pt\\*s\\*(ST
@@ -1369,38 +1395,38 @@ if \*(Pt is a "?", the control sequence elicits a response which consists
 of the control sequence which would set the corresponding value.
 The \fIdtterm\fP control sequences allow you to determine the icon name
 and window title.
-  \*(Ps = \*0 \(-> Change Icon Name and Window Title to \*(Pt
-  \*(Ps = \*1 \(-> Change Icon Name to \*(Pt
-  \*(Ps = \*2 \(-> Change Window Title to \*(Pt
+  \*(Ps = \*0 \(-> Change Icon Name and Window Title to \*(Pt.
+  \*(Ps = \*1 \(-> Change Icon Name to \*(Pt.
+  \*(Ps = \*2 \(-> Change Window Title to \*(Pt.
   \*(Ps = \*3 \(-> Set X property on top-level window.
 \*(Pt should be in the form
 "\fIprop=value\fP", or just "\fIprop\fP" to delete the property
   \*(Ps = \*4 ; \fIc ; spec\fP \(-> Change Color Number \fIc\fP to
-the color specified by \fIspec\fP,
-i.e., a name or RGB specification as per \fIXParseColor\fP.
+the color specified by \fIspec\fP.
+This can be a name or RGB specification as per \fIXParseColor\fP.
 Any number of \fIc name\fP pairs may be given.
 The color numbers correspond to the ANSI colors 0-7,
 their bright versions 8-15,
 and if supported, the remainder of the 88-color or 256-color table.
-.sp
+.sP
 If a "?" is given rather than a name or RGB specification,
 xterm replies with a control sequence of the same form which can be used
 to set the corresponding color.
 Because more than one pair of color number and specification can
 be given in one control sequence, \fBxterm\fR can make more than one reply.
-.sp
+.sP
   \*(Ps = \*5 ; \fIc ; spec\fP \(-> Change Special Color Number \fIc\fP to
-the color specified by \fIspec\fP,
-i.e., a name or RGB specification as per \fIXParseColor\fP.
+the color specified by \fIspec\fP.
+This can be a name or RGB specification as per \fIXParseColor\fP.
 Any number of \fIc name\fP pairs may be given.
 The special colors can also be set by adding the maximum number of colors
 to these codes in an \*(Os\*4 control:
-.sp
-  \*(Pc = 0 \(-> resource \fBcolorBD\fP (BOLD)
-  \*(Pc = 1 \(-> resource \fBcolorUL\fP (UNDERLINE)
-  \*(Pc = 2 \(-> resource \fBcolorBL\fP (BLINK)
-  \*(Pc = 3 \(-> resource \fBcolorRV\fP (REVERSE)
-.sp
+.sP
+  \*(Pc = \*0 \(<- resource \fBcolorBD\fP (BOLD).
+  \*(Pc = \*1 \(<- resource \fBcolorUL\fP (UNDERLINE).
+  \*(Pc = \*2 \(<- resource \fBcolorBL\fP (BLINK).
+  \*(Pc = \*3 \(<- resource \fBcolorRV\fP (REVERSE).
+.sP
 The 8 colors (below) which may be set or queried
 using \*1\*0 through \*1\*7 are
 denoted \fIdynamic colors\fR, since the corresponding control sequences
@@ -1412,28 +1438,28 @@ At least one parameter is expected for \*(Pt.
 Each successive parameter changes the next color in the list.
 The value of \*(Ps tells the starting point in the list.
 The colors are specified by name or RGB specification as per \fIXParseColor\fP.
-.sp
+.sP
 If a "?" is given rather than a name or RGB specification,
 xterm replies with a control sequence of the same form which can be used
 to set the corresponding dynamic color.
 Because more than one pair of color number and specification can
 be given in one control sequence, \fBxterm\fR can make more than one reply.
-.sp
-  \*(Ps = \*1\*0 \(-> Change VT100 text foreground color to \*(Pt
-  \*(Ps = \*1\*1 \(-> Change VT100 text background color to \*(Pt
-  \*(Ps = \*1\*2 \(-> Change text cursor color to \*(Pt
-  \*(Ps = \*1\*3 \(-> Change mouse foreground color to \*(Pt
-  \*(Ps = \*1\*4 \(-> Change mouse background color to \*(Pt
-  \*(Ps = \*1\*5 \(-> Change Tektronix foreground color to \*(Pt
-  \*(Ps = \*1\*6 \(-> Change Tektronix background color to \*(Pt
-  \*(Ps = \*1\*7 \(-> Change highlight background color to \*(Pt
-  \*(Ps = \*1\*8 \(-> Change Tektronix cursor color to \*(Pt
-  \*(Ps = \*1\*9 \(-> Change highlight foreground color to \*(Pt
-.sp
-  \*(Ps = \*4\*6 \(-> Change Log File to \*(Pt (normally disabled by a
-compile-time option)
-.sp
-  \*(Ps = \*5\*0 \(-> Set Font to \*(Pt
+.sP
+  \*(Ps = \*1\*0 \(-> Change VT100 text foreground color to \*(Pt.
+  \*(Ps = \*1\*1 \(-> Change VT100 text background color to \*(Pt.
+  \*(Ps = \*1\*2 \(-> Change text cursor color to \*(Pt.
+  \*(Ps = \*1\*3 \(-> Change mouse foreground color to \*(Pt.
+  \*(Ps = \*1\*4 \(-> Change mouse background color to \*(Pt.
+  \*(Ps = \*1\*5 \(-> Change Tektronix foreground color to \*(Pt.
+  \*(Ps = \*1\*6 \(-> Change Tektronix background color to \*(Pt.
+  \*(Ps = \*1\*7 \(-> Change highlight background color to \*(Pt.
+  \*(Ps = \*1\*8 \(-> Change Tektronix cursor color to \*(Pt.
+  \*(Ps = \*1\*9 \(-> Change highlight foreground color to \*(Pt.
+.sP
+  \*(Ps = \*4\*6 \(-> Change Log File to \*(Pt.  (This is normally disabled by a
+compile-time option).
+.sP
+  \*(Ps = \*5\*0 \(-> Set Font to \*(Pt.
 These controls may be disabled using the \fIallowFontOps\fP resource.
 If \*(Pt begins with a "#", index in the font menu, relative (if the
 next character is a plus or minus sign) or absolute.
@@ -1450,9 +1476,9 @@ by adding a space and then the font specifier.
 .br
 If the "TrueType Fonts" menu entry is set (the \fBrenderFont\fP resource),
 then this control sets/queries the \fBfaceName\fP resource.
-.sp
-  \*(Ps = \*5\*1 (reserved for Emacs shell)
-.sp
+.sP
+  \*(Ps = \*5\*1 (reserved for Emacs shell).
+.sP
   \*(Ps = \*5\*2 \(-> Manipulate Selection Data.
 These controls may be disabled using the \fIallowWindowOps\fP resource.
 The parameter \*(Pt is parsed as
@@ -1479,22 +1505,22 @@ If the second parameter is a \*?,
 \fIxterm\fP replies to the host with the selection
 data encoded using the same protocol.
 .Ed
-.sp
-  \*(Ps = \*1\*0\*4 ; \fIc\fP \(-> Reset Color Number \fIc\fP to
+.sP
+  \*(Ps = \*1\*0\*4 ; \fIc\fP \(-> Reset Color Number \fIc\fP.  It is reset to
 the color specified by the corresponding X resource.
 Any number of \fIc\fP parameters may be given.
 These parameters correspond to the ANSI colors 0-7,
 their bright versions 8-15,
 and if supported, the remainder of the 88-color or 256-color table.
 If no parameters are given, the entire table will be reset.
-.sp
-  \*(Ps = \*1\*0\*5 ; \fIc\fP \(-> Reset Special Color Number \fIc\fP to
+.sP
+  \*(Ps = \*1\*0\*5 ; \fIc\fP \(-> Reset Special Color Number \fIc\fP.  It is reset to
 the color specified by the corresponding X resource.
 Any number of \fIc\fP parameters may be given.
 These parameters correspond to the special colors which can be set
 using an \*(Os\*5 control (or by adding the maximum number of colors
 using an \*(Os\*4 control).
-.sp
+.sP
 The \fIdynamic colors\fR can also be reset to their default (resource) values:
   \*(Ps = \*1\*1\*0 \(-> Reset VT100 text foreground color.
   \*(Ps = \*1\*1\*1 \(-> Reset VT100 text background color.
@@ -1507,16 +1533,14 @@ The \fIdynamic colors\fR can also be reset to their default (resource) values:
   \*(Ps = \*1\*1\*8 \(-> Reset Tektronix cursor color.
 .
 .St
-.lP
-.B
+.Ss
 Privacy Message
 .IP \\*(PM\\*(Pt\\*s\\*(ST
 \fIxterm\fP implements no \*(PM functions; \*(Pt is ignored.
 \*(Pt need not be printable characters.
 .Ed
 .
-.SH
-Alt and Meta Keys
+.Sh "Alt and Meta Keys"
 .LP
 Many keyboards have keys labeled "Alt".
 Few have keys labeled "Meta".
@@ -1549,6 +1573,7 @@ shift the key from codes 0-127 to 128-255 by adding 128.
 The table shows the result for a given character "x" with modifiers
 according to the default translations with the resources set on or off.
 This assumes \fBaltIsNotMeta\fP is set:
+.ne 18
 .TS
 center;
 lf3	lf3	lf3	lf3
@@ -1574,9 +1599,7 @@ Alt-x	ON	ON	\*(Es x
 Alt+Meta-x	ON	ON	\*(Es x
 _
 .TE
-.SH
-PC-Style Function Keys
-.ds RH Function Keys
+.Sh "PC-Style Function Keys"
 .LP
 If \fIxterm\fP does minimal translation of the function keys, it usually does this
 with a PC-style keyboard, so PC-style function keys result.
@@ -1588,7 +1611,7 @@ X does not predefine NumLock (used for VT220 keyboards) or Alt (used as
 an extension for the Sun/PC keyboards) as modifiers.
 These keys are recognized as modifiers when enabled
 by the \fBnumLock\fP resource,
-or by the DECSET \*1\*0\*3\*5 control sequence.
+or by the "DECSET \*1\*0\*3\*5" control sequence.
 .lP
 The cursor keys transmit the following escape sequences depending on the
 mode specified via the \fBDECCKM\fP escape sequence.
@@ -1625,6 +1648,7 @@ Use the NumLock key to override the application mode.
 .lP
 Not all keys are present on the Sun/PC keypad (e.g., PF1, Tab), but are supported by
 the program.
+.ne 30
 .TS
 center;
 cf3	cf3	cf3	cf3	cf3
@@ -1657,7 +1681,9 @@ PF4	\*(S3\*S	\*(S3\*S	kf4	k4
 = (equal)	\*=	\*(S3\*(XX	-	-
 _
 .TE
-They also provide 12 function keys, as well as a few other special-purpose keys.
+.br
+They also provide 12 function keys, as well as a few other special-purpose keys:
+.ne 16
 .TS
 center;
 cf3	cf3
@@ -1678,11 +1704,12 @@ F11	\*(Cs\*2\*3\*(c~
 F12	\*(Cs\*2\*4\*(c~
 _
 .TE
-.lP
+.sP
 Older versions of \fIxterm\fP implement different escape sequences for F1 through F4.
 These can be activated by setting the \fBoldXtermFKeys\fP resource.
 However, since they do not correspond to any hardware terminal, they have been deprecated.
 (The DEC VT220 reserves F1 through F5 for local functions such as \fBSetup\fP).
+.ne 6
 .TS
 center;
 cf3	cf3
@@ -1720,8 +1747,7 @@ For example, shift-F5 would be sent as
 .lP
 If the \fBalwaysUseMods\fP resource is set, the Meta modifier also is
 recognized, making parameters 9 through 16.
-.SH
-VT220-Style Function Keys
+.Sh "VT220-Style Function Keys"
 .LP
 However, \fIxterm\fP is most useful as a DEC VT102 or VT220 emulator.
 Set the \fBsunKeyboard\fP resource to true to force a Sun/PC keyboard
@@ -1729,6 +1755,7 @@ to act like a VT220 keyboard.
 .lP
 The VT102/VT220 application keypad transmits unique escape sequences in
 application mode, which are distinct from the cursor and scrolling keypad:
+.ne 31
 .TS
 center;
 cf3	cf3	cf3
@@ -1764,6 +1791,7 @@ _
 The VT220 provides a 6-key editing keypad,
 which is analogous to that on the PC keyboard.
 It is not affected by \fBDECCKM\fP or \fBDECPNM\fP/\fBDECPAM\fP:
+.ne 10
 .TS
 center;
 cf3	cf3	cf3
@@ -1781,6 +1809,7 @@ _
 .LP
 The VT220 provides 8 additional function keys.
 With a Sun/PC keyboard, access these keys by Control/F1 for F13, etc.
+.ne 16
 .TS
 center;
 cf3	cf3
@@ -1797,12 +1826,12 @@ F19	\*(Cs\*3\*3\*(c~
 F20	\*(Cs\*3\*4\*(c~
 _
 .TE
-.SH
-VT52-Style Function Keys
+.Sh "VT52-Style Function Keys"
 .LP
 A VT52 does not have function keys, but it does have a numeric keypad and cursor keys.
 They differ from the other emulations by the prefix.
 Also, the cursor keys do not change:
+.ne 10
 .TS
 center;
 cf3	cf3
@@ -1848,8 +1877,7 @@ PF4	\*(Es\*S	\*(Es\*S
 = (equal)	\*=	\*(Es\*?\*(XX
 _
 .TE
-.SH
-Sun-Style Function Keys
+.Sh "Sun-Style Function Keys"
 .LP
 The \fIxterm\fP program provides support for Sun keyboards more directly, by
 a menu toggle that causes it to send Sun-style function key codes rather than VT220.
@@ -1860,13 +1888,11 @@ For example, their wrap-margin behavior differs.
 Only function keys are altered; keypad and cursor keys are the same.
 The emulation responds identically.
 See the xterm-sun terminfo entry for details.
-.SH
-HP-Style Function Keys
+.Sh "HP-Style Function Keys"
 .LP
 Similarly, \fIxterm\fP can be compiled to support HP keyboards.
 See the xterm-hp terminfo entry for details.
-.SH
-The Alternate Screen Buffer
+.Sh "The Alternate Screen Buffer"
 .LP
 \fBXterm\fP maintains two screen buffers.
 The normal screen buffer allows you to scroll back to view saved lines
@@ -1899,20 +1925,19 @@ They add other features such as clearing the display for the same reason:
 to make the details of switching independent of the application that
 requests the switch.
 .
-.SH
-Bracketed Paste Mode
-.ds RH Bracketed Paste Mode
+.Sh "Bracketed Paste Mode"
 .LP
 When bracketed paste mode is set,
 pasted text is bracketed with control sequences
 so that the program can differentiate pasted text from typed-in text.
 When bracketed paste mode is set,
-the program will receive: ESC [ 200 ~,
-followed by the pasted text, followed by ESC [ 201 ~.
+the program will receive:
+   ESC [ 200 ~,
+.br
+followed by the pasted text, followed by
+   ESC [ 201 ~.
 .
-.SH
-Title Modes
-.ds RH Title Modes
+.Sh "Title Modes"
 .LP
 The window- and icon-labels can be set or queried using control sequences.
 As a VT220-emulator, \fIxterm\fP "should" limit the character encoding for
@@ -1947,9 +1972,7 @@ To make them more manageable (and constrained), for use in shell scripts,
 (for setting titles) or for encoding the title into hexadecimal when querying
 the value.
 .
-.SH
-Mouse Tracking
-.ds RH Mouse Tracking
+.Sh "Mouse Tracking"
 .LP
 The VT widget can be set to send the mouse position and other
 information on button presses.
@@ -1964,9 +1987,9 @@ control sequence, and is not described here
 (control sequences are summarized above).
 The remaining five
 modes are each enabled (or disabled) by a different parameter in
-DECSET \*(Cs\*?\*(Pm\*s\*h
+the "DECSET \*(Cs\*?\*(Pm\*s\*h"
 or
-DECRST \*(Cs\*?\*(Pm\*s\*l
+"DECRST \*(Cs\*?\*(Pm\*s\*l"
 control sequence.
 .lP
 Manifest constants for the parameter values
@@ -1983,7 +2006,7 @@ are defined in \fBxcharmouse.h\fP as follows:
 
 #define SET_EXT_MODE_MOUSE          1005
 .DE
-.LP
+.br
 The motion reporting modes are strictly \fIxterm\fP extensions, and are not
 part of any standard, though they are analogous to the DEC VT200 DECELR
 locator reports.
@@ -2040,10 +2063,10 @@ program the release coordinates.
 It is enabled by specifying parameter 1001 to DECSET.
 Highlighting is performed only for button 1, though other button events
 can be received.
-.sp
+.sP
 \fBWarning:\fP use of this mode requires a cooperating program or it will
 hang \fIxterm.\fP
-.sp
+.sP
 On button press, the same information as for normal tracking is
 generated; \fIxterm\fP then waits for the program to send mouse
 tracking information.
@@ -2095,10 +2118,10 @@ On button-motion events, \fIxterm\fP adds 32 to the event code
 The other bits of the event code specify button and modifier keys as in normal mode.
 For example, motion into cell x,y with button 1
 down is reported as \*(Cs\*M\*@\*(Cx\*(Cy.
-( \*@ = 32 + 0 (button 1) + 32 (motion indicator) ).
+(\ \*@ = 32 + 0 (button 1) + 32 (motion indicator)\ ).
 Similarly, motion with button 3
 down is reported as \*(Cs\*M\*(cB\*(Cx\*(Cy.
-( \*(cB = 32 + 2 (button 3) + 32 (motion indicator) ).
+(\ \*(cB = 32 + 2 (button 3) + 32 (motion indicator)\ ).
 .lP
 Any-event mode is the same as button-event mode, except that all motion
 events are reported, even if no mouse button is down.
@@ -2123,10 +2146,7 @@ applications
 which do treat their input as UTF-8 will almost certainly be confused
 unless extended mouse mode is active.
 .
-.br
-.ds RH Tektronix 4014 Mode
-.SH
-Tektronix 4014 Mode
+.Sh "Tektronix 4014 Mode"
 .LP
 Most of these sequences are standard Tektronix 4014 control sequences.
 Graph mode supports the 12-bit addressing of the Tektronix 4014.
@@ -2136,97 +2156,95 @@ This document does not describe the commands used in the various
 Tektronix plotting modes but does describe the commands to switch modes.
 .St
 .IP \\*(Be
-Bell (Ctrl-G)
+Bell (Ctrl-G).
 .IP \\*(Bs
-Backspace (Ctrl-H)
+Backspace (Ctrl-H).
 .IP \\*(Ta
-Horizontal Tab (Ctrl-I)
+Horizontal Tab (Ctrl-I).
 .IP \\*(Lf
-Line Feed or New Line (Ctrl-J)
+Line Feed or New Line (Ctrl-J).
 .IP \\*(Vt
-Cursor up (Ctrl-K)
+Cursor up (Ctrl-K).
 .IP \\*(Ff
-Form Feed or New Page (Ctrl-L)
+Form Feed or New Page (Ctrl-L).
 .IP \\*(Cr
-Carriage Return (Ctrl-M)
+Carriage Return (Ctrl-M).
 .IP \\*(Es\\*(Et
-Switch to VT100 Mode (ESC Ctrl-C)
+Switch to VT100 Mode (ESC Ctrl-C).
 .IP \\*(Es\\*(En
-Return Terminal Status (ESC Ctrl-E)
+Return Terminal Status (ESC Ctrl-E).
 .IP \\*(Es\\*(Ff
-PAGE (Clear Screen) (ESC Ctrl-L)
+PAGE (Clear Screen) (ESC Ctrl-L).
 .IP \\*(Es\\*(So
-Begin 4015 APL mode (ignored by \fIxterm\fP) (ESC Ctrl-N)
+Begin 4015 APL mode (ESC Ctrl-N).  (This is ignored by \fIxterm\fP).
 .IP \\*(Es\\*(Si
-End 4015 APL mode (ignored by \fIxterm\fP) (ESC Ctrl-O)
+End 4015 APL mode (ESC Ctrl-O).  (This is ignored by \fIxterm\fP).
 .IP \\*(Es\\*(Eb
-COPY (Save Tektronix Codes to file COPYyyyy-mm-dd.hh:mm:ss) (ESC Ctrl-W)
+COPY (Save Tektronix Codes to file COPYyyyy-mm-dd.hh:mm:ss).
+  \*(Eb (end transmission block) is the same as Ctrl-W.
 .IP \\*(Es\\*(Ca
-Bypass Condition (ESC Ctrl-X)
+Bypass Condition (ESC Ctrl-X).
 .IP \\*(Es\\*(Su
-GIN mode (ESC Ctrl-Z)
+GIN mode (ESC Ctrl-Z).
 .IP \\*(Es\\*(Fs
-Special Point Plot Mode (ESC Ctrl-\e)
+Special Point Plot Mode (ESC Ctrl-\e).
 .IP \\*(Es\\*8
-Select Large Character Set
+Select Large Character Set.
 .IP \\*(Es\\*9
-Select #2 Character Set
+Select #2 Character Set.
 .IP \\*(Es\\*:
-Select #3 Character Set
+Select #3 Character Set.
 .IP \\*(Es\\*;
-Select Small Character Set
+Select Small Character Set.
 .IP \\*(Os\\*(Ps\\*s\\*;\\*(Pt\\*s\\*(Be
-Set Text Parameters of VT window
-  \*(Ps = \*0 \(-> Change Icon Name and Window Title to \*(Pt
-  \*(Ps = \*1 \(-> Change Icon Name to \*(Pt
-  \*(Ps = \*2 \(-> Change Window Title to \*(Pt
-  \*(Ps = \*4\*6 \(-> Change Log File to \*(Pt (normally disabled by a
-compile-time option)
+Set Text Parameters of VT window.
+  \*(Ps = \*0 \(-> Change Icon Name and Window Title to \*(Pt.
+  \*(Ps = \*1 \(-> Change Icon Name to \*(Pt.
+  \*(Ps = \*2 \(-> Change Window Title to \*(Pt.
+  \*(Ps = \*4\*6 \(-> Change Log File to \*(Pt.  (This is normally disabled by a
+compile-time option).
 .IP \\*(Es\\*`
-Normal Z Axis and Normal (solid) Vectors
+Normal Z Axis and Normal (solid) Vectors.
 .IP \\*(Es\\*a
-Normal Z Axis and Dotted Line Vectors
+Normal Z Axis and Dotted Line Vectors.
 .IP \\*(Es\\*b
-Normal Z Axis and Dot-Dashed Vectors
+Normal Z Axis and Dot-Dashed Vectors.
 .IP \\*(Es\\*c
-Normal Z Axis and Short-Dashed Vectors
+Normal Z Axis and Short-Dashed Vectors.
 .IP \\*(Es\\*d
-Normal Z Axis and Long-Dashed Vectors
+Normal Z Axis and Long-Dashed Vectors.
 .IP \\*(Es\\*h
-Defocused Z Axis and Normal (solid) Vectors
+Defocused Z Axis and Normal (solid) Vectors.
 .IP \\*(Es\\*i
-Defocused Z Axis and Dotted Line Vectors
+Defocused Z Axis and Dotted Line Vectors.
 .IP \\*(Es\\*j
-Defocused Z Axis and Dot-Dashed Vectors
+Defocused Z Axis and Dot-Dashed Vectors.
 .IP \\*(Es\\*k
-Defocused Z Axis and Short-Dashed Vectors
+Defocused Z Axis and Short-Dashed Vectors.
 .IP \\*(Es\\*l
-Defocused Z Axis and Long-Dashed Vectors
+Defocused Z Axis and Long-Dashed Vectors.
 .IP \\*(Es\\*p
-Write-Thru Mode and Normal (solid) Vectors
+Write-Thru Mode and Normal (solid) Vectors.
 .IP \\*(Es\\*q
-Write-Thru Mode and Dotted Line Vectors
+Write-Thru Mode and Dotted Line Vectors.
 .IP \\*(Es\\*r
-Write-Thru Mode and Dot-Dashed Vectors
+Write-Thru Mode and Dot-Dashed Vectors.
 .IP \\*(Es\\*(cs
-Write-Thru Mode and Short-Dashed Vectors
+Write-Thru Mode and Short-Dashed Vectors.
 .IP \\*(Es\\*t
-Write-Thru Mode and Long-Dashed Vectors
+Write-Thru Mode and Long-Dashed Vectors.
 .IP \\*(Fs
-Point Plot Mode (Ctrl-\e)
+Point Plot Mode (Ctrl-\e).
 .IP \\*(Gs
-Graph Mode (Ctrl-])
+Graph Mode (Ctrl-]).
 .IP \\*(Rs
-Incremental Plot Mode (Ctrl-^)
+Incremental Plot Mode (Ctrl-^).
 .IP \\*(Us
-Alpha Mode (Ctrl-_)
+Alpha Mode (Ctrl-_).
 .Ed
 .
 .
-.br
-.ds RH VT52 Mode
-.SH
-VT52 Mode
+.Sh "VT52 Mode"
 .LP
 Parameters for cursor movement are at the end of the \*(Es\*Y escape sequence.
 Each ordinate is encoded in a single character as \fIvalue\fP+32.
@@ -2256,8 +2274,8 @@ Erase from the cursor to the end of the line.
 .IP \\*(Es\\*Y\\*(Ps\\*s\\*(Ps
 Move the cursor to given row and column.
 .IP \\*(Es\\*Z
-Identify
-  \(-> \*(Es\*s\*/\*s\*Z (``I am a VT52.'')
+Identify.
+  \(-> \*(Es\*s\*/\*s\*Z (``I am a VT52.'').
 .IP \\*(Es\\*=
 Enter alternate keypad mode.
 .IP \\*(Es\\*>
diff --git a/app/xterm/ctlseqs.txt b/app/xterm/ctlseqs.txt
index c1c93f331..a16fe2767 100644
--- a/app/xterm/ctlseqs.txt
+++ b/app/xterm/ctlseqs.txt
@@ -47,39 +47,39 @@ The following pairs of 7-bit and 8-bit control characters are equiva-
 lent:
 
 ESC D
-     Index (IND  is 0x84)
+     Index (IND  is 0x84).
 ESC E
-     Next Line (NEL  is 0x85)
+     Next Line (NEL  is 0x85).
 ESC H
-     Tab Set (HTS  is 0x88)
+     Tab Set (HTS  is 0x88).
 ESC M
-     Reverse Index (RI  is 0x8d)
+     Reverse Index (RI  is 0x8d).
 ESC N
-     Single Shift Select of G2 Character Set (SS2  is 0x8e): affects
-     next character only
+     Single Shift Select of G2 Character Set (SS2  is 0x8e).  This
+     affects next character only.
 ESC O
-     Single Shift Select of G3 Character Set (SS3  is 0x8f): affects
-     next character only
+     Single Shift Select of G3 Character Set (SS3  is 0x8f).  This
+     affects next character only.
 ESC P
-     Device Control String (DCS  is 0x90)
+     Device Control String (DCS  is 0x90).
 ESC V
-     Start of Guarded Area (SPA  is 0x96)
+     Start of Guarded Area (SPA  is 0x96).
 ESC W
-     End of Guarded Area (EPA  is 0x97)
+     End of Guarded Area (EPA  is 0x97).
 ESC X
-     Start of String (SOS  is 0x98)
+     Start of String (SOS  is 0x98).
 ESC Z
      Return Terminal ID (DECID is 0x9a).  Obsolete form of CSI c  (DA).
 ESC [
-     Control Sequence Introducer (CSI  is 0x9b)
+     Control Sequence Introducer (CSI  is 0x9b).
 ESC \
-     String Terminator (ST  is 0x9c)
+     String Terminator (ST  is 0x9c).
 ESC ]
-     Operating System Command (OSC  is 0x9d)
+     Operating System Command (OSC  is 0x9d).
 ESC ^
-     Privacy Message (PM  is 0x9e)
+     Privacy Message (PM  is 0x9e).
 ESC _
-     Application Program Command (APC  is 0x9f)
+     Application Program Command (APC  is 0x9f).
 
 These control characters are used in the vtXXX emulation.
 
@@ -87,7 +87,7 @@ VT100 Mode
 Most of these control sequences are standard VT102 control sequences,
 but there is support for later DEC VT terminals (i.e., VT220, VT320,
 VT420), as well as ISO 6429 and aixterm color controls.  The only VT102
-features not supported is auto-repeat, since the only way X provides for
+feature not supported is auto-repeat, since the only way X provides for
 this will affect all windows.  There are additional control sequences to
 provide xterm-dependent functions, such as the scrollbar or window size.
 Where the function is specified by DEC or ISO 6429, the code assigned to
@@ -96,70 +96,76 @@ character sets are specified by ISO 2022; see that document for a dis-
 cussion of character sets.
 
 Single-character functions
-BEL       Bell (Ctrl-G)
-BS        Backspace (Ctrl-H)
-CR        Carriage Return (Ctrl-M)
+BEL       Bell (Ctrl-G).
+BS        Backspace (Ctrl-H).
+CR        Carriage Return (Ctrl-M).
 ENQ       Return Terminal Status (Ctrl-E).  Default response is an empty
           string, but may be overridden by a resource answerbackString.
-FF        Form Feed or New Page (NP) (Ctrl-L) same as LF
-LF        Line Feed or New Line (NL) (Ctrl-J)
-SI        Shift In (Ctrl-O) -> Switch to Standard Character Set: invokes
-          the G0 character set (the default).
-SO        Shift Out (Ctrl-N) -> Switch to Alternate Character Set:
+FF        Form Feed or New Page (NP).  Ctrl-L is treated the same as LF.
+LF        Line Feed or New Line (NL).  (LF is Ctrl-J).
+SI        Shift In (Ctrl-O) -> Switch to Standard Character Set.  This
+          invokes the G0 character set (the default).
+SO        Shift Out (Ctrl-N) -> Switch to Alternate Character Set.  This
           invokes the G1 character set.
 SP        Space.
-TAB       Horizontal Tab (HT) (Ctrl-I)
-VT        Vertical Tab (Ctrl-K) same as LF
+TAB       Horizontal Tab (HT) (Ctrl-I).
+VT        Vertical Tab (Ctrl-K).  This is treated the same as LF.
 
-Controls beginning with ESC (other than those where ESC is part of a
-7-bit equivalent to 8-bit C1 controls), ordered by the final charac-
-ter(s).
+Controls beginning with ESC
+This excludes controls where ESC is part of a 7-bit equivalent to 8-bit
+C1 controls, ordered by the final character(s).
 ESC SP F  7-bit controls (S7C1T).
 ESC SP G  8-bit controls (S8C1T).
 ESC SP L  Set ANSI conformance level 1 (dpANS X3.134.1).
 ESC SP M  Set ANSI conformance level 2 (dpANS X3.134.1).
 ESC SP N  Set ANSI conformance level 3 (dpANS X3.134.1).
-ESC # 3   DEC double-height line, top half (DECDHL)
-ESC # 4   DEC double-height line, bottom half (DECDHL)
-ESC # 5   DEC single-width line (DECSWL)
-ESC # 6   DEC double-width line (DECDWL)
-ESC # 8   DEC Screen Alignment Test (DECALN)
-ESC % @   Select default character set, ISO 8859-1 (ISO 2022)
-ESC % G   Select UTF-8 character set (ISO 2022)
-ESC ( C   Designate G0 Character Set (ISO 2022)
-ESC ) C   Designate G1 Character Set (ISO 2022)
-ESC * C   Designate G2 Character Set (ISO 2022)
-ESC + C   Designate G3 Character Set (ISO 2022)
-          Final character C for designating 94-character sets (0 , A
-          and B  apply to VT100 and up, the remainder to VT220 and up):
-            C = 0  -> DEC Special Character and Line Drawing Set
-            C = A  -> United Kingdom (UK)
-            C = B  -> United States (USASCII)
-            C = 4  -> Dutch
-            C = C  or 5  -> Finnish
-            C = R  -> French
-            C = Q  -> French Canadian
-            C = K  -> German
-            C = Y  -> Italian
-            C = E  or 6  -> Norwegian/Danish
-            C = Z  -> Spanish
-            C = H  or 7  -> Swedish
-            C = =  -> Swiss
-ESC - C   Designate G1 Character Set (VT300)
-ESC . C   Designate G2 Character Set (VT300)
-ESC / C   Designate G3 Character Set (VT300)
+ESC # 3   DEC double-height line, top half (DECDHL).
+ESC # 4   DEC double-height line, bottom half (DECDHL).
+ESC # 5   DEC single-width line (DECSWL).
+ESC # 6   DEC double-width line (DECDWL).
+ESC # 8   DEC Screen Alignment Test (DECALN).
+ESC % @   Select default character set.  That is ISO 8859-1 (ISO 2022).
+ESC % G   Select UTF-8 character set (ISO 2022).
+ESC ( C   Designate G0 Character Set (ISO 2022, VT100).
+          Final character C for designating 94-character sets.  In this
+          list, 0 , A  and B  apply to VT100 and up, the remainder to
+          VT220 and up:
+            C = 0  -> DEC Special Character and Line Drawing Set.
+            C = A  -> United Kingdom (UK).
+            C = B  -> United States (USASCII).
+            C = 4  -> Dutch.
+            C = C  or 5  -> Finnish.
+            C = R  -> French.
+            C = Q  -> French Canadian.
+            C = K  -> German.
+            C = Y  -> Italian.
+            C = E  or 6  -> Norwegian/Danish.
+            C = Z  -> Spanish.
+            C = H  or 7  -> Swedish.
+            C = =  -> Swiss.
+ESC ) C   Designate G1 Character Set (ISO 2022, VT100).
+          The same character sets apply as for ESC ( C.
+ESC * C   Designate G2 Character Set (ISO 2022, VT220).
+          The same character sets apply as for ESC ( C.
+ESC + C   Designate G3 Character Set (ISO 2022, VT220).
+          The same character sets apply as for ESC ( C.
+ESC - C   Designate G1 Character Set (VT300).
+          The same character sets apply as for ESC ( C.
+ESC . C   Designate G2 Character Set (VT300).
+          The same character sets apply as for ESC ( C.
+ESC / C   Designate G3 Character Set (VT300).
           These work for 96-character sets only.
-            C = A  -> ISO Latin-1 Supplemental
-ESC 7     Save Cursor (DECSC)
-ESC 8     Restore Cursor (DECRC)
-ESC =     Application Keypad (DECPAM)
-ESC >     Normal Keypad (DECPNM)
-ESC F     Cursor to lower left corner of screen (if enabled by the
-          hpLowerleftBugCompat resource).
-ESC c     Full Reset (RIS)
+            C = A  -> ISO Latin-1 Supplemental.
+ESC 7     Save Cursor (DECSC).
+ESC 8     Restore Cursor (DECRC).
+ESC =     Application Keypad (DECPAM).
+ESC >     Normal Keypad (DECPNM).
+ESC F     Cursor to lower left corner of screen.  This is enabled by the
+          hpLowerleftBugCompat resource.
+ESC c     Full Reset (RIS).
 ESC l     Memory Lock (per HP terminals).  Locks memory above the cur-
           sor.
-ESC m     Memory Unlock (per HP terminals)
+ESC m     Memory Unlock (per HP terminals).
 ESC n     Invoke the G2 Character Set as GL (LS2).
 ESC o     Invoke the G3 Character Set as GL (LS3).
 ESC |     Invoke the G3 Character Set as GR (LS3R).
@@ -167,18 +173,18 @@ ESC }     Invoke the G2 Character Set as GR (LS2R).
 ESC ~     Invoke the G1 Character Set as GR (LS1R).
 
 Application Program-Control functions
-APC Pt ST xterm implements no APC  functions; Pt is ignored.  Pt need
-          not be printable characters.
+APC Pt ST None.  xterm implements no APC  functions; Pt is ignored.  Pt
+          need not be printable characters.
 
 Device-Control functions
 DCS Ps; Ps| Pt ST
           User-Defined Keys (DECUDK).  The first parameter:
             Ps = 0  -> Clear all UDK definitions before starting
-          (default)
-            Ps = 1  -> Erase Below (default)
+          (default).
+            Ps = 1  -> Erase Below (default).
           The second parameter:
-            Ps = 0  -> Lock the keys (default)
-            Ps = 1  -> Do not lock.
+            Ps = 0  <- Lock the keys (default).
+            Ps = 1  <- Do not lock.
           The third parameter is a ';'-separated list of strings denot-
           ing the key-code separated by a '/' from the hex-encoded key
           value.  The key codes correspond to the DEC function-key codes
@@ -214,41 +220,41 @@ DCS + q Pt ST
           ter).
 
 Functions using CSI , ordered by the final character(s)
-CSI Ps @  Insert Ps (Blank) Character(s) (default = 1) (ICH)
-CSI Ps A  Cursor Up Ps Times (default = 1) (CUU)
-CSI Ps B  Cursor Down Ps Times (default = 1) (CUD)
-CSI Ps C  Cursor Forward Ps Times (default = 1) (CUF)
-CSI Ps D  Cursor Backward Ps Times (default = 1) (CUB)
-CSI Ps E  Cursor Next Line Ps Times (default = 1) (CNL)
-CSI Ps F  Cursor Preceding Line Ps Times (default = 1) (CPL)
-CSI Ps G  Cursor Character Absolute  [column] (default = [row,1]) (CHA)
+CSI Ps @  Insert Ps (Blank) Character(s) (default = 1) (ICH).
+CSI Ps A  Cursor Up Ps Times (default = 1) (CUU).
+CSI Ps B  Cursor Down Ps Times (default = 1) (CUD).
+CSI Ps C  Cursor Forward Ps Times (default = 1) (CUF).
+CSI Ps D  Cursor Backward Ps Times (default = 1) (CUB).
+CSI Ps E  Cursor Next Line Ps Times (default = 1) (CNL).
+CSI Ps F  Cursor Preceding Line Ps Times (default = 1) (CPL).
+CSI Ps G  Cursor Character Absolute  [column] (default = [row,1]) (CHA).
 CSI Ps ; Ps H
-          Cursor Position [row;column] (default = [1,1]) (CUP)
-CSI Ps I  Cursor Forward Tabulation Ps tab stops (default = 1) (CHT)
-CSI Ps J  Erase in Display (ED)
-            Ps = 0  -> Erase Below (default)
-            Ps = 1  -> Erase Above
-            Ps = 2  -> Erase All
-            Ps = 3  -> Erase Saved Lines (xterm)
+          Cursor Position [row;column] (default = [1,1]) (CUP).
+CSI Ps I  Cursor Forward Tabulation Ps tab stops (default = 1) (CHT).
+CSI Ps J  Erase in Display (ED).
+            Ps = 0  -> Erase Below (default).
+            Ps = 1  -> Erase Above.
+            Ps = 2  -> Erase All.
+            Ps = 3  -> Erase Saved Lines (xterm).
 CSI ? Ps J
-          Erase in Display (DECSED)
-            Ps = 0  -> Selective Erase Below (default)
-            Ps = 1  -> Selective Erase Above
-            Ps = 2  -> Selective Erase All
-CSI Ps K  Erase in Line (EL)
-            Ps = 0  -> Erase to Right (default)
-            Ps = 1  -> Erase to Left
-            Ps = 2  -> Erase All
+          Erase in Display (DECSED).
+            Ps = 0  -> Selective Erase Below (default).
+            Ps = 1  -> Selective Erase Above.
+            Ps = 2  -> Selective Erase All.
+CSI Ps K  Erase in Line (EL).
+            Ps = 0  -> Erase to Right (default).
+            Ps = 1  -> Erase to Left.
+            Ps = 2  -> Erase All.
 CSI ? Ps K
-          Erase in Line (DECSEL)
-            Ps = 0  -> Selective Erase to Right (default)
-            Ps = 1  -> Selective Erase to Left
-            Ps = 2  -> Selective Erase All
-CSI Ps L  Insert Ps Line(s) (default = 1) (IL)
-CSI Ps M  Delete Ps Line(s) (default = 1) (DL)
-CSI Ps P  Delete Ps Character(s) (default = 1) (DCH)
-CSI Ps S  Scroll up Ps lines (default = 1) (SU)
-CSI Ps T  Scroll down Ps lines (default = 1) (SD)
+          Erase in Line (DECSEL).
+            Ps = 0  -> Selective Erase to Right (default).
+            Ps = 1  -> Selective Erase to Left.
+            Ps = 2  -> Selective Erase All.
+CSI Ps L  Insert Ps Line(s) (default = 1) (IL).
+CSI Ps M  Delete Ps Line(s) (default = 1) (DL).
+CSI Ps P  Delete Ps Character(s) (default = 1) (DCH).
+CSI Ps S  Scroll up Ps lines (default = 1) (SU).
+CSI Ps T  Scroll down Ps lines (default = 1) (SD).
 CSI Ps ; Ps ; Ps ; Ps ; Ps T
           Initiate highlight mouse tracking.  Parameters are
           [func;startx;starty;firstrow;lastrow].  See the section Mouse
@@ -258,17 +264,18 @@ CSI > Ps; Ps T
           value.  Normally, "reset" disables the feature.  It is possi-
           ble to disable the ability to reset features by compiling a
           different default for the title modes into xterm.
-            Ps = 0  -> Do not set window/icon labels using hexadecimal
-            Ps = 1  -> Do not query window/icon labels using hexadecimal
-            Ps = 2  -> Do not set window/icon labels using UTF-8
-            Ps = 3  -> Do not query window/icon labels using UTF-8 (See
-          discussion of "Title Modes")
-CSI Ps X  Erase Ps Character(s) (default = 1) (ECH)
-CSI Ps Z  Cursor Backward Tabulation Ps tab stops (default = 1) (CBT)
+            Ps = 0  -> Do not set window/icon labels using hexadecimal.
+            Ps = 1  -> Do not query window/icon labels using hexadeci-
+          mal.
+            Ps = 2  -> Do not set window/icon labels using UTF-8.
+            Ps = 3  -> Do not query window/icon labels using UTF-8.
+          (See discussion of "Title Modes").
+CSI Ps X  Erase Ps Character(s) (default = 1) (ECH).
+CSI Ps Z  Cursor Backward Tabulation Ps tab stops (default = 1) (CBT).
 CSI Pm `  Character Position Absolute  [column] (default = [row,1])
-          (HPA)
-CSI Ps b  Repeat the preceding graphic character Ps times (REP)
-CSI Ps c  Send Device Attributes (Primary DA)
+          (HPA).
+CSI Ps b  Repeat the preceding graphic character Ps times (REP).
+CSI Ps c  Send Device Attributes (Primary DA).
             Ps = 0  or omitted -> request attributes from terminal.  The
           response depends on the decTerminalID resource setting.
             -> CSI ? 1 ; 2 c  (``VT100 with Advanced Video Option'')
@@ -278,73 +285,73 @@ CSI Ps c  Send Device Attributes (Primary DA)
           The VT100-style response parameters do not mean anything by
           themselves.  VT220 parameters do, telling the host what fea-
           tures the terminal supports:
-            -> 1  132-columns
-            -> 2  Printer
-            -> 6  Selective erase
-            -> 8  User-defined keys
-            -> 9  National replacement character sets
-            -> 1 5  Technical characters
-            -> 2 2  ANSI color, e.g., VT525
-            -> 2 9  ANSI text locator (i.e., DEC Locator mode)
+            Ps = 1  -> 132-columns.
+            Ps = 2  -> Printer.
+            Ps = 6  -> Selective erase.
+            Ps = 8  -> User-defined keys.
+            Ps = 9  -> National replacement character sets.
+            Ps = 1 5  -> Technical characters.
+            Ps = 2 2  -> ANSI color, e.g., VT525.
+            Ps = 2 9  -> ANSI text locator (i.e., DEC Locator mode).
 CSI > Ps c
-          Send Device Attributes (Secondary DA)
+          Send Device Attributes (Secondary DA).
             Ps = 0  or omitted -> request the terminal's identification
           code.  The response depends on the decTerminalID resource set-
           ting.  It should apply only to VT220 and up, but xterm extends
           this to VT100.
             -> CSI  > Pp ; Pv ; Pc c
           where Pp denotes the terminal type
-            -> 0  (``VT100'')
-            -> 1  (``VT220'')
+            Pp = 0  -> ``VT100''.
+            Pp = 1  -> ``VT220''.
           and Pv is the firmware version (for xterm, this was originally
           the XFree86 patch number, starting with 95).  In a DEC termi-
           nal, Pc indicates the ROM cartridge registration number and is
           always zero.
-CSI Pm d  Line Position Absolute  [row] (default = [1,column]) (VPA)
+CSI Pm d  Line Position Absolute  [row] (default = [1,column]) (VPA).
 CSI Ps ; Ps f
           Horizontal and Vertical Position [row;column] (default =
-          [1,1]) (HVP)
-CSI Ps g  Tab Clear (TBC)
-            Ps = 0  -> Clear Current Column (default)
-            Ps = 3  -> Clear All
-CSI Pm h  Set Mode (SM)
-            Ps = 2  -> Keyboard Action Mode (AM)
-            Ps = 4  -> Insert Mode (IRM)
-            Ps = 1 2  -> Send/receive (SRM)
-            Ps = 2 0  -> Automatic Newline (LNM)
+          [1,1]) (HVP).
+CSI Ps g  Tab Clear (TBC).
+            Ps = 0  -> Clear Current Column (default).
+            Ps = 3  -> Clear All.
+CSI Pm h  Set Mode (SM).
+            Ps = 2  -> Keyboard Action Mode (AM).
+            Ps = 4  -> Insert Mode (IRM).
+            Ps = 1 2  -> Send/receive (SRM).
+            Ps = 2 0  -> Automatic Newline (LNM).
 CSI ? Pm h
-          DEC Private Mode Set (DECSET)
-            Ps = 1  -> Application Cursor Keys (DECCKM)
+          DEC Private Mode Set (DECSET).
+            Ps = 1  -> Application Cursor Keys (DECCKM).
             Ps = 2  -> Designate USASCII for character sets G0-G3
           (DECANM), and set VT100 mode.
-            Ps = 3  -> 132 Column Mode (DECCOLM)
-            Ps = 4  -> Smooth (Slow) Scroll (DECSCLM)
-            Ps = 5  -> Reverse Video (DECSCNM)
-            Ps = 6  -> Origin Mode (DECOM)
-            Ps = 7  -> Wraparound Mode (DECAWM)
-            Ps = 8  -> Auto-repeat Keys (DECARM)
+            Ps = 3  -> 132 Column Mode (DECCOLM).
+            Ps = 4  -> Smooth (Slow) Scroll (DECSCLM).
+            Ps = 5  -> Reverse Video (DECSCNM).
+            Ps = 6  -> Origin Mode (DECOM).
+            Ps = 7  -> Wraparound Mode (DECAWM).
+            Ps = 8  -> Auto-repeat Keys (DECARM).
             Ps = 9  -> Send Mouse X & Y on button press.  See the sec-
           tion Mouse Tracking.
-            Ps = 1 0  -> Show toolbar (rxvt)
-            Ps = 1 2  -> Start Blinking Cursor (att610)
-            Ps = 1 8  -> Print form feed (DECPFF)
-            Ps = 1 9  -> Set print extent to full screen (DECPEX)
-            Ps = 2 5  -> Show Cursor (DECTCEM)
+            Ps = 1 0  -> Show toolbar (rxvt).
+            Ps = 1 2  -> Start Blinking Cursor (att610).
+            Ps = 1 8  -> Print form feed (DECPFF).
+            Ps = 1 9  -> Set print extent to full screen (DECPEX).
+            Ps = 2 5  -> Show Cursor (DECTCEM).
             Ps = 3 0  -> Show scrollbar (rxvt).
             Ps = 3 5  -> Enable font-shifting functions (rxvt).
-            Ps = 3 8  -> Enter Tektronix Mode (DECTEK)
-            Ps = 4 0  -> Allow 80 -> 132 Mode
-            Ps = 4 1  -> more(1) fix (see curses resource)
+            Ps = 3 8  -> Enter Tektronix Mode (DECTEK).
+            Ps = 4 0  -> Allow 80 -> 132 Mode.
+            Ps = 4 1  -> more(1) fix (see curses resource).
             Ps = 4 2  -> Enable Nation Replacement Character sets (DECN-
-          RCM)
-            Ps = 4 4  -> Turn On Margin Bell
-            Ps = 4 5  -> Reverse-wraparound Mode
-            Ps = 4 6  -> Start Logging (normally disabled by a compile-
-          time option)
-            Ps = 4 7  -> Use Alternate Screen Buffer (unless disabled by
-          the titeInhibit resource)
-            Ps = 6 6  -> Application keypad (DECNKM)
-            Ps = 6 7  -> Backarrow key sends backspace (DECBKM)
+          RCM).
+            Ps = 4 4  -> Turn On Margin Bell.
+            Ps = 4 5  -> Reverse-wraparound Mode.
+            Ps = 4 6  -> Start Logging.  This is normally disabled by a
+          compile-time option.
+            Ps = 4 7  -> Use Alternate Screen Buffer.  (This may be dis-
+          abled by the titeInhibit resource).
+            Ps = 6 6  -> Application keypad (DECNKM).
+            Ps = 6 7  -> Backarrow key sends backspace (DECBKM).
             Ps = 1 0 0 0  -> Send Mouse X & Y on button press and
           release.  See the section Mouse Tracking.
             Ps = 1 0 0 1  -> Use Hilite Mouse Tracking.
@@ -357,29 +364,31 @@ CSI ? Pm h
             Ps = 1 0 3 4  -> Interpret "meta" key, sets eighth bit.
           (enables the eightBitInput resource).
             Ps = 1 0 3 5  -> Enable special modifiers for Alt and Num-
-          Lock keys (enables the numLock resource).
-            Ps = 1 0 3 6  -> Send ESC when Meta modifies a key (enables
-          the metaSendsEscape resource).
-            Ps = 1 0 3 7  -> Send DEL from the editing-keypad Delete key
-            Ps = 1 0 3 9  -> Send ESC when Alt modifies a key (enables
-          the altSendsEscape resource).
-            Ps = 1 0 4 0  -> Keep selection even if not highlighted
-          (enables the keepSelection resource).
-            Ps = 1 0 4 1  -> Use the CLIPBOARD selection (enables the
-          selectToClipboard resource).
+          Lock keys.  (This enables the numLock resource).
+            Ps = 1 0 3 6  -> Send ESC when Meta modifies a key.  (This
+          enables the metaSendsEscape resource).
+            Ps = 1 0 3 7  -> Send DEL from the editing-keypad Delete
+          key.
+            Ps = 1 0 3 9  -> Send ESC when Alt modifies a key.  (This
+          enables the altSendsEscape resource).
+            Ps = 1 0 4 0  -> Keep selection even if not highlighted.
+          (This enables the keepSelection resource).
+            Ps = 1 0 4 1  -> Use the CLIPBOARD selection.  (This enables
+          the selectToClipboard resource).
             Ps = 1 0 4 2  -> Enable Urgency window manager hint when
-          Control-G is received (enables the bellIsUrgent resource).
+          Control-G is received.  (This enables the bellIsUrgent
+          resource).
             Ps = 1 0 4 3  -> Enable raising of the window when Control-G
-          is received (enables the popOnBell resource).
-            Ps = 1 0 4 7  -> Use Alternate Screen Buffer (unless dis-
-          abled by the titeInhibit resource)
-            Ps = 1 0 4 8  -> Save cursor as in DECSC (unless disabled by
-          the titeInhibit resource)
+          is received.  (enables the popOnBell resource).
+            Ps = 1 0 4 7  -> Use Alternate Screen Buffer.  (This may be
+          disabled by the titeInhibit resource).
+            Ps = 1 0 4 8  -> Save cursor as in DECSC.  (This may be dis-
+          abled by the titeInhibit resource).
             Ps = 1 0 4 9  -> Save cursor as in DECSC and use Alternate
-          Screen Buffer, clearing it first (unless disabled by the
-          titeInhibit resource).  This combines the effects of the 1 0 4
-          7  and 1 0 4 8  modes.  Use this with terminfo-based applica-
-          tions rather than the 4 7  mode.
+          Screen Buffer, clearing it first.  (This may be disabled by
+          the titeInhibit resource).  This combines the effects of the 1
+          0 4 7  and 1 0 4 8  modes.  Use this with terminfo-based
+          applications rather than the 4 7  mode.
             Ps = 1 0 5 0  -> Set terminfo/termcap function-key mode.
             Ps = 1 0 5 1  -> Set Sun function-key mode.
             Ps = 1 0 5 2  -> Set HP function-key mode.
@@ -387,51 +396,51 @@ CSI ? Pm h
             Ps = 1 0 6 0  -> Set legacy keyboard emulation (X11R6).
             Ps = 1 0 6 1  -> Set VT220 keyboard emulation.
             Ps = 2 0 0 4  -> Set bracketed paste mode.
-CSI Pm i  Media Copy (MC)
-            Ps = 0  -> Print screen (default)
-            Ps = 4  -> Turn off printer controller mode
-            Ps = 5  -> Turn on printer controller mode
+CSI Pm i  Media Copy (MC).
+            Ps = 0  -> Print screen (default).
+            Ps = 4  -> Turn off printer controller mode.
+            Ps = 5  -> Turn on printer controller mode.
 CSI ? Pm i
-          Media Copy (MC, DEC-specific)
-            Ps = 1  -> Print line containing cursor
-            Ps = 4  -> Turn off autoprint mode
-            Ps = 5  -> Turn on autoprint mode
-            Ps = 1  0  -> Print composed display, ignores DECPEX
-            Ps = 1  1  -> Print all pages
-CSI Pm l  Reset Mode (RM)
-            Ps = 2  -> Keyboard Action Mode (AM)
-            Ps = 4  -> Replace Mode (IRM)
-            Ps = 1 2  -> Send/receive (SRM)
-            Ps = 2 0  -> Normal Linefeed (LNM)
+          Media Copy (MC, DEC-specific).
+            Ps = 1  -> Print line containing cursor.
+            Ps = 4  -> Turn off autoprint mode.
+            Ps = 5  -> Turn on autoprint mode.
+            Ps = 1  0  -> Print composed display, ignores DECPEX.
+            Ps = 1  1  -> Print all pages.
+CSI Pm l  Reset Mode (RM).
+            Ps = 2  -> Keyboard Action Mode (AM).
+            Ps = 4  -> Replace Mode (IRM).
+            Ps = 1 2  -> Send/receive (SRM).
+            Ps = 2 0  -> Normal Linefeed (LNM).
 CSI ? Pm l
-          DEC Private Mode Reset (DECRST)
-            Ps = 1  -> Normal Cursor Keys (DECCKM)
+          DEC Private Mode Reset (DECRST).
+            Ps = 1  -> Normal Cursor Keys (DECCKM).
             Ps = 2  -> Designate VT52 mode (DECANM).
-            Ps = 3  -> 80 Column Mode (DECCOLM)
-            Ps = 4  -> Jump (Fast) Scroll (DECSCLM)
-            Ps = 5  -> Normal Video (DECSCNM)
-            Ps = 6  -> Normal Cursor Mode (DECOM)
-            Ps = 7  -> No Wraparound Mode (DECAWM)
-            Ps = 8  -> No Auto-repeat Keys (DECARM)
-            Ps = 9  -> Don't send Mouse X & Y on button press
-            Ps = 1 0  -> Hide toolbar (rxvt)
-            Ps = 1 2  -> Stop Blinking Cursor (att610)
-            Ps = 1 8  -> Don't print form feed (DECPFF)
-            Ps = 1 9  -> Limit print to scrolling region (DECPEX)
-            Ps = 2 5  -> Hide Cursor (DECTCEM)
+            Ps = 3  -> 80 Column Mode (DECCOLM).
+            Ps = 4  -> Jump (Fast) Scroll (DECSCLM).
+            Ps = 5  -> Normal Video (DECSCNM).
+            Ps = 6  -> Normal Cursor Mode (DECOM).
+            Ps = 7  -> No Wraparound Mode (DECAWM).
+            Ps = 8  -> No Auto-repeat Keys (DECARM).
+            Ps = 9  -> Don't send Mouse X & Y on button press.
+            Ps = 1 0  -> Hide toolbar (rxvt).
+            Ps = 1 2  -> Stop Blinking Cursor (att610).
+            Ps = 1 8  -> Don't print form feed (DECPFF).
+            Ps = 1 9  -> Limit print to scrolling region (DECPEX).
+            Ps = 2 5  -> Hide Cursor (DECTCEM).
             Ps = 3 0  -> Don't show scrollbar (rxvt).
             Ps = 3 5  -> Disable font-shifting functions (rxvt).
-            Ps = 4 0  -> Disallow 80 -> 132 Mode
-            Ps = 4 1  -> No more(1) fix (see curses resource)
+            Ps = 4 0  -> Disallow 80 -> 132 Mode.
+            Ps = 4 1  -> No more(1) fix (see curses resource).
             Ps = 4 2  -> Disable Nation Replacement Character sets (DEC-
-          NRCM)
-            Ps = 4 4  -> Turn Off Margin Bell
-            Ps = 4 5  -> No Reverse-wraparound Mode
-            Ps = 4 6  -> Stop Logging (normally disabled by a compile-
-          time option)
-            Ps = 4 7  -> Use Normal Screen Buffer
-            Ps = 6 6  -> Numeric keypad (DECNKM)
-            Ps = 6 7  -> Backarrow key sends delete (DECBKM)
+          NRCM).
+            Ps = 4 4  -> Turn Off Margin Bell.
+            Ps = 4 5  -> No Reverse-wraparound Mode.
+            Ps = 4 6  -> Stop Logging.  (This is normally disabled by a
+          compile-time option).
+            Ps = 4 7  -> Use Normal Screen Buffer.
+            Ps = 6 6  -> Numeric keypad (DECNKM).
+            Ps = 6 7  -> Backarrow key sends delete (DECBKM).
             Ps = 1 0 0 0  -> Don't send Mouse X & Y on button press and
           release.  See the section Mouse Tracking.
             Ps = 1 0 0 1  -> Don't use Hilite Mouse Tracking.
@@ -442,34 +451,35 @@ CSI ? Pm l
             Ps = 1 0 1 0  -> Don't scroll to bottom on tty output
           (rxvt).
             Ps = 1 0 1 1  -> Don't scroll to bottom on key press (rxvt).
-            Ps = 1 0 3 4  -> Don't interpret "meta" key (disables the
-          eightBitInput resource).
+            Ps = 1 0 3 4  -> Don't interpret "meta" key.  (This disables
+          the eightBitInput resource).
             Ps = 1 0 3 5  -> Disable special modifiers for Alt and Num-
-          Lock keys (disables the numLock resource).
-            Ps = 1 0 3 6  -> Don't send ESC when Meta modifies a key
-          (disables the metaSendsEscape resource).
+          Lock keys.  (This disables the numLock resource).
+            Ps = 1 0 3 6  -> Don't send ESC when Meta modifies a key.
+          (This disables the metaSendsEscape resource).
             Ps = 1 0 3 7  -> Send VT220 Remove from the editing-keypad
-          Delete key
-            Ps = 1 0 3 9  -> Don't send ESC when Alt modifies a key
-          (disables the altSendsEscape resource).
-            Ps = 1 0 4 0  -> Do not keep selection when not highlighted
-          (disables the keepSelection resource).
-            Ps = 1 0 4 1  -> Use the PRIMARY selection.  (disables the
-          selectToClipboard resource).
+          Delete key.
+            Ps = 1 0 3 9  -> Don't send ESC when Alt modifies a key.
+          (This disables the altSendsEscape resource).
+            Ps = 1 0 4 0  -> Do not keep selection when not highlighted.
+          (This disables the keepSelection resource).
+            Ps = 1 0 4 1  -> Use the PRIMARY selection.  (This disables
+          the selectToClipboard resource).
             Ps = 1 0 4 2  -> Disable Urgency window manager hint when
-          Control-G is received (disables the bellIsUrgent resource).
+          Control-G is received.  (This disables the bellIsUrgent
+          resource).
             Ps = 1 0 4 3  -> Disable raising of the window when Control-
-          G is received (disables the popOnBell resource).
+          G is received.  (This disables the popOnBell resource).
             Ps = 1 0 4 7  -> Use Normal Screen Buffer, clearing screen
-          first if in the Alternate Screen (unless disabled by the
-          titeInhibit resource)
-            Ps = 1 0 4 8  -> Restore cursor as in DECRC (unless disabled
-          by the titeInhibit resource)
+          first if in the Alternate Screen.  (This may be disabled by
+          the titeInhibit resource).
+            Ps = 1 0 4 8  -> Restore cursor as in DECRC.  (This may be
+          disabled by the titeInhibit resource).
             Ps = 1 0 4 9  -> Use Normal Screen Buffer and restore cursor
-          as in DECRC (unless disabled by the titeInhibit resource).
-          This combines the effects of the 1 0 4 7  and 1 0 4 8  modes.
-          Use this with terminfo-based applications rather than the 4 7
-          mode.
+          as in DECRC.  (This may be disabled by the titeInhibit
+          resource).  This combines the effects of the 1 0 4 7  and 1 0
+          4 8  modes.  Use this with terminfo-based applications rather
+          than the 4 7  mode.
             Ps = 1 0 5 0  -> Reset terminfo/termcap function-key mode.
             Ps = 1 0 5 1  -> Reset Sun function-key mode.
             Ps = 1 0 5 2  -> Reset HP function-key mode.
@@ -477,66 +487,68 @@ CSI ? Pm l
             Ps = 1 0 6 0  -> Reset legacy keyboard emulation (X11R6).
             Ps = 1 0 6 1  -> Reset keyboard emulation to Sun/PC style.
             Ps = 2 0 0 4  -> Reset bracketed paste mode.
-CSI Pm m  Character Attributes (SGR)
-            Ps = 0  -> Normal (default)
-            Ps = 1  -> Bold
-            Ps = 4  -> Underlined
-            Ps = 5  -> Blink (appears as Bold)
-            Ps = 7  -> Inverse
-            Ps = 8  -> Invisible, i.e., hidden (VT300)
-            Ps = 2 2  -> Normal (neither bold nor faint)
-            Ps = 2 4  -> Not underlined
-            Ps = 2 5  -> Steady (not blinking)
-            Ps = 2 7  -> Positive (not inverse)
-            Ps = 2 8  -> Visible, i.e., not hidden (VT300)
-            Ps = 3 0  -> Set foreground color to Black
-            Ps = 3 1  -> Set foreground color to Red
-            Ps = 3 2  -> Set foreground color to Green
-            Ps = 3 3  -> Set foreground color to Yellow
-            Ps = 3 4  -> Set foreground color to Blue
-            Ps = 3 5  -> Set foreground color to Magenta
-            Ps = 3 6  -> Set foreground color to Cyan
-            Ps = 3 7  -> Set foreground color to White
-            Ps = 3 9  -> Set foreground color to default (original)
-            Ps = 4 0  -> Set background color to Black
-            Ps = 4 1  -> Set background color to Red
-            Ps = 4 2  -> Set background color to Green
-            Ps = 4 3  -> Set background color to Yellow
-            Ps = 4 4  -> Set background color to Blue
-            Ps = 4 5  -> Set background color to Magenta
-            Ps = 4 6  -> Set background color to Cyan
-            Ps = 4 7  -> Set background color to White
+CSI Pm m  Character Attributes (SGR).
+            Ps = 0  -> Normal (default).
+            Ps = 1  -> Bold.
+            Ps = 4  -> Underlined.
+            Ps = 5  -> Blink (appears as Bold).
+            Ps = 7  -> Inverse.
+            Ps = 8  -> Invisible, i.e., hidden (VT300).
+            Ps = 2 2  -> Normal (neither bold nor faint).
+            Ps = 2 4  -> Not underlined.
+            Ps = 2 5  -> Steady (not blinking).
+            Ps = 2 7  -> Positive (not inverse).
+            Ps = 2 8  -> Visible, i.e., not hidden (VT300).
+            Ps = 3 0  -> Set foreground color to Black.
+            Ps = 3 1  -> Set foreground color to Red.
+            Ps = 3 2  -> Set foreground color to Green.
+            Ps = 3 3  -> Set foreground color to Yellow.
+            Ps = 3 4  -> Set foreground color to Blue.
+            Ps = 3 5  -> Set foreground color to Magenta.
+            Ps = 3 6  -> Set foreground color to Cyan.
+            Ps = 3 7  -> Set foreground color to White.
+            Ps = 3 9  -> Set foreground color to default (original).
+            Ps = 4 0  -> Set background color to Black.
+            Ps = 4 1  -> Set background color to Red.
+            Ps = 4 2  -> Set background color to Green.
+            Ps = 4 3  -> Set background color to Yellow.
+            Ps = 4 4  -> Set background color to Blue.
+            Ps = 4 5  -> Set background color to Magenta.
+            Ps = 4 6  -> Set background color to Cyan.
+            Ps = 4 7  -> Set background color to White.
             Ps = 4 9  -> Set background color to default (original).
 
           If 16-color support is compiled, the following apply.  Assume
           that xterm's resources are set so that the ISO color codes are
           the first 8 of a set of 16.  Then the aixterm colors are the
           bright versions of the ISO colors:
-            Ps = 9 0  -> Set foreground color to Black
-            Ps = 9 1  -> Set foreground color to Red
-            Ps = 9 2  -> Set foreground color to Green
-            Ps = 9 3  -> Set foreground color to Yellow
-            Ps = 9 4  -> Set foreground color to Blue
-            Ps = 9 5  -> Set foreground color to Magenta
-            Ps = 9 6  -> Set foreground color to Cyan
-            Ps = 9 7  -> Set foreground color to White
-            Ps = 1 0 0  -> Set background color to Black
-            Ps = 1 0 1  -> Set background color to Red
-            Ps = 1 0 2  -> Set background color to Green
-            Ps = 1 0 3  -> Set background color to Yellow
-            Ps = 1 0 4  -> Set background color to Blue
-            Ps = 1 0 5  -> Set background color to Magenta
-            Ps = 1 0 6  -> Set background color to Cyan
-            Ps = 1 0 7  -> Set background color to White
+            Ps = 9 0  -> Set foreground color to Black.
+            Ps = 9 1  -> Set foreground color to Red.
+            Ps = 9 2  -> Set foreground color to Green.
+            Ps = 9 3  -> Set foreground color to Yellow.
+            Ps = 9 4  -> Set foreground color to Blue.
+            Ps = 9 5  -> Set foreground color to Magenta.
+            Ps = 9 6  -> Set foreground color to Cyan.
+            Ps = 9 7  -> Set foreground color to White.
+            Ps = 1 0 0  -> Set background color to Black.
+            Ps = 1 0 1  -> Set background color to Red.
+            Ps = 1 0 2  -> Set background color to Green.
+            Ps = 1 0 3  -> Set background color to Yellow.
+            Ps = 1 0 4  -> Set background color to Blue.
+            Ps = 1 0 5  -> Set background color to Magenta.
+            Ps = 1 0 6  -> Set background color to Cyan.
+            Ps = 1 0 7  -> Set background color to White.
 
           If xterm is compiled with the 16-color support disabled, it
           supports the following, from rxvt:
             Ps = 1 0 0  -> Set foreground and background color to
-          default
+          default.
 
           If 88- or 256-color support is compiled, the following apply.
-            Ps = 3 8  ; 5  ; Ps -> Set foreground color to the second Ps
-            Ps = 4 8  ; 5  ; Ps -> Set background color to the second Ps
+            Ps = 3 8  ; 5  ; Ps -> Set foreground color to the second
+          Ps.
+            Ps = 4 8  ; 5  ; Ps -> Set background color to the second
+          Ps.
 
 CSI > Ps; Ps m
           Set or reset resource-values used by xterm to decide whether
@@ -545,52 +557,56 @@ CSI > Ps; Ps m
           tifies the resource to set/reset.  The second parameter is the
           value to assign to the resource.  If the second parameter is
           omitted, the resource is reset to its initial value.
-            -> 1  modifyCursorKeys
-            -> 2  modifyFunctionKeys
-            -> 4  modifyOtherKeys
+            Ps = 1  -> modifyCursorKeys.
+            Ps = 2  -> modifyFunctionKeys.
+            Ps = 4  -> modifyOtherKeys.
           If no parameters are given, all resources are reset to their
           initial values.
-CSI Ps n  Device Status Report (DSR)
-            Ps = 5  -> Status Report CSI 0 n  (``OK'')
-            Ps = 6  -> Report Cursor Position (CPR) [row;column] as
+CSI Ps n  Device Status Report (DSR).
+            Ps = 5  -> Status Report.  Result (``OK'') is
+          CSI 0 n
+            Ps = 6  -> Report Cursor Position (CPR) [row;column].
+          Result is
           CSI r ; c R
 CSI > Ps n
           Disable modifiers which may be enabled via the CSI > Ps; Ps m
           sequence.  This corresponds to a resource value of "-1", which
           cannot be set with the other sequence.  The parameter identi-
           fies the resource to be disabled:
-            -> 1  modifyCursorKeys
-            -> 2  modifyFunctionKeys
-            -> 4  modifyOtherKeys If the parameter is omitted, modify-
-          FunctionKeys is disabled.  When modifyFunctionKeys is dis-
-          abled, xterm uses the modifier keys to make an extended
-          sequence of functions rather than adding a parameter to each
-          function key to denote the modifiers.
+            Ps = 1  -> modifyCursorKeys.
+            Ps = 2  -> modifyFunctionKeys.
+            Ps = 4  -> modifyOtherKeys.
+          If the parameter is omitted, modifyFunctionKeys is disabled.
+          When modifyFunctionKeys is disabled, xterm uses the modifier
+          keys to make an extended sequence of functions rather than
+          adding a parameter to each function key to denote the modi-
+          fiers.
 CSI ? Ps n
-          Device Status Report (DSR, DEC-specific)
+          Device Status Report (DSR, DEC-specific).
             Ps = 6  -> Report Cursor Position (CPR) [row;column] as CSI
           ? r ; c R (assumes page is zero).
-            Ps = 1 5  -> Report Printer status as CSI ? 1 0  n  (ready)
-          or CSI ? 1 1  n  (not ready)
+            Ps = 1 5  -> Report Printer status as CSI ? 1 0  n  (ready).
+          or CSI ? 1 1  n  (not ready).
             Ps = 2 5  -> Report UDK status as CSI ? 2 0  n  (unlocked)
-          or CSI ? 2 1  n  (locked)
+          or CSI ? 2 1  n  (locked).
             Ps = 2 6  -> Report Keyboard status as
-          CSI ? 2 7  ;  1  ;  0  ;  0  n  (North American)
+          CSI ? 2 7  ;  1  ;  0  ;  0  n  (North American).
           The last two parameters apply to VT400 & up, and denote key-
           board ready and LK01 respectively.
             Ps = 5 3  -> Report Locator status as
           CSI ? 5 3  n  Locator available, if compiled-in, or
           CSI ? 5 0  n  No Locator, if not.
 CSI > Ps p
-          Set resource value pointerMode, used by xterm to decide
-          whether to hide the pointer cursor as the user types.  Valid
-          values for the parameter:
-            Ps = 0  -> never hide the pointer
-            Ps = 1  -> hide if the mouse tracking mode is not enabled
-            Ps = 2  -> always hide the pointer If no parameter is given,
-          xterm uses the default, which is 1 .
-CSI ! p   Soft terminal reset (DECSTR)
-CSI Ps$ p Request ANSI mode (DECRQM).  For VT300 and up, reply is
+          Set resource value pointerMode.  This is used by xterm to
+          decide whether to hide the pointer cursor as the user types.
+          Valid values for the parameter:
+            Ps = 0  -> never hide the pointer.
+            Ps = 1  -> hide if the mouse tracking mode is not enabled.
+            Ps = 2  -> always hide the pointer.  If no parameter is
+          given, xterm uses the default, which is 1 .
+CSI ! p   Soft terminal reset (DECSTR).
+CSI Ps$ p
+          Request ANSI mode (DECRQM).  For VT300 and up, reply is
             CSI Ps; Pm$ p
           where Ps is the mode number as in RM, and Pm is the mode
           value:
@@ -605,47 +621,47 @@ CSI ? Ps$ p
           where Ps is the mode number as in DECSET, Pm is the mode value
           as in the ANSI DECRQM.
 CSI Ps ; Ps " p
-          Set conformance level (DECSCL) Valid values for the first
+          Set conformance level (DECSCL).  Valid values for the first
           parameter:
-            Ps = 6 1  -> VT100
-            Ps = 6 2  -> VT200
-            Ps = 6 3  -> VT300
+            Ps = 6 1  -> VT100.
+            Ps = 6 2  -> VT200.
+            Ps = 6 3  -> VT300.
           Valid values for the second parameter:
-            Ps = 0  -> 8-bit controls
-            Ps = 1  -> 7-bit controls (always set for VT100)
-            Ps = 2  -> 8-bit controls
-CSI Ps q  Load LEDs (DECLL)
-            Ps = 0  -> Clear all LEDS (default)
-            Ps = 1  -> Light Num Lock
-            Ps = 2  -> Light Caps Lock
-            Ps = 3  -> Light Scroll Lock
-            Ps = 2  1  -> Extinguish Num Lock
-            Ps = 2  2  -> Extinguish Caps Lock
-            Ps = 2  3  -> Extinguish Scroll Lock
+            Ps = 0  -> 8-bit controls.
+            Ps = 1  -> 7-bit controls (always set for VT100).
+            Ps = 2  -> 8-bit controls.
+CSI Ps q  Load LEDs (DECLL).
+            Ps = 0  -> Clear all LEDS (default).
+            Ps = 1  -> Light Num Lock.
+            Ps = 2  -> Light Caps Lock.
+            Ps = 3  -> Light Scroll Lock.
+            Ps = 2  1  -> Extinguish Num Lock.
+            Ps = 2  2  -> Extinguish Caps Lock.
+            Ps = 2  3  -> Extinguish Scroll Lock.
 CSI Ps SP q
-          Set cursor style (DECSCUSR, VT520)
-            Ps = 0  -> blinking block
-            Ps = 1  -> blinking block (default)
-            Ps = 2  -> steady block
-            Ps = 3  -> blinking underline
-            Ps = 4  -> steady underline
+          Set cursor style (DECSCUSR, VT520).
+            Ps = 0  -> blinking block.
+            Ps = 1  -> blinking block (default).
+            Ps = 2  -> steady block.
+            Ps = 3  -> blinking underline.
+            Ps = 4  -> steady underline.
 CSI Ps " q
           Select character protection attribute (DECSCA).  Valid values
           for the parameter:
-            Ps = 0  -> DECSED and DECSEL can erase (default)
-            Ps = 1  -> DECSED and DECSEL cannot erase
-            Ps = 2  -> DECSED and DECSEL can erase
+            Ps = 0  -> DECSED and DECSEL can erase (default).
+            Ps = 1  -> DECSED and DECSEL cannot erase.
+            Ps = 2  -> DECSED and DECSEL can erase.
 CSI Ps ; Ps r
           Set Scrolling Region [top;bottom] (default = full size of win-
-          dow) (DECSTBM)
+          dow) (DECSTBM).
 CSI ? Pm r
           Restore DEC Private Mode Values.  The value of Ps previously
           saved is restored.  Ps values are the same as for DECSET.
 CSI Pt; Pl; Pb; Pr; Ps$ r
           Change Attributes in Rectangular Area (DECCARA), VT400 and up.
             Pt; Pl; Pb; Pr denotes the rectangle.
-            Ps denotes the SGR attributes to change: 0, 1, 4, 5, 7
-CSI s     Save cursor (ANSI.SYS)
+            Ps denotes the SGR attributes to change: 0, 1, 4, 5, 7.
+CSI s     Save cursor (ANSI.SYS).
 CSI ? Pm s
           Save DEC Private Mode Values.  Ps values are the same as for
           DECSET.
@@ -672,16 +688,18 @@ CSI Ps ; Ps ; Ps t
             Ps = 1 1  -> Report xterm window state.  If the xterm window
           is open (non-iconified), it returns CSI 1 t .  If the xterm
           window is iconified, it returns CSI 2 t .
-            Ps = 1 3  -> Report xterm window position as CSI 3 ; x ; y t
-            Ps = 1 4  -> Report xterm window in pixels as CSI  4  ;
-          height ;  width t
-            Ps = 1 8  -> Report the size of the text area in characters
-          as CSI  8  ;  height ;  width t
-            Ps = 1 9  -> Report the size of the screen in characters as
-          CSI  9  ;  height ;  width t
-            Ps = 2 0  -> Report xterm window's icon label as OSC  L
+            Ps = 1 3  -> Report xterm window position.  Result is CSI 3
+          ; x ; y t
+            Ps = 1 4  -> Report xterm window in pixels.  Result is CSI
+          4  ;  height ;  width t
+            Ps = 1 8  -> Report the size of the text area in characters.
+          Result is CSI  8  ;  height ;  width t
+            Ps = 1 9  -> Report the size of the screen in characters.
+          Result is CSI  9  ;  height ;  width t
+            Ps = 2 0  -> Report xterm window's icon label.  Result is
+          OSC  L  label ST
+            Ps = 2 1  -> Report xterm window's title.  Result is OSC  l
           label ST
-            Ps = 2 1  -> Report xterm window's title as OSC  l  label ST
             Ps = 2 2  ;  0  -> Save xterm icon and window title on
           stack.
             Ps = 2 2  ;  1  -> Save xterm icon title on stack.
@@ -690,33 +708,33 @@ CSI Ps ; Ps ; Ps t
           stack.
             Ps = 2 3  ;  1  -> Restore xterm icon title from stack.
             Ps = 2 3  ;  2  -> Restore xterm window title from stack.
-            Ps >= 2 4  -> Resize to Ps lines (DECSLPP)
+            Ps >= 2 4  -> Resize to Ps lines (DECSLPP).
 CSI Pt; Pl; Pb; Pr; Ps$ t
           Reverse Attributes in Rectangular Area (DECRARA), VT400 and
           up.
             Pt; Pl; Pb; Pr denotes the rectangle.
-            Ps denotes the attributes to reverse, i.e.,  1, 4, 5, 7
+            Ps denotes the attributes to reverse, i.e.,  1, 4, 5, 7.
 CSI > Ps; Ps t
           Set one or more features of the title modes.  Each parameter
           enables a single feature.
-            Ps = 0  -> Set window/icon labels using hexadecimal
-            Ps = 1  -> Query window/icon labels using hexadecimal
-            Ps = 2  -> Set window/icon labels using UTF-8
-            Ps = 3  -> Query window/icon labels using UTF-8 (See discus-
-          sion of "Title Modes")
+            Ps = 0  -> Set window/icon labels using hexadecimal.
+            Ps = 1  -> Query window/icon labels using hexadecimal.
+            Ps = 2  -> Set window/icon labels using UTF-8.
+            Ps = 3  -> Query window/icon labels using UTF-8.  (See dis-
+          cussion of "Title Modes")
 CSI Ps SP t
-          Set warning-bell volume (DECSWBV, VT520)
-            Ps = 0  or 1  -> off
-            Ps = 2 , 3  or 4  -> low
-            Ps = 5 , 6 , 7 , or 8  -> high
-CSI u     Restore cursor (ANSI.SYS)
+          Set warning-bell volume (DECSWBV, VT520).
+            Ps = 0  or 1  -> off.
+            Ps = 2 , 3  or 4  -> low.
+            Ps = 5 , 6 , 7 , or 8  -> high.
+CSI u     Restore cursor (ANSI.SYS).
 CSI Ps SP u
-          Set margin-bell volume (DECSMBV, VT520)
-            Ps = 1  -> off
-            Ps = 2 , 3  or 4  -> low
-            Ps = 0 , 5 , 6 , 7 , or 8  -> high
+          Set margin-bell volume (DECSMBV, VT520).
+            Ps = 1  -> off.
+            Ps = 2 , 3  or 4  -> low.
+            Ps = 0 , 5 , 6 , 7 , or 8  -> high.
 CSI Pt; Pl; Pb; Pr; Pp; Pt; Pl; Pp$ v
-          Copy Rectangular Area (DECCRA, VT400 and up)
+          Copy Rectangular Area (DECCRA, VT400 and up).
             Pt; Pl; Pb; Pr denotes the rectangle.
             Pp denotes the source page.
             Pt; Pl denotes the target location.
@@ -732,58 +750,59 @@ CSI Pt ; Pl ; Pb ; Pr ' w
           to the current locator position.  If all parameters are omit-
           ted, any locator motion will be reported.  DECELR always can-
           cels any prevous rectangle definition.
-CSI Ps x  Request Terminal Parameters (DECREQTPARM)
+CSI Ps x  Request Terminal Parameters (DECREQTPARM).
           if Ps is a "0" (default) or "1", and xterm is emulating VT100,
           the control sequence elicits a response of the same form whose
           parameters describe the terminal:
             Ps -> the given Ps incremented by 2.
-            1  -> no parity
-            1  -> eight bits
-            1  2  8  -> transmit 38.4k baud
-            1  2  8  -> receive 38.4k baud
-            1  -> clock multiplier
-            0  -> STP flags
+            Pn = 1  <- no parity.
+            Pn = 1  <- eight bits.
+            Pn = 1  <- 2  8  transmit 38.4k baud.
+            Pn = 1  <- 2  8  receive 38.4k baud.
+            Pn = 1  <- clock multiplier.
+            Pn = 0  <- STP flags.
 CSI Ps x  Select Attribute Change Extent (DECSACE).
-            Ps = 0  -> from start to end position, wrapped
-            Ps = 1  -> from start to end position, wrapped
+            Ps = 0  -> from start to end position, wrapped.
+            Ps = 1  -> from start to end position, wrapped.
             Ps = 2  -> rectangle (exact).
 CSI Pc; Pt; Pl; Pb; Pr$ x
           Fill Rectangular Area (DECFRA), VT420 and up.
             Pc is the character to use.
             Pt; Pl; Pb; Pr denotes the rectangle.
 CSI Ps ; Pu ' z
-          Enable Locator Reporting (DECELR)
+          Enable Locator Reporting (DECELR).
           Valid values for the first parameter:
-            Ps = 0  -> Locator disabled (default)
-            Ps = 1  -> Locator enabled
-            Ps = 2  -> Locator enabled for one report, then disabled
+            Ps = 0  -> Locator disabled (default).
+            Ps = 1  -> Locator enabled.
+            Ps = 2  -> Locator enabled for one report, then disabled.
           The second parameter specifies the coordinate unit for locator
           reports.
           Valid values for the second parameter:
-            Pu = 0  or omitted -> default to character cells
-            Pu = 1  -> device physical pixels
-            Pu = 2  -> character cells
+            Pu = 0  <- or omitted -> default to character cells.
+            Pu = 1  <- device physical pixels.
+            Pu = 2  <- character cells.
 CSI Pt; Pl; Pb; Pr$ z
           Erase Rectangular Area (DECERA), VT400 and up.
             Pt; Pl; Pb; Pr denotes the rectangle.
 CSI Pm ' {
-          Select Locator Events (DECSLE)
+          Select Locator Events (DECSLE).
           Valid values for the first (and any additional parameters)
           are:
-            Ps = 0  -> only respond to explicit host requests (DECRQLP)
-                       (default) also cancels any filter rectangle
-            Ps = 1  -> report button down transitions
-            Ps = 2  -> do not report button down transitions
-            Ps = 3  -> report button up transitions
-            Ps = 4  -> do not report button up transitions
+            Ps = 0  -> only respond to explicit host requests (DECRQLP).
+                       (This is default).  It also cancels any filter
+          rectangle.
+            Ps = 1  -> report button down transitions.
+            Ps = 2  -> do not report button down transitions.
+            Ps = 3  -> report button up transitions.
+            Ps = 4  -> do not report button up transitions.
 CSI Pt; Pl; Pb; Pr$ {
           Selective Erase Rectangular Area (DECSERA), VT400 and up.
             Pt; Pl; Pb; Pr denotes the rectangle.
 CSI Ps ' |
-          Request Locator Position (DECRQLP)
+          Request Locator Position (DECRQLP).
           Valid values for the parameter are:
             Ps = 0 , 1 or omitted -> transmit a single DECLRP locator
-          report
+          report.
 
           If Locator Reporting has been enabled by a DECELR, xterm will
           respond with a DECLRP Locator Report.  This report is also
@@ -796,24 +815,24 @@ CSI Ps ' |
 
           Parameters are [event;button;row;column;page].
           Valid values for the event:
-            Pe = 0  -> locator unavailable - no other parameters sent
-            Pe = 1  -> request - xterm received a DECRQLP
-            Pe = 2  -> left button down
-            Pe = 3  -> left button up
-            Pe = 4  -> middle button down
-            Pe = 5  -> middle button up
-            Pe = 6  -> right button down
-            Pe = 7  -> right button up
-            Pe = 8  -> M4 button down
-            Pe = 9  -> M4 button up
-            Pe = 1 0  -> locator outside filter rectangle
+            Pe = 0  -> locator unavailable - no other parameters sent.
+            Pe = 1  -> request - xterm received a DECRQLP.
+            Pe = 2  -> left button down.
+            Pe = 3  -> left button up.
+            Pe = 4  -> middle button down.
+            Pe = 5  -> middle button up.
+            Pe = 6  -> right button down.
+            Pe = 7  -> right button up.
+            Pe = 8  -> M4 button down.
+            Pe = 9  -> M4 button up.
+            Pe = 1 0  -> locator outside filter rectangle.
           ``button'' parameter is a bitmask indicating which buttons are
           pressed:
-            Pb = 0  -> no buttons down
-            Pb & 1  -> right button down
-            Pb & 2  -> middle button down
-            Pb & 4  -> left button down
-            Pb & 8  -> M4 button down
+            Pb = 0  <- no buttons down.
+            Pb & 1  <- right button down.
+            Pb & 2  <- middle button down.
+            Pb & 4  <- left button down.
+            Pb & 8  <- M4 button down.
           ``row'' and ``column'' parameters are the coordinates of the
           locator position in the xterm window, encoded as ASCII deci-
           mal.
@@ -828,18 +847,18 @@ OSC Ps ; Pt BEL
           trol sequence which would set the corresponding value.  The
           dtterm control sequences allow you to determine the icon name
           and window title.
-            Ps = 0  -> Change Icon Name and Window Title to Pt
-            Ps = 1  -> Change Icon Name to Pt
-            Ps = 2  -> Change Window Title to Pt
+            Ps = 0  -> Change Icon Name and Window Title to Pt.
+            Ps = 1  -> Change Icon Name to Pt.
+            Ps = 2  -> Change Window Title to Pt.
             Ps = 3  -> Set X property on top-level window.  Pt should be
           in the form "prop=value", or just "prop" to delete the prop-
           erty
             Ps = 4  ; c ; spec -> Change Color Number c to the color
-          specified by spec, i.e., a name or RGB specification as per
-          XParseColor.  Any number of c name pairs may be given.  The
-          color numbers correspond to the ANSI colors 0-7, their bright
-          versions 8-15, and if supported, the remainder of the 88-color
-          or 256-color table.
+          specified by spec.  This can be a name or RGB specification as
+          per XParseColor.  Any number of c name pairs may be given.
+          The color numbers correspond to the ANSI colors 0-7, their
+          bright versions 8-15, and if supported, the remainder of the
+          88-color or 256-color table.
 
           If a "?" is given rather than a name or RGB specification,
           xterm replies with a control sequence of the same form which
@@ -848,15 +867,15 @@ OSC Ps ; Pt BEL
           control sequence, xterm can make more than one reply.
 
             Ps = 5  ; c ; spec -> Change Special Color Number c to the
-          color specified by spec, i.e., a name or RGB specification as
-          per XParseColor.  Any number of c name pairs may be given.
-          The special colors can also be set by adding the maximum num-
-          ber of colors to these codes in an OSC 4  control:
+          color specified by spec.  This can be a name or RGB specifica-
+          tion as per XParseColor.  Any number of c name pairs may be
+          given.  The special colors can also be set by adding the maxi-
+          mum number of colors to these codes in an OSC 4  control:
 
-            Pc = 0 -> resource colorBD (BOLD)
-            Pc = 1 -> resource colorUL (UNDERLINE)
-            Pc = 2 -> resource colorBL (BLINK)
-            Pc = 3 -> resource colorRV (REVERSE)
+            Pc = 0  <- resource colorBD (BOLD).
+            Pc = 1  <- resource colorUL (UNDERLINE).
+            Pc = 2  <- resource colorBL (BLINK).
+            Pc = 3  <- resource colorRV (REVERSE).
 
           The 8 colors (below) which may be set or queried using 1 0
           through 1 7  are denoted dynamic colors, since the correspond-
@@ -876,21 +895,21 @@ OSC Ps ; Pt BEL
           given in one control sequence, xterm can make more than one
           reply.
 
-            Ps = 1 0  -> Change VT100 text foreground color to Pt
-            Ps = 1 1  -> Change VT100 text background color to Pt
-            Ps = 1 2  -> Change text cursor color to Pt
-            Ps = 1 3  -> Change mouse foreground color to Pt
-            Ps = 1 4  -> Change mouse background color to Pt
-            Ps = 1 5  -> Change Tektronix foreground color to Pt
-            Ps = 1 6  -> Change Tektronix background color to Pt
-            Ps = 1 7  -> Change highlight background color to Pt
-            Ps = 1 8  -> Change Tektronix cursor color to Pt
-            Ps = 1 9  -> Change highlight foreground color to Pt
-
-            Ps = 4 6  -> Change Log File to Pt (normally disabled by a
-          compile-time option)
-
-            Ps = 5 0  -> Set Font to Pt These controls may be disabled
+            Ps = 1 0  -> Change VT100 text foreground color to Pt.
+            Ps = 1 1  -> Change VT100 text background color to Pt.
+            Ps = 1 2  -> Change text cursor color to Pt.
+            Ps = 1 3  -> Change mouse foreground color to Pt.
+            Ps = 1 4  -> Change mouse background color to Pt.
+            Ps = 1 5  -> Change Tektronix foreground color to Pt.
+            Ps = 1 6  -> Change Tektronix background color to Pt.
+            Ps = 1 7  -> Change highlight background color to Pt.
+            Ps = 1 8  -> Change Tektronix cursor color to Pt.
+            Ps = 1 9  -> Change highlight foreground color to Pt.
+
+            Ps = 4 6  -> Change Log File to Pt.  (This is normally dis-
+          abled by a compile-time option).
+
+            Ps = 5 0  -> Set Font to Pt.  These controls may be disabled
           using the allowFontOps resource.  If Pt begins with a "#",
           index in the font menu, relative (if the next character is a
           plus or minus sign) or absolute.  A number is expected but not
@@ -904,7 +923,7 @@ OSC Ps ; Pt BEL
           resource), then this control sets/queries the faceName
           resource.
 
-            Ps = 5 1  (reserved for Emacs shell)
+            Ps = 5 1  (reserved for Emacs shell).
 
             Ps = 5 2  -> Manipulate Selection Data.  These controls may
           be disabled using the allowWindowOps resource.  The parameter
@@ -923,18 +942,19 @@ OSC Ps ; Pt BEL
           If the second parameter is a ? , xterm replies to the host
           with the selection data encoded using the same protocol.
 
-            Ps = 1 0 4  ; c -> Reset Color Number c to the color speci-
-          fied by the corresponding X resource.  Any number of c parame-
-          ters may be given.  These parameters correspond to the ANSI
-          colors 0-7, their bright versions 8-15, and if supported, the
-          remainder of the 88-color or 256-color table.  If no parame-
-          ters are given, the entire table will be reset.
+            Ps = 1 0 4  ; c -> Reset Color Number c.  It is reset to the
+          color specified by the corresponding X resource.  Any number
+          of c parameters may be given.  These parameters correspond to
+          the ANSI colors 0-7, their bright versions 8-15, and if sup-
+          ported, the remainder of the 88-color or 256-color table.  If
+          no parameters are given, the entire table will be reset.
 
-            Ps = 1 0 5  ; c -> Reset Special Color Number c to the color
-          specified by the corresponding X resource.  Any number of c
-          parameters may be given.  These parameters correspond to the
-          special colors which can be set using an OSC 5  control (or by
-          adding the maximum number of colors using an OSC 4  control).
+            Ps = 1 0 5  ; c -> Reset Special Color Number c.  It is
+          reset to the color specified by the corresponding X resource.
+          Any number of c parameters may be given.  These parameters
+          correspond to the special colors which can be set using an OSC
+          5  control (or by adding the maximum number of colors using an
+          OSC 4  control).
 
           The dynamic colors can also be reset to their default
           (resource) values:
@@ -948,7 +968,6 @@ OSC Ps ; Pt BEL
             Ps = 1 1 7  -> Reset highlight color.
             Ps = 1 1 8  -> Reset Tektronix cursor color.
 
-
 Privacy Message
 PM Pt ST  xterm implements no PM  functions; Pt is ignored.  Pt need not
           be printable characters.
@@ -1011,7 +1030,7 @@ scrolling keypads.
 X does not predefine NumLock (used for VT220 keyboards) or Alt (used as
 an extension for the Sun/PC keyboards) as modifiers.  These keys are
 recognized as modifiers when enabled by the numLock resource, or by the
-DECSET 1 0 3 5  control sequence.
+"DECSET 1 0 3 5 " control sequence.
 
 The cursor keys transmit the following escape sequences depending on the
 mode specified via the DECCKM escape sequence.
@@ -1071,7 +1090,7 @@ supported by the program.
       --------------------------------------------------------------
 
 They also provide 12 function keys, as well as a few other special-pur-
-pose keys.
+pose keys:
 
                          Key      Escape Sequence
                        ---------------------------
@@ -1277,7 +1296,9 @@ Bracketed Paste Mode
 When bracketed paste mode is set, pasted text is bracketed with control
 sequences so that the program can differentiate pasted text from typed-
 in text.  When bracketed paste mode is set, the program will receive:
-ESC [ 200 ~, followed by the pasted text, followed by ESC [ 201 ~.
+   ESC [ 200 ~,
+followed by the pasted text, followed by
+   ESC [ 201 ~.
 
 Title Modes
 The window- and icon-labels can be set or queried using control
@@ -1317,7 +1338,7 @@ There are six mutually exclusive modes.  One is DEC Locator mode,
 enabled by the DECELR CSI Ps ; Ps  '  z control sequence, and is not
 described here (control sequences are summarized above).  The remaining
 five modes are each enabled (or disabled) by a different parameter in
-DECSET CSI ? Pm h or DECRST CSI ? Pm l control sequence.
+the "DECSET CSI ? Pm h " or "DECRST CSI ? Pm l " control sequence.
 
 Manifest constants for the parameter values are defined in xcharmouse.h
 as follows:
@@ -1442,53 +1463,53 @@ major features missing are the write-through and defocused modes.  This
 document does not describe the commands used in the various Tektronix
 plotting modes but does describe the commands to switch modes.
 
-BEL       Bell (Ctrl-G)
-BS        Backspace (Ctrl-H)
-TAB       Horizontal Tab (Ctrl-I)
-LF        Line Feed or New Line (Ctrl-J)
-VT        Cursor up (Ctrl-K)
-FF        Form Feed or New Page (Ctrl-L)
-CR        Carriage Return (Ctrl-M)
-ESC ETX   Switch to VT100 Mode (ESC Ctrl-C)
-ESC ENQ   Return Terminal Status (ESC Ctrl-E)
-ESC FF    PAGE (Clear Screen) (ESC Ctrl-L)
-ESC SO    Begin 4015 APL mode (ignored by xterm) (ESC Ctrl-N)
-ESC SI    End 4015 APL mode (ignored by xterm) (ESC Ctrl-O)
-ESC ETB   COPY (Save Tektronix Codes to file COPYyyyy-mm-dd.hh:mm:ss)
-          (ESC Ctrl-W)
-ESC CAN   Bypass Condition (ESC Ctrl-X)
-ESC SUB   GIN mode (ESC Ctrl-Z)
-ESC FS    Special Point Plot Mode (ESC Ctrl-\)
-ESC 8     Select Large Character Set
-ESC 9     Select #2 Character Set
-ESC :     Select #3 Character Set
-ESC ;     Select Small Character Set
+BEL       Bell (Ctrl-G).
+BS        Backspace (Ctrl-H).
+TAB       Horizontal Tab (Ctrl-I).
+LF        Line Feed or New Line (Ctrl-J).
+VT        Cursor up (Ctrl-K).
+FF        Form Feed or New Page (Ctrl-L).
+CR        Carriage Return (Ctrl-M).
+ESC ETX   Switch to VT100 Mode (ESC Ctrl-C).
+ESC ENQ   Return Terminal Status (ESC Ctrl-E).
+ESC FF    PAGE (Clear Screen) (ESC Ctrl-L).
+ESC SO    Begin 4015 APL mode (ESC Ctrl-N).  (This is ignored by xterm).
+ESC SI    End 4015 APL mode (ESC Ctrl-O).  (This is ignored by xterm).
+ESC ETB   COPY (Save Tektronix Codes to file COPYyyyy-mm-dd.hh:mm:ss).
+            ETB  (end transmission block) is the same as Ctrl-W.
+ESC CAN   Bypass Condition (ESC Ctrl-X).
+ESC SUB   GIN mode (ESC Ctrl-Z).
+ESC FS    Special Point Plot Mode (ESC Ctrl-\).
+ESC 8     Select Large Character Set.
+ESC 9     Select #2 Character Set.
+ESC :     Select #3 Character Set.
+ESC ;     Select Small Character Set.
 OSC Ps ; Pt BEL
-          Set Text Parameters of VT window
-            Ps = 0  -> Change Icon Name and Window Title to Pt
-            Ps = 1  -> Change Icon Name to Pt
-            Ps = 2  -> Change Window Title to Pt
-            Ps = 4 6  -> Change Log File to Pt (normally disabled by a
-          compile-time option)
-ESC `     Normal Z Axis and Normal (solid) Vectors
-ESC a     Normal Z Axis and Dotted Line Vectors
-ESC b     Normal Z Axis and Dot-Dashed Vectors
-ESC c     Normal Z Axis and Short-Dashed Vectors
-ESC d     Normal Z Axis and Long-Dashed Vectors
-ESC h     Defocused Z Axis and Normal (solid) Vectors
-ESC i     Defocused Z Axis and Dotted Line Vectors
-ESC j     Defocused Z Axis and Dot-Dashed Vectors
-ESC k     Defocused Z Axis and Short-Dashed Vectors
-ESC l     Defocused Z Axis and Long-Dashed Vectors
-ESC p     Write-Thru Mode and Normal (solid) Vectors
-ESC q     Write-Thru Mode and Dotted Line Vectors
-ESC r     Write-Thru Mode and Dot-Dashed Vectors
-ESC s     Write-Thru Mode and Short-Dashed Vectors
-ESC t     Write-Thru Mode and Long-Dashed Vectors
-FS        Point Plot Mode (Ctrl-\)
-GS        Graph Mode (Ctrl-])
-RS        Incremental Plot Mode (Ctrl-^)
-US        Alpha Mode (Ctrl-_)
+          Set Text Parameters of VT window.
+            Ps = 0  -> Change Icon Name and Window Title to Pt.
+            Ps = 1  -> Change Icon Name to Pt.
+            Ps = 2  -> Change Window Title to Pt.
+            Ps = 4 6  -> Change Log File to Pt.  (This is normally dis-
+          abled by a compile-time option).
+ESC `     Normal Z Axis and Normal (solid) Vectors.
+ESC a     Normal Z Axis and Dotted Line Vectors.
+ESC b     Normal Z Axis and Dot-Dashed Vectors.
+ESC c     Normal Z Axis and Short-Dashed Vectors.
+ESC d     Normal Z Axis and Long-Dashed Vectors.
+ESC h     Defocused Z Axis and Normal (solid) Vectors.
+ESC i     Defocused Z Axis and Dotted Line Vectors.
+ESC j     Defocused Z Axis and Dot-Dashed Vectors.
+ESC k     Defocused Z Axis and Short-Dashed Vectors.
+ESC l     Defocused Z Axis and Long-Dashed Vectors.
+ESC p     Write-Thru Mode and Normal (solid) Vectors.
+ESC q     Write-Thru Mode and Dotted Line Vectors.
+ESC r     Write-Thru Mode and Dot-Dashed Vectors.
+ESC s     Write-Thru Mode and Short-Dashed Vectors.
+ESC t     Write-Thru Mode and Long-Dashed Vectors.
+FS        Point Plot Mode (Ctrl-\).
+GS        Graph Mode (Ctrl-]).
+RS        Incremental Plot Mode (Ctrl-^).
+US        Alpha Mode (Ctrl-_).
 
 VT52 Mode
 Parameters for cursor movement are at the end of the ESC Y  escape
@@ -1507,8 +1528,8 @@ ESC J     Erase from the cursor to the end of the screen.
 ESC K     Erase from the cursor to the end of the line.
 ESC Y Ps Ps
           Move the cursor to given row and column.
-ESC Z     Identify
-            -> ESC  /  Z  (``I am a VT52.'')
+ESC Z     Identify.
+            -> ESC  /  Z  (``I am a VT52.'').
 ESC =     Enter alternate keypad mode.
 ESC >     Exit alternate keypad mode.
 ESC <     Exit VT52 mode (Enter VT100 mode).
diff --git a/app/xterm/fontutils.c b/app/xterm/fontutils.c
index 34c64984b..87d99a336 100644
--- a/app/xterm/fontutils.c
+++ b/app/xterm/fontutils.c
@@ -1,4 +1,4 @@
-/* $XTermId: fontutils.c,v 1.350 2010/10/14 09:27:25 tom Exp $ */
+/* $XTermId: fontutils.c,v 1.353 2010/10/23 00:27:22 tom Exp $ */
 
 /************************************************************
 
@@ -235,7 +235,7 @@ check_fontname(const char *name)
 {
     Boolean result = True;
 
-    if (name == 0) {
+    if (IsEmpty(name)) {
 	TRACE(("fontname missing\n"));
 	result = False;
     } else if (strlen(name) >= MAX_FONTNAME - 1) {
@@ -911,7 +911,7 @@ xtermLoadFont(XtermWidget xw,
     TRACE(("xtermLoadFont #%d "name" %s%s\n", \
     	   fontnum, \
 	   (warn[index] == fwResource) ? "*" : " ", \
-	   NonNull(myfonts.field)));
+	   NonNull(myfonts.field)))
     DbgResource("normal", f_n, fNorm);
     DbgResource("bold  ", f_b, fBold);
 #if OPT_WIDE_CHARS
@@ -1238,7 +1238,7 @@ typedef struct {
 } SubResourceRec;
 
 #define MERGE_SUBFONT(src,dst,name) \
-	if (dst.name == 0) { \
+	if (IsEmpty(dst.name)) { \
 	    TRACE(("MERGE_SUBFONT " #dst "." #name " merge %s\n", NonNull(src.name))); \
 	    dst.name = src.name; \
 	} else { \
@@ -1249,7 +1249,7 @@ typedef struct {
 	TRACE(("COPY_MENU_FONTS " #src " to " #dst "\n")); \
 	for (n = fontMenu_default; n <= fontMenu_lastBuiltin; ++n) { \
 	    for (m = 0; m < fMAX; ++m) { \
-		dst.menu_font_names[n][m] = src.menu_font_names[n][m]; \
+		dst.menu_font_names[n][m] = x_strdup(src.menu_font_names[n][m]); \
 	    } \
 	}
 
@@ -1294,7 +1294,7 @@ xtermLoadVTFonts(XtermWidget xw, String myName, String myClass)
 	COPY_MENU_FONTS(xw->screen, original);
     }
 
-    if (myName == 0 || *myName == 0) {
+    if (IsEmpty(myName)) {
 	TRACE(("xtermLoadVTFonts restoring original\n"));
 	xw->misc.default_font = original.default_font;
 	COPY_MENU_FONTS(original, xw->screen);
@@ -1329,11 +1329,11 @@ xtermLoadVTFonts(XtermWidget xw, String myName, String myClass)
 	     */
 	    xw->misc.default_font = subresourceRec.default_font;
 	    COPY_MENU_FONTS(subresourceRec, xw->screen);
-	    screen->MenuFontName(fontMenu_default) = xw->misc.default_font.f_n;
-	    screen->menu_font_names[0][fBold] = xw->misc.default_font.f_b;
+	    screen->MenuFontName(fontMenu_default) = x_strdup(xw->misc.default_font.f_n);
+	    screen->menu_font_names[0][fBold] = x_strdup(xw->misc.default_font.f_b);
 #if OPT_WIDE_CHARS
-	    screen->menu_font_names[0][fWide] = xw->misc.default_font.f_w;
-	    screen->menu_font_names[0][fWBold] = xw->misc.default_font.f_wb;
+	    screen->menu_font_names[0][fWide] = x_strdup(xw->misc.default_font.f_w);
+	    screen->menu_font_names[0][fWBold] = x_strdup(xw->misc.default_font.f_wb);
 #endif
 	} else {
 	    TRACE(("...no resources found\n"));
@@ -3019,7 +3019,7 @@ SetVTFont(XtermWidget xw,
 
 #define USE_CACHED(field, name) \
 	    if (myfonts.field == 0) { \
-		myfonts.field = screen->menu_font_names[which][name]; \
+		myfonts.field = x_strdup(screen->menu_font_names[which][name]); \
 		TRACE(("set myfonts." #field " from menu_font_names[%d][" #name "] %s\n", \
 		       which, NonNull(myfonts.field))); \
 	    } else { \
diff --git a/app/xterm/misc.c b/app/xterm/misc.c
index c2a8ad37a..ce3c0c1f2 100644
--- a/app/xterm/misc.c
+++ b/app/xterm/misc.c
@@ -1,4 +1,4 @@
-/* $XTermId: misc.c,v 1.510 2010/10/11 08:33:33 tom Exp $ */
+/* $XTermId: misc.c,v 1.511 2010/11/10 00:56:29 tom Exp $ */
 
 /*
  * Copyright 1999-2009,2010 by Thomas E. Dickey
@@ -1991,7 +1991,7 @@ xtermGetColorRes(XtermWidget xw, ColorRes * res)
 		res->value = TScreenOf(xw)->Tcolors[TEXT_FG].value;
 		res->mode = -True;
 		fprintf(stderr,
-			"%s: Cannot allocate color %s\n",
+			"%s: Cannot allocate color \"%s\"\n",
 			xterm_name,
 			NonNull(res->resource));
 	    }
diff --git a/app/xterm/package/debian/changelog b/app/xterm/package/debian/changelog
new file mode 100644
index 000000000..50586396e
--- /dev/null
+++ b/app/xterm/package/debian/changelog
@@ -0,0 +1,11 @@
+xterm-dev (267) unstable; urgency=low
+
+  * build-fixes, etc.
+
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Wed, 10 Nov 2010 18:46:41 -0500
+
+xterm-dev (266) unstable; urgency=low
+
+  * add build-script for testing, adapted from Debian xterm package.
+
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 22 Oct 2010 17:15:59 -0400
diff --git a/app/xterm/package/debian/color.sed b/app/xterm/package/debian/color.sed
new file mode 100644
index 000000000..6029c594f
--- /dev/null
+++ b/app/xterm/package/debian/color.sed
@@ -0,0 +1,4 @@
+s/! Uncomment this for "white" text on a dark background./! Set the default text foreground and background colors./
+s/!\*VT100\*foreground: gray90/*VT100*foreground: gray90/
+s/!\*VT100\*background: black/*VT100*background: black/
+/!\*VT100.scrollbar.thumb:[ 	]*vlines2/,/!lines[ 	]*-1,0,0,0,0,-1/s/!//
diff --git a/app/xterm/package/debian/compat b/app/xterm/package/debian/compat
new file mode 100644
index 000000000..7ed6ff82d
--- /dev/null
+++ b/app/xterm/package/debian/compat
@@ -0,0 +1 @@
+5
diff --git a/app/xterm/package/debian/control b/app/xterm/package/debian/control
new file mode 100644
index 000000000..f51153399
--- /dev/null
+++ b/app/xterm/package/debian/control
@@ -0,0 +1,21 @@
+Source: xterm-dev
+Section: x11
+Priority: optional
+Maintainer: Thomas E. Dickey <dickey@invisible-island.net>
+Homepage: http://invisible-island.net/xterm/
+Build-Depends: debhelper (>= 7)
+Standards-Version: 3.8.2
+
+Package: xterm-dev
+Architecture: any
+Depends: ${misc:Depends}
+Provides: x-terminal-emulator
+Recommends: x11-utils | xutils | bluit
+Description: X terminal emulator (development version)
+ xterm is the standard terminal emulator for the X Window System.
+ It provides DEC VT102 and Tektronix 4014 compatible terminals for
+ programs that cannot use the window system directly.  This version
+ implements ISO/ANSI colors, Unicode, and most of the control sequences
+ used by DEC VT220 terminals.
+ .
+ This package contains a development version of xterm.
diff --git a/app/xterm/package/debian/copyright b/app/xterm/package/debian/copyright
new file mode 100644
index 000000000..fef8e131b
--- /dev/null
+++ b/app/xterm/package/debian/copyright
@@ -0,0 +1,221 @@
+Upstream source http://invisible-island.net/xterm/xterm.html
+
+-------------------------------------------------------------------------------
+Except as noted below, all copyrights use the same wording, denoted MIT-X11.
+That is not in Debian's list under /usr/share/licenses.  Here is the common
+wording:
+
+All Rights Reserved
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name(s) of the above copyright
+holders shall not be used in advertising or otherwise to promote the
+sale, use or other dealings in this Software without prior written
+authorization.
+
+-------------------------------------------------------------------------------
+Files: * */*
+License: MIT-X11
+
+Copyright 1996-2010 by Thomas E. Dickey
+
+(date ranges vary, depending on when the respective files were first changed
+significantly, and run through the most recent change date).
+
+-------------------------------------------------------------------------------
+Files: 88colres.pl
+License: MIT-X11
+
+Copyright 1999-2005,2007 by Thomas E. Dickey
+Copyright 1999-2000 by Steve Wall
+
+-------------------------------------------------------------------------------
+Files: vttests/88colors2.pl
+License: MIT-X11
+
+Copyright 1999-2007,2009 by Thomas E. Dickey
+Copyright 1999 by Steve Wall
+
+-------------------------------------------------------------------------------
+Files: vttests/256colors2.pl
+License: MIT-X11
+
+Copyright 1999-2007,2009 by Thomas E. Dickey
+Copyright 2002 by Steve Wall
+Copyright 1999 by Todd Larason
+
+-------------------------------------------------------------------------------
+Files: xcharmouse.h
+
+Copyright 1998 by Jason Bacon <acadix@execpc.com>
+
+All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of the above listed
+copyright holder(s) not be used in advertising or publicity pertaining
+to distribution of the software without specific, written prior
+permission.
+
+THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD
+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE
+LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+
+-------------------------------------------------------------------------------
+Files: xutf8.*
+License: MIT-X11
+
+Copyright (C) 2001 by Juliusz Chroboczek
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+-------------------------------------------------------------------------------
+Files: ctlseqs.ms install-sh
+License: MIT-X11
+
+Copyright 1984-1994 X Consortium
+
+-------------------------------------------------------------------------------
+Copyright 1987,1988 by Digital Equipment Corporation, Maynard, Massachusetts.
+
+All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of Digital Equipment
+Corporation not be used in advertising or publicity pertaining to
+distribution of the software without specific, written prior permission.
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+-------------------------------------------------------------------------------
+Copyright 1988,1989  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+-------------------------------------------------------------------------------
+Files: koi8rxterm.man uxterm.man
+License: MIT-X11
+
+Copyright 2001, 2004 Branden Robinson
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+SOFTWARE IN THE PUBLIC INTEREST, INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+
+-------------------------------------------------------------------------------
+Files: charclass.*
+
+Markus Kuhn -- 2000-07-03
+
+Permission to use, copy, modify, and distribute this software
+for any purpose and without fee is hereby granted. The author
+disclaims all warranties with regard to this software.
+
+-------------------------------------------------------------------------------
+Files: wcwidth.*
+
+Markus Kuhn -- 2007-05-25
+
+Permission to use, copy, modify, and distribute this software
+for any purpose and without fee is hereby granted. The author
+disclaims all warranties with regard to this software.
+
+-------------------------------------------------------------------------------
+Files: config.guess config.sub
+License: GPL-2+
+
+	Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+	2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+	Free Software Foundation, Inc.
+
+-------------------------------------------------------------------------------
+Files: configure
+License: GPL-2+
+
+	Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+	Free Software Foundation, Inc.
+
+-------------------------------------------------------------------------------
diff --git a/app/xterm/package/debian/rules b/app/xterm/package/debian/rules
new file mode 100644
index 000000000..ad0d68000
--- /dev/null
+++ b/app/xterm/package/debian/rules
@@ -0,0 +1,185 @@
+#!/usr/bin/make -f
+# Made with the aid of dh_make, by Craig Small
+# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
+# Some lines taken from debmake, by Cristoph Lameter.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+DESKTOP_VENDOR  = dickey
+
+PKG_SUFFIX	= -dev
+
+PACKAGE		:= $(shell dpkg-parsechangelog| \
+			sed -n 's/^Source: \(.*\)$$/\1/p')
+
+PKG_APPDEFAULTS	:= /etc/X11/app-defaults
+PKG_DESKTOP	:= /usr/share/applications
+
+DSTDIR		:= $(CURDIR)/debian/$(PACKAGE)
+MY_DESKTOP	:= $(DSTDIR)/usr/share/applications
+
+CFLAGS =
+
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+DEBOP=--enable-debug
+else
+DEBOP=
+endif
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+        CFLAGS += -O0
+else
+        CFLAGS += -O2
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+        INSTALL_PROGRAM += -s
+endif
+
+configure: configure-stamp
+configure-stamp:
+	dh_testdir
+
+	./configure \
+		--host=$(DEB_HOST_GNU_TYPE) \
+		--build=$(DEB_BUILD_GNU_TYPE) \
+		--program-suffix=$(PKG_SUFFIX) \
+		--prefix=/usr \
+		--libexecdir=\$${prefix}/lib \
+		--mandir=\$${prefix}/share/man \
+		--sysconfdir=/etc/$(PACKAGE) \
+		--localstatedir=/var \
+		--libdir=/etc/$(PACKAGE) \
+		--without-xterm-symlink \
+		--enable-256-color \
+		--enable-88-color \
+		--enable-dabbrev \
+		--enable-dec-locator \
+		--enable-exec-xterm \
+		--enable-hp-fkeys \
+		--enable-load-vt-fonts \
+		--enable-logfile-exec \
+		--enable-logging \
+		--enable-mini-luit \
+		--enable-paste64 \
+		--enable-rectangles \
+		--enable-sco-fkeys \
+		--enable-tcap-fkeys \
+		--enable-tcap-query \
+		--enable-toolbar \
+		--enable-wide-chars \
+		--enable-xmc-glitch \
+		--with-app-defaults=$(PKG_APPDEFAULTS) \
+		--with-icondir=\$${prefix}/share/pixmaps \
+		--with-own-terminfo=\$${prefix}/share/terminfo \
+		--with-terminal-type=xterm-new \
+		--with-utempter \
+		${DEBOP}
+
+	touch configure-stamp
+
+build: build-stamp
+build-stamp: configure-stamp
+	dh_testdir
+
+	$(MAKE)
+
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+
+	[ ! -f Makefile ] || $(MAKE) distclean
+
+	dh_clean
+
+install: install-stamp
+install-stamp: build-stamp
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	$(MAKE) install \
+		DESTDIR=$(CURDIR)/debian/$(PACKAGE)
+
+	touch install-stamp
+
+install: install-indep install-arch
+install-indep:
+
+install-arch:
+	dh_testdir
+	dh_testroot
+	dh_prep -s 
+	dh_installdirs -s
+
+	$(MAKE) install-bin \
+		DESTDIR=$(DSTDIR)
+
+# Build architecture-independent files here.
+binary-indep: build install
+	dh_testdir
+	dh_testroot
+
+	# This overwrites the Debian package's copy of app-defaults and icons.
+	# But the resources are not the same; they are patched.
+	sed -i -f package/debian/color.sed XTerm-col.ad
+	sed -i -f package/debian/xterm-xres.sed XTerm.ad
+
+	$(MAKE) install-app \
+		install-icon \
+		install-man \
+		DESTDIR=$(DSTDIR)
+
+	# Follow-up with a check against the installed resource files.
+	( cd $(DSTDIR)$(PKG_APPDEFAULTS) && $(SHELL) -c 'for p in *;do diff -u $$p $(PKG_APPDEFAULTS)/; done' ; exit 0 )
+
+	# The Debian package does not install desktop files.
+	# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=486317
+	$(SHELL) -c 'for p in *.desktop;do \
+		sed -i \
+			-e "s/Categories=System;/Categories=Application;Utility;/" \
+			-e "s/^\\(Name=.*\\)/\\1$(PKG_SUFFIX)/" \
+			-e "s/^\\(Exec=.*\\)/\\1$(PKG_SUFFIX)/" \
+		$$p; done'
+
+	$(MAKE) install-desktop \
+		DESKTOP_FLAGS="--vendor='$(DESKTOP_VENDOR)' --dir $(MY_DESKTOP)"
+
+	( cd $(DSTDIR)$(PKG_DESKTOP) \
+	  && $(SHELL) -c 'for p in *;do \
+	  	test -n "$(PKG_SUFFIX)" && mv $$p `basename $$p .desktop`$(PKG_SUFFIX).desktop; \
+	  	diff -u $$p $(PKG_DESKTOP)/; \
+		done' ; \
+	  exit 0 )
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installdebconf
+	dh_installdocs
+	dh_installmenu
+	dh_installmime
+	dh_installexamples tektests vttests
+	dh_installchangelogs
+	dh_install
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install install-stamp
diff --git a/app/xterm/package/debian/source/format b/app/xterm/package/debian/source/format
new file mode 100644
index 000000000..89ae9db8f
--- /dev/null
+++ b/app/xterm/package/debian/source/format
@@ -0,0 +1 @@
+3.0 (native)
diff --git a/app/xterm/package/debian/watch b/app/xterm/package/debian/watch
new file mode 100644
index 000000000..6c4632751
--- /dev/null
+++ b/app/xterm/package/debian/watch
@@ -0,0 +1,4 @@
+version=3
+
+opts=passive ftp://invisible-island.net/xterm/current/xterm\.tar.gz \
+ debian  uupdate
diff --git a/app/xterm/package/debian/xterm-dev.docs b/app/xterm/package/debian/xterm-dev.docs
new file mode 100644
index 000000000..b29b13527
--- /dev/null
+++ b/app/xterm/package/debian/xterm-dev.docs
@@ -0,0 +1,8 @@
+INSTALL
+README.i18n
+THANKS
+ctlseqs.ms
+ctlseqs.txt
+termcap
+terminfo
+xterm.log.html
diff --git a/app/xterm/package/debian/xterm-xres.sed b/app/xterm/package/debian/xterm-xres.sed
new file mode 100644
index 000000000..745cb5842
--- /dev/null
+++ b/app/xterm/package/debian/xterm-xres.sed
@@ -0,0 +1,8 @@
+/\*tek4014\*fontSmall:[ 	]*6x10/a\
+\
+! Debian package customizations follow.\
+*backarrowKeyIsErase: true\
+*ptyInitialErase: true
+/!*allowWindowOps: false/a\
+*allowWindowOps: true\
+*activeIcon: true
diff --git a/app/xterm/package/xterm.spec b/app/xterm/package/xterm.spec
new file mode 100644
index 000000000..6f3fc3477
--- /dev/null
+++ b/app/xterm/package/xterm.spec
@@ -0,0 +1,175 @@
+# $XTermId: xterm.spec,v 1.6 2010/11/10 23:45:54 tom Exp $
+Summary: A text-based Web browser
+Name: xterm
+Version: dev
+Release: 267
+License: X11
+Group: Applications/Internet
+Source: xterm-%{release}.tgz
+# URL: http://invisible-island.net/xterm/
+Provides: x-terminal-emulator
+
+%description
+xterm is the standard terminal emulator for the X Window System.
+It provides DEC VT102 and Tektronix 4014 compatible terminals for
+programs that cannot use the window system directly.  This version
+implements ISO/ANSI colors, Unicode, and most of the control sequences
+used by DEC VT220 terminals.
+
+This package provides four commands:
+ a) xterm, which is the actual terminal emulator
+ b) uxterm, which is a wrapper around xterm which sets xterm to use UTF-8
+    encoding when the user's locale supports this,
+ c) koi8rxterm, a wrapper similar to uxterm for locales that use the
+    KOI8-R character set, and
+ d) resize.
+
+A complete list of control sequences supported by the X terminal emulator
+is provided in /usr/share/doc/xterm.
+
+The xterm program uses bitmap images provided by the xbitmaps package.
+
+Those interested in using koi8rxterm will likely want to install the
+xfonts-cyrillic package as well.
+
+%prep
+
+%define my_suffix -dev
+
+%define desktop_vendor  dickey
+%define desktop_utils   %(if which desktop-file-install 2>&1 >/dev/null ; then echo "yes" ; fi)
+
+%define apps_shared %(test -d /usr/share/X11/app-defaults && echo 1 || echo 0)
+%define apps_syscnf %(test -d /etc/X11/app-defaults && echo 1 || echo 0)
+
+%if %{apps_shared}
+%define _xresdir    %{_datadir}/X11/app-defaults
+%else
+%define _xresdir    %{_sysconfdir}/X11/app-defaults
+%endif
+
+%define _iconsdir   %{_datadir}/icons
+%define _pixmapsdir %{_datadir}/pixmaps
+%define my_docdir   %{_datadir}/doc/xterm%{my_suffix}
+
+%setup -q -n xterm-%{release}
+
+%build
+CPPFLAGS="-DMISC_EXP -DEXP_HTTP_HEADERS" \
+%configure \
+	--target %{_target_platform} \
+	--prefix=%{_prefix} \
+	--bindir=%{_bindir} \
+	--datadir=%{_datadir} \
+	--mandir=%{_mandir} \
+%if "%{my_suffix}" != ""
+	--program-suffix=%{my_suffix} \
+	--without-xterm-symlink \
+%endif
+	--enable-256-color \
+	--enable-88-color \
+	--enable-dabbrev \
+	--enable-dec-locator \
+	--enable-exec-xterm \
+	--enable-hp-fkeys \
+	--enable-load-vt-fonts \
+	--enable-logfile-exec \
+	--enable-logging \
+	--enable-mini-luit \
+	--enable-paste64 \
+	--enable-rectangles \
+	--enable-sco-fkeys \
+	--enable-tcap-fkeys \
+	--enable-tcap-query \
+	--enable-toolbar \
+	--enable-wide-chars \
+	--enable-xmc-glitch \
+	--with-app-defaults=%{_xresdir} \
+	--with-icondir=%{_pixmapsdir} \
+	--with-own-terminfo=%{_datadir}/terminfo \
+	--with-terminal-type=xterm-new \
+	--with-utempter
+make
+
+chmod u+w XTerm.ad
+cat >>XTerm.ad <<EOF
+*backarrowKeyIsErase: true
+*ptyInitialErase: true
+EOF
+ls -l *.ad
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+# Usually do not use install-ti, since that will conflict with ncurses.
+make install-bin install-man install-app install-icon \
+%if "%{install_ti}" == "yes"
+	install-ti \
+%endif
+	DESTDIR=$RPM_BUILD_ROOT \
+	TERMINFO=%{_datadir}/terminfo
+
+	mkdir -p $RPM_BUILD_ROOT%{my_docdir}
+	cp \
+		ctlseqs.txt \
+		README.i18n \
+		THANKS \
+		xterm.log.html \
+	$RPM_BUILD_ROOT%{my_docdir}/
+
+	cp -r vttests \
+	$RPM_BUILD_ROOT%{my_docdir}/
+
+	# The scripts are readable, but not executable, to let find-requires
+	# know that they do not depend on Perl packages.
+	chmod 644 $RPM_BUILD_ROOT%{my_docdir}/vttests/*
+
+%if "%{desktop_utils}" == "yes"
+for p in *.desktop
+do
+	sed -i \
+		-e 's/Categories=System;/Categories=Application;Utility;/' \
+		-e 's/^\\(Name=.*\\)/\\1%{my_suffix}/' \
+		-e 's/^\\(Exec=.*\\)/\\1%{my_suffix}/' \
+	$p
+done
+
+make install-desktop \
+	DESKTOP_FLAGS="--vendor='%{desktop_vendor}' --dir $RPM_BUILD_ROOT%{_datadir}/applications"
+
+test -n "%{my_suffix}" && \
+( cd $RPM_BUILD_ROOT%{_datadir}/applications
+	for p in *.desktop
+	do
+		mv $p `basename $p .desktop`%{my_suffix}.desktop
+	done
+)
+%endif
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root,-)
+%{_bindir}/koi8rxterm%{my_suffix}
+%{_bindir}/xterm%{my_suffix}
+%{_bindir}/uxterm%{my_suffix}
+%{_bindir}/resize%{my_suffix}
+%{_mandir}/*/*
+%{my_docdir}/*
+%{_pixmapsdir}/xterm*.xpm
+%{_xresdir}/*XTerm*
+
+%if "%{install_ti}" == "yes"
+%{_datadir}/terminfo/*
+%endif
+
+%if "%{desktop_utils}" == "yes"
+%config(missingok) %{_datadir}/applications/%{desktop_vendor}-xterm%{my_suffix}.desktop
+%config(missingok) %{_datadir}/applications/%{desktop_vendor}-uxterm%{my_suffix}.desktop
+%endif
+
+%changelog
+
+* Fri Oct 22 2010 Thomas E. Dickey
+- initial version.
diff --git a/app/xterm/trace.h b/app/xterm/trace.h
index bd26dba2d..f359ef47f 100644
--- a/app/xterm/trace.h
+++ b/app/xterm/trace.h
@@ -1,4 +1,4 @@
-/* $XTermId: trace.h,v 1.55 2010/10/13 22:26:57 tom Exp $ */
+/* $XTermId: trace.h,v 1.56 2010/11/11 01:10:52 tom Exp $ */
 
 /*
  *
@@ -42,11 +42,8 @@
 
 #if OPT_TRACE
 
-extern	void	Trace ( const char *, ... )
-#ifdef GCC_PRINTF
-	__attribute__ ((format(printf,1,2)))
-#endif
-	;
+extern	void	Trace ( const char *, ... ) GCC_PRINTFLIKE(1,2);
+
 #undef  TRACE
 #define TRACE(p) Trace p
 
diff --git a/app/xterm/version.h b/app/xterm/version.h
index e4c41821a..f4b389e7a 100644
--- a/app/xterm/version.h
+++ b/app/xterm/version.h
@@ -1,5 +1,5 @@
 /*
- * $XTermId: version.h,v 1.322 2010/10/14 08:33:49 tom Exp $
+ * $XTermId: version.h,v 1.325 2010/11/10 00:51:22 tom Exp $
  * ----------------------------------------------------------------------------
  * this file is part of xterm
  *
@@ -39,7 +39,7 @@
  * version of X to which this version of xterm has been built.  The number in
  * parentheses is my patch number (Thomas E. Dickey).
  */
-#define XTERM_PATCH   264
+#define XTERM_PATCH   267
 
 #ifndef __vendorversion__
 #define __vendorversion__ "XTerm/OpenBSD"
diff --git a/app/xterm/xterm.h b/app/xterm/xterm.h
index 5a9096109..fb46c3bc6 100644
--- a/app/xterm/xterm.h
+++ b/app/xterm/xterm.h
@@ -1,4 +1,4 @@
-/* $XTermId: xterm.h,v 1.635 2010/10/12 08:55:47 tom Exp $ */
+/* $XTermId: xterm.h,v 1.637 2010/11/11 11:41:54 tom Exp $ */
 
 /************************************************************
 
@@ -735,17 +735,16 @@ extern Bool SendMousePosition (XtermWidget  /* w */, XEvent*  /* event */);
 extern void DiredButton                PROTO_XT_ACTIONS_ARGS;
 extern void DisownSelection (XtermWidget  /* termw */);
 extern void UnhiliteSelection (XtermWidget  /* termw */);
+extern void HandleCopySelection        PROTO_XT_ACTIONS_ARGS;
 extern void HandleInsertSelection      PROTO_XT_ACTIONS_ARGS;
 extern void HandleKeyboardSelectEnd    PROTO_XT_ACTIONS_ARGS;
 extern void HandleKeyboardSelectExtend PROTO_XT_ACTIONS_ARGS;
 extern void HandleKeyboardSelectStart  PROTO_XT_ACTIONS_ARGS;
-extern void HandleKeyboardSelectStop   PROTO_XT_ACTIONS_ARGS;
 extern void HandleKeyboardStartExtend  PROTO_XT_ACTIONS_ARGS;
 extern void HandleSelectEnd            PROTO_XT_ACTIONS_ARGS;
 extern void HandleSelectExtend         PROTO_XT_ACTIONS_ARGS;
 extern void HandleSelectSet            PROTO_XT_ACTIONS_ARGS;
 extern void HandleSelectStart          PROTO_XT_ACTIONS_ARGS;
-extern void HandleSelectStop           PROTO_XT_ACTIONS_ARGS;
 extern void HandleStartExtend          PROTO_XT_ACTIONS_ARGS;
 extern void ResizeSelection (TScreen * /* screen */, int  /* rows */, int  /* cols */);
 extern void ScrollSelection (TScreen * /* screen */, int  /* amount */,  Bool /* always */);
diff --git a/app/xterm/xterm.log.html b/app/xterm/xterm.log.html
index 8f33190e8..e19f6579c 100644
--- a/app/xterm/xterm.log.html
+++ b/app/xterm/xterm.log.html
@@ -31,7 +31,7 @@
  * sale, use or other dealings in this Software without prior written        *
  * authorization.                                                            *
  *****************************************************************************
-  $XTermId: xterm.log.html,v 1.977 2010/10/14 08:53:32 tom Exp $
+  $XTermId: xterm.log.html,v 1.995 2010/11/21 23:40:00 tom Exp $
   -->
 <HTML>
 <HEAD>
@@ -56,6 +56,9 @@ Most of these are summarized in the XFree86 CHANGELOG
 is the latest version of this file.
 
 <UL>
+<LI><A HREF="#xterm_267">Patch #267 - 2010/11/20</A>
+<LI><A HREF="#xterm_266">Patch #266 - 2010/10/24</A>
+<LI><A HREF="#xterm_265">Patch #265 - 2010/10/22</A>
 <LI><A HREF="#xterm_264">Patch #264 - 2010/10/14</A>
 <LI><A HREF="#xterm_263">Patch #263 - 2010/10/13</A>
 <LI><A HREF="#xterm_262">Patch #262 - 2010/8/30</A>
@@ -323,6 +326,61 @@ is the latest version of this file.
 <LI><A HREF="#xterm_01">Patch #1 - 1996/1/6</A>
 </UL>
 
+<H1><A NAME="xterm_267">Patch #267 - 2010/11/20</A></H1>
+<ul>
+	<li>minor formatting changes to ctlseqs.ms to simplify a script which
+	    extracts the feature information.  See the results in
+<a href="http://invisible-island.net/xterm/xterm.faq.html#compare_versions">Comparing versions, by counting controls</a> in the xterm FAQ.
+
+	<li>add <code>docs-clean</code> makefile rule.
+
+	<li>add <code>copy-selection</code> action (request by 
+	    Timo Juhani Lindfors, Debian #588785).
+
+	<li>trim leading/trailing blanks from string used for "Selection"
+	    font-menu data.
+
+	<li>trim leading/trailing blanks from color resource values.
+
+	<li>configure script improvements:
+	<ul>
+	<li>add workaround for removal of X11 dependency from Xt's package
+	    file (report by Robert Hooker).
+
+	<li>add workaround for removal of fontconfig dependency from Xft's
+	    package file (report by Jeremy Huddleston).
+
+	<li>add workaround for removal of Xmu dependency from Xaw's package
+	    file (report by Jeremy Huddleston).
+
+	<li>improve workaround in <code>CF_X_TOOLKIT</code> macro,
+	    checking for other
+	    possible packages where Xt's dependencies may be given.
+
+	<li>prefer <code>${name:=value}</code> to <code>${name-value}</code>,
+	    since recent bash changes break legacy support for that feature.
+	</ul>
+</ul>
+
+<H1><A NAME="xterm_266">Patch #266 - 2010/10/24</A></H1>
+<ul>
+	<li>add rpm and dpkg scripts, for testing.
+
+	<li>more fixes for Debian #600707 (report by  Cyril Brulebois).
+</ul>
+
+<H1><A NAME="xterm_265">Patch #265 - 2010/10/22</A></H1>
+<ul>
+	<li>fix a regression in fontname logic from 
+	    <a href="#xterm_263">patch #263</a> changes
+	    (Debian #600707, reported by Vincent Lefevre).
+
+	<li>revert modification of any-event/any-button protocol from
+	    <a href="#xterm_263">patch #263</a> changes.
+	    It interferes with selection using a
+	    shifted mouse button (reports by Neil Bird, Bram Moolenaar).
+</ul>
+
 <H1><A NAME="xterm_264">Patch #264 - 2010/10/14</A></H1>
 <ul>
 	<li>replace a null-pointer check with check for empty string in
diff --git a/app/xterm/xterm.man b/app/xterm/xterm.man
index f0b8c96b3..869045398 100644
--- a/app/xterm/xterm.man
+++ b/app/xterm/xterm.man
@@ -1,5 +1,5 @@
 '\" t
-.\" $XTermId: xterm.man,v 1.467 2010/10/11 00:36:08 tom Exp $
+.\" $XTermId: xterm.man,v 1.469 2010/11/11 11:57:07 tom Exp $
 .\"
 .\" Copyright 1996-2009,2010 by Thomas E. Dickey
 .\"
@@ -1075,9 +1075,13 @@ If the option contains a \*(``/\*('' character, that delimits the characters
 used for the pseudo-terminal name from the file descriptor.
 Otherwise, exactly two characters are used from the option for
 the pseudo-terminal name, the remainder is the file descriptor.
-Examples:
+Examples
+(the first two are equivalent
+since the descriptor follows the last \*(``/\*(''):
+.sp
 .nf
 .RS 15
+-S/dev/pts/123/45
 -S123/45
 -Sab34
 .RE
@@ -4731,6 +4735,12 @@ of lines saved off the top of the screen.
 It is also invoked from the \fBclearsavedlines\fP entry in \fIvtMenu\fP.
 The effect is identical to a hardware reset (RIS) control sequence.
 .TP 8
+.B "copy-selection(\fIdestname\fP [, ...])"
+This action puts the currently selected text into all of the selections or
+cutbuffers specified by \fIdestname\fP.
+Unlike \fBselect-end\fP, it does not send a mouse position or otherwise
+modify the internal selection state.
+.TP 8
 .B "create-menu(\fIm/v/f/t\fP)"
 This action creates one of the menus used by \fIxterm\fP,
 if it has not been previously created.
@@ -4974,6 +4984,8 @@ selection at the current text cursor position.
 .B "select-end(\fIdestname\fP [, ...])"
 This action puts the currently selected text into all of the selections or
 cutbuffers specified by \fIdestname\fP.
+It also sends a mouse position and updates the internal selection state
+to reflect the end of the selection process.
 .TP 8
 .B "select-extend()"
 This action tracks the pointer and extends the selection.
diff --git a/app/xterm/xtermcfg.h b/app/xterm/xtermcfg.h
index f212655fd..22af17fef 100644
--- a/app/xterm/xtermcfg.h
+++ b/app/xterm/xtermcfg.h
@@ -1,27 +1,34 @@
-/* $XTermId: xtermcfg.hin,v 1.178 2009/08/09 17:23:19 tom Exp $ */
+/* $XTermId: xtermcfg.hin,v 1.182 2010/11/11 01:14:49 tom Exp $ */
 
 /************************************************************
 
-Copyright 1997-2008,2009 by Thomas E. Dickey
+Copyright 1997-2009,2010 by Thomas E. Dickey
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of the above listed
-copyright holder(s) not be used in advertising or publicity pertaining
-to distribution of the software without specific, written prior
-permission.
-
-THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD
-TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE
-LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name(s) of the above copyright
+holders shall not be used in advertising or otherwise to promote the
+sale, use or other dealings in this Software without prior written
+authorization.
 
 ********************************************************/
 
@@ -184,6 +191,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #ifndef __cplusplus
 /* #undef GCC_PRINTF */
+/* #undef GCC_PRINTFLIKE */
 /* #undef GCC_UNUSED */
 #endif
 
diff --git a/app/xterm/xtermcfg.hin b/app/xterm/xtermcfg.hin
index 60d919eec..8311384ee 100644
--- a/app/xterm/xtermcfg.hin
+++ b/app/xterm/xtermcfg.hin
@@ -1,4 +1,4 @@
-/* $XTermId: xtermcfg.hin,v 1.180 2010/04/21 00:19:23 tom Exp $ */
+/* $XTermId: xtermcfg.hin,v 1.182 2010/11/11 01:14:49 tom Exp $ */
 
 /************************************************************
 
@@ -6,22 +6,29 @@ Copyright 1997-2009,2010 by Thomas E. Dickey
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of the above listed
-copyright holder(s) not be used in advertising or publicity pertaining
-to distribution of the software without specific, written prior
-permission.
-
-THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD
-TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE
-LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name(s) of the above copyright
+holders shall not be used in advertising or otherwise to promote the
+sale, use or other dealings in this Software without prior written
+authorization.
 
 ********************************************************/
 
@@ -184,6 +191,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #ifndef __cplusplus
 #undef GCC_PRINTF
+#undef GCC_PRINTFLIKE
 #undef GCC_UNUSED
 #endif