26 files changed, 3212 insertions, 3675 deletions
diff --git a/libX11/Makefile.am b/libX11/Makefile.am
index 7a0c871f0..39e4bd947 100644
--- a/libX11/Makefile.am
+++ b/libX11/Makefile.am
@@ -1,34 +1,35 @@
-if XLIB_LOADABLE_I18N
-ORDER=src modules
-else
-ORDER=modules src
-endif
-SUBDIRS=include $(ORDER) nls man specs
-
-ACLOCAL_AMFLAGS = -I m4
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = x11.pc x11-xcb.pc
-
-MAINTAINERCLEANFILES = ChangeLog INSTALL
-
-.PHONY: ChangeLog INSTALL
-
-INSTALL:
-	$(INSTALL_CMD)
-
-ChangeLog:
-	$(CHANGELOG_CMD)
-
-dist-hook: ChangeLog INSTALL
-
-if LINT
-# Check source code with tools like lint & sparse
-LINT_SUBDIRS=src # modules
-
-lint:
-	@for subdir in $(LINT_SUBDIRS) ; do \
-		echo "Making $@ in $$subdir"; \
-		(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) lint) ; \
-	done
-endif LINT
+if XLIB_LOADABLE_I18N
+ORDER=src modules
+else
+ORDER=modules src
+endif
+# Order: nls before specs
+SUBDIRS=include $(ORDER) nls man specs
+
+ACLOCAL_AMFLAGS = -I m4
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = x11.pc x11-xcb.pc
+
+MAINTAINERCLEANFILES = ChangeLog INSTALL
+
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+	$(INSTALL_CMD)
+
+ChangeLog:
+	$(CHANGELOG_CMD)
+
+dist-hook: ChangeLog INSTALL
+
+if LINT
+# Check source code with tools like lint & sparse
+LINT_SUBDIRS=src # modules
+
+lint:
+	@for subdir in $(LINT_SUBDIRS) ; do \
+		echo "Making $@ in $$subdir"; \
+		(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) lint) ; \
+	done
+endif LINT
diff --git a/libX11/configure.ac b/libX11/configure.ac
index e842bf3ec..a0af80baa 100644
--- a/libX11/configure.ac
+++ b/libX11/configure.ac
@@ -29,7 +29,7 @@ XORG_ENABLE_SPECS
 XORG_WITH_XMLTO(0.0.22)
 XORG_WITH_FOP([],[no])
 XORG_WITH_XSLTPROC
-XORG_CHECK_SGML_DOCTOOLS(1.8)
+XORG_CHECK_SGML_DOCTOOLS(1.9)
 XORG_PROG_RAWCPP
 XORG_WITH_PERL
 
@@ -421,6 +421,20 @@ X11_LOCALEDIR="${X11_LOCALEDATADIR}"
 AX_DEFINE_DIR(XLOCALEDIR, X11_LOCALEDIR, [Location of libX11 locale data])
 AC_SUBST(X11_LOCALEDIR)
 
+locales="\
+ am_ET.UTF-8  armscii-8   C           el_GR.UTF-8  en_US.UTF-8  fi_FI.UTF-8 \
+ georgian-academy         georgian-ps ibm-cp1133   iscii-dev    isiri-3342 \
+ iso8859-1    iso8859-10  iso8859-11  iso8859-13   iso8859-14   iso8859-15 \
+ iso8859-2    iso8859-3   iso8859-4   iso8859-5    iso8859-6    iso8859-7 \
+ iso8859-8    iso8859-9   iso8859-9e  ja           ja.JIS       ja_JP.UTF-8\
+ ja.S90       ja.SJIS     ja.U90      ko           koi8-c       koi8-r \
+ koi8-u       ko_KR.UTF-8 microsoft-cp1251         microsoft-cp1255 \
+ microsoft-cp1256         mulelao-1   nokhchi-1    pt_BR.UTF-8  ru_RU.UTF-8 \
+ tatar-cyr    th_TH       th_TH.UTF-8 tscii-0      vi_VN.tcvn   vi_VN.viscii \
+ zh_CN        zh_CN.gb18030           zh_CN.gbk    zh_CN.UTF-8  zh_HK.big5 \
+ zh_HK.big5hkscs          zh_HK.UTF-8 zh_TW        zh_TW.big5   zh_TW.UTF-8"
+AC_SUBST(locales)
+
 XKEYSYMDB="${X11_DATADIR}/XKeysymDB"
 AX_DEFINE_DIR(XKEYSYMDB, XKEYSYMDB, [Location of keysym database])
 
@@ -451,6 +465,7 @@ AC_CONFIG_FILES([Makefile
 		nls/Makefile
 		specs/Makefile
 		specs/i18n/Makefile
+		specs/i18n/compose/Makefile
 		specs/i18n/framework/Makefile
 		specs/i18n/localedb/Makefile
 		specs/i18n/trans/Makefile
diff --git a/libX11/docbook-gen-chunk.am b/libX11/docbook-gen-chunk.am
new file mode 100644
index 000000000..46d485ff4
--- /dev/null
+++ b/libX11/docbook-gen-chunk.am
@@ -0,0 +1,102 @@
+#
+# Generate output formats for a single DocBook/XML with/without chapters
+# This version of docbook.am handles cases where XML source is generated
+# and the html to be produced must be in chunks, one per chapter.
+# The generated source must be cleaned, installed but not distributed
+#
+# Variables set by the calling Makefile:
+# shelfdir: the location where the docs/specs are installed. Typically $(docdir)
+# docbook:  the main DocBook/XML file, no chapters, appendix or image files
+# chapters: all files pulled in by an XInclude statement and images.
+#
+
+#
+# This makefile is intended for Users Documentation and Functional Specifications.
+# Do not use for Developer Documentation which is not installed and does not require olink.
+# Refer to http://www.x.org/releases/X11R7.6/doc/xorg-docs/ReleaseNotes.html#id2584393
+# for an explanation on documents classification.
+#
+
+# DocBook/XML generated output formats to be installed
+shelf_DATA = $(chapters) $(docbook)
+
+if HAVE_XMLTO
+#
+# Generate DocBook/XML output formats with or without stylesheets
+#
+
+# Stylesheets are available if the package xorg-sgml-doctools is installed
+if HAVE_STYLESHEETS
+
+# The location where all cross reference databases are installed
+sgmldbsdir = $(XORG_SGML_PATH)/X11/dbs
+masterdb = "$(sgmldbsdir)/masterdb$(suffix $@).xml"
+XMLTO_FLAGS =							\
+	--searchpath "$(XORG_SGML_PATH)/X11"			\
+	--stringparam target.database.document=$(masterdb)	\
+	--stringparam current.docid="$(<:.xml=)"		\
+	--stringparam collect.xref.targets="no"
+
+XMLTO_XHTML_FLAGS = \
+	-x $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl \
+	--stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css
+
+XMLTO_CHUNK_FLAGS = \
+	-x $(STYLESHEET_SRCDIR)/xorg-chunk.xsl \
+	--stringparam root.filename="$(<:.xml=)" \
+	--stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css
+
+XMLTO_FO_FLAGS = \
+	-x $(STYLESHEET_SRCDIR)/xorg-fo.xsl
+endif HAVE_STYLESHEETS
+
+shelf_DATA += $(docbook:.xml=.html) $(chapters:.xml=.html)
+%.html: %.xml  $(chapters)
+	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_CHUNK_FLAGS) xhtml $<
+
+if HAVE_FOP
+shelf_DATA += $(docbook:.xml=.pdf) $(docbook:.xml=.ps)
+%.pdf: %.xml $(chapters)
+	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_FO_FLAGS) --with-fop pdf $<
+%.ps: %.xml $(chapters)
+	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_FO_FLAGS) --with-fop ps $<
+endif HAVE_FOP
+
+if HAVE_XMLTO_TEXT
+shelf_DATA += $(docbook:.xml=.txt)
+%.txt: %.xml $(chapters)
+	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_XHTML_FLAGS) txt $<
+endif HAVE_XMLTO_TEXT
+
+#
+# Generate documents cross-reference target databases
+#
+
+# This is only possible if the xorg-sgml-doctools package is installed
+if HAVE_STYLESHEETS
+if HAVE_XSLTPROC
+
+# DocBook/XML generated document cross-reference database
+shelf_DATA += $(docbook:.xml=.html.db) $(docbook:.xml=.fo.db)
+
+# Generate DocBook/XML document cross-reference database
+# Flags for the XSL Transformation processor generating xref target databases
+XSLTPROC_FLAGS =					\
+	--path "$(XORG_SGML_PATH)/X11"			\
+	--stringparam targets.filename "$@"		\
+	--stringparam collect.xref.targets "only"	\
+	--nonet --xinclude
+
+%.html.db: %.xml  $(chapters)
+	$(AM_V_GEN)$(XSLTPROC) $(XSLTPROC_FLAGS) \
+	http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl $<
+
+%.fo.db: %.xml $(chapters)
+	$(AM_V_GEN)$(XSLTPROC) $(XSLTPROC_FLAGS) \
+	http://docbook.sourceforge.net/release/xsl/current/xhtml/chunk.xsl $<
+
+endif HAVE_XSLTPROC
+endif HAVE_STYLESHEETS
+endif HAVE_XMLTO
+
+CLEANFILES = $(shelf_DATA)
diff --git a/libX11/docbook-gen.am b/libX11/docbook-gen.am
new file mode 100644
index 000000000..292627ea4
--- /dev/null
+++ b/libX11/docbook-gen.am
@@ -0,0 +1,96 @@
+#
+# Generate output formats for a single DocBook/XML with/without chapters
+# This version of docbook.am handles cases where XML source is generated
+# The generated source must be cleaned, installed but not distributed
+#
+# Variables set by the calling Makefile:
+# shelfdir: the location where the docs/specs are installed. Typically $(docdir)
+# docbook:  the main DocBook/XML file, no chapters, appendix or image files
+# chapters: all files pulled in by an XInclude statement and images.
+#
+
+#
+# This makefile is intended for Users Documentation and Functional Specifications.
+# Do not use for Developer Documentation which is not installed and does not require olink.
+# Refer to http://www.x.org/releases/X11R7.6/doc/xorg-docs/ReleaseNotes.html#id2584393
+# for an explanation on documents classification.
+#
+
+# DocBook/XML generated output formats to be installed
+shelf_DATA = $(chapters) $(docbook)
+
+if HAVE_XMLTO
+#
+# Generate DocBook/XML output formats with or without stylesheets
+#
+
+# Stylesheets are available if the package xorg-sgml-doctools is installed
+if HAVE_STYLESHEETS
+
+# The location where all cross reference databases are installed
+sgmldbsdir = $(XORG_SGML_PATH)/X11/dbs
+masterdb = "$(sgmldbsdir)/masterdb$(suffix $@).xml"
+XMLTO_FLAGS =							\
+	--searchpath "$(XORG_SGML_PATH)/X11"			\
+	--stringparam target.database.document=$(masterdb)	\
+	--stringparam current.docid="$(<:.xml=)"		\
+	--stringparam collect.xref.targets="no"
+
+XMLTO_XHTML_FLAGS = \
+	-x $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl \
+	--stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css
+
+XMLTO_FO_FLAGS = \
+	-x $(STYLESHEET_SRCDIR)/xorg-fo.xsl
+endif HAVE_STYLESHEETS
+
+shelf_DATA += $(docbook:.xml=.html)
+%.html: %.xml  $(chapters)
+	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_XHTML_FLAGS) xhtml-nochunks $<
+
+if HAVE_FOP
+shelf_DATA += $(docbook:.xml=.pdf) $(docbook:.xml=.ps)
+%.pdf: %.xml $(chapters)
+	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_FO_FLAGS) --with-fop pdf $<
+%.ps: %.xml $(chapters)
+	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_FO_FLAGS) --with-fop ps $<
+endif HAVE_FOP
+
+if HAVE_XMLTO_TEXT
+shelf_DATA += $(docbook:.xml=.txt)
+%.txt: %.xml $(chapters)
+	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_XHTML_FLAGS) txt $<
+endif HAVE_XMLTO_TEXT
+
+#
+# Generate documents cross-reference target databases
+#
+
+# This is only possible if the xorg-sgml-doctools package is installed
+if HAVE_STYLESHEETS
+if HAVE_XSLTPROC
+
+# DocBook/XML generated document cross-reference database
+shelf_DATA += $(docbook:.xml=.html.db) $(docbook:.xml=.fo.db)
+
+# Generate DocBook/XML document cross-reference database
+# Flags for the XSL Transformation processor generating xref target databases
+XSLTPROC_FLAGS =					\
+	--path "$(XORG_SGML_PATH)/X11"			\
+	--stringparam targets.filename "$@"		\
+	--stringparam collect.xref.targets "only"	\
+	--nonet --xinclude
+
+%.html.db: %.xml  $(chapters)
+	$(AM_V_GEN)$(XSLTPROC) $(XSLTPROC_FLAGS) \
+	http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl $<
+
+%.fo.db: %.xml $(chapters)
+	$(AM_V_GEN)$(XSLTPROC) $(XSLTPROC_FLAGS) \
+	http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl $<
+
+endif HAVE_XSLTPROC
+endif HAVE_STYLESHEETS
+endif HAVE_XMLTO
+
+CLEANFILES = $(shelf_DATA)
diff --git a/libX11/nls/Makefile.am b/libX11/nls/Makefile.am
index cabaf40e1..7dc43088c 100644
--- a/libX11/nls/Makefile.am
+++ b/libX11/nls/Makefile.am
@@ -1,14 +1,10 @@
 
 x11localedir = $(X11_LOCALEDATADIR)
-specdir = $(docdir)/Compose
 CLEANFILES =
-XMLTO_FLAGS =
 SUFFIXES =
 
-include $(top_srcdir)/nls/xmlrules.in
-
 EXTRA_DIST = locale.alias.pre compose.dir.pre locale.dir.pre \
-	compose-check.pl compose-chart.pl
+	compose-check.pl
 
 x11locale_DATA = locale.alias locale.dir compose.dir
 
@@ -18,68 +14,6 @@ CLEANFILES += \
 	locale.dir locale.dir.l1 locale.dir.l2 \
 	XLC_LOCALE
 
-locales = \
-	am_ET.UTF-8		\
-	armscii-8		\
-	C			\
-	el_GR.UTF-8		\
-	en_US.UTF-8		\
-	fi_FI.UTF-8		\
-	georgian-academy	\
-	georgian-ps		\
-	ibm-cp1133		\
-	iscii-dev		\
-	isiri-3342		\
-	iso8859-1		\
-	iso8859-10		\
-	iso8859-11		\
-	iso8859-13		\
-	iso8859-14		\
-	iso8859-15		\
-	iso8859-2		\
-	iso8859-3		\
-	iso8859-4		\
-	iso8859-5		\
-	iso8859-6		\
-	iso8859-7		\
-	iso8859-8		\
-	iso8859-9		\
-	iso8859-9e		\
-	ja			\
-	ja.JIS			\
-	ja_JP.UTF-8		\
-	ja.S90			\
-	ja.SJIS			\
-	ja.U90			\
-	ko			\
-	koi8-c			\
-	koi8-r			\
-	koi8-u			\
-	ko_KR.UTF-8		\
-	microsoft-cp1251	\
-	microsoft-cp1255	\
-	microsoft-cp1256	\
-	mulelao-1		\
-	nokhchi-1		\
-	pt_BR.UTF-8		\
-	ru_RU.UTF-8		\
-	tatar-cyr		\
-	th_TH			\
-	th_TH.UTF-8		\
-	tscii-0			\
-	vi_VN.tcvn		\
-	vi_VN.viscii		\
-	zh_CN			\
-	zh_CN.gb18030		\
-	zh_CN.gbk		\
-	zh_CN.UTF-8		\
-	zh_HK.big5		\
-	zh_HK.big5hkscs		\
-	zh_HK.UTF-8		\
-	zh_TW			\
-	zh_TW.big5		\
-	zh_TW.UTF-8
-
 include $(top_srcdir)/cpprules.in
 
 # Global data files
@@ -103,16 +37,8 @@ locale.dir: locale.dir.pre
 	cat locale.dir.l2 locale.dir.l1 > locale.dir
 
 if HAVE_PERL
-doc_sources = Compose/index.xml
-
-Compose/index.xml:
-	@$(MKDIR_P) $(@D)
-	$(AM_V_GEN)$(PERL) $(srcdir)/compose-chart.pl \
-	 --index --output="$@" $(locales)
-
-clean-local: clean-Compose-dir
-clean-Compose-dir:
-	-rm -rf Compose
+TESTS_ENVIRONMENT = $(PERL)
+TESTS = $(srcdir)/compose-check.pl
 endif HAVE_PERL
 
 
@@ -124,21 +50,3 @@ nobase_x11locale_DATA = $(locales:%=%/XLC_LOCALE) $(locales:%=%/Compose)
 EXTRA_DIST += $(nobase_x11locale_DATA:%=%.pre)
 CLEANFILES += $(nobase_x11locale_DATA)
 
-if HAVE_PERL
-TESTS_ENVIRONMENT = $(PERL)
-TESTS = $(srcdir)/compose-check.pl
-
-COMPOSE_CHARTS = $(locales:%=%/Compose.xml)
-doc_sources += $(locales:%=Compose/%.xml)
-CLEANFILES += $(COMPOSE_CHARTS) $(doc_sources)
-
-XMLTO_FLAGS += -o $(@D)
-
-%/Compose.xml: %/Compose
-	$(AM_V_GEN)$(PERL) $(srcdir)/compose-chart.pl \
-	 --locale="$(@D)" --output="$@" $<
-
-Compose/%.xml: %/Compose.xml
-	$(AM_V_GEN)cp $< $@
-
-endif HAVE_PERL
diff --git a/libX11/nls/compose-chart.pl b/libX11/nls/compose-chart.pl
deleted file mode 100644
index c38ae8320..000000000
--- a/libX11/nls/compose-chart.pl
+++ /dev/null
@@ -1,389 +0,0 @@
-#! /usr/bin/perl
-#
-# Copyright 2009, 2010, Oracle and/or its affiliates. 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 (including the next
-# paragraph) 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.
-#
-
-#
-# Make a DocBook chart showing compose combinations for a locale
-#
-# See perldoc at end (or run with --help or --man options) for details
-# of command-line options.
-#
-
-# Compose file grammar is defined in modules/im/ximcp/imLcPrs.c
-
-use strict;
-use warnings;
-use Getopt::Long;
-use Pod::Usage;
-
-my $error_count = 0;
-
-my $charset;
-my $locale_name;
-my $output_filename = '-';
-my $man = 0;
-my $help = 0;
-my $make_index = 0;
-
-GetOptions ('charset:s' => \$charset,
-	    'locale=s' => \$locale_name,
-	    'output=s' => \$output_filename,
-	    'index' => \$make_index,
-	    'help|?' => \$help,
-	    'man' => \$man)
-    or pod2usage(2);
-pod2usage(1) if $help;
-pod2usage(-exitstatus => 0, -verbose => 2) if $man;
-
-if (!defined($charset) || ($charset eq "")) {
-  if (defined($locale_name)) {
-    my $guessed_charset = $locale_name;
-    $guessed_charset =~ s{^.*\.}{};
-    if ($guessed_charset =~ m{^(utf-8|gbk|gb18030)$}i) {
-      $charset = $1;
-    } elsif ($guessed_charset =~ m{iso8859-(\d+)}i) {
-      $charset = "iso-8859-$1";
-    } elsif ($guessed_charset =~ m{^microsoft-cp(125\d)$}) {
-      $charset = "windows-$1";
-    }
-  }
-  if (!defined($charset) || ($charset eq "")) {
-    $charset = "utf-8";
-  }
-}
-
-if ($make_index) {
-  # Print Docbook output
-  open my $OUTPUT, '>', $output_filename
-      or die "Could not create $output_filename: $!";
-
-  print $OUTPUT
-      join ("\n",
-	    qq(<?xml version="1.0" encoding="$charset" ?>),
-	    q(<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"),
-	    q( "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">),
-	    q(<article id="compose-index">),
-	    q(<simplesect>),
-	    q(<title>Xlib Compose Key Charts</title>),
-	    q(<simplelist type='horiz' columns='3'>),
-	    ( map { qq(<member><ulink url="$_.html">$_</ulink></member>) }
-	      @ARGV ),
-	    q(</simplelist>),
-	    q(</simplesect>),
-	    q(</article>),
-	    "\n"
-      );
-
-  close $OUTPUT or die "Couldn't write $output_filename: $!";
-
-  exit(0);
-}
-
-foreach my $a (@ARGV) {
-  $error_count += make_compose_chart($a);
-}
-
-exit($error_count);
-
-sub make_compose_chart {
-  my ($filename) = @_;
-  my $errors = 0;
-
-  my @compose_table = ();
-  my @included_files = ();
-
-  my $line = 0;
-  my $pre_file = ($filename =~ m{\.pre$}) ? 1 : 0;
-  my $in_c_comment = 0;
-  my $in_comment = 0;
-  my $keyseq_count = 0;
-
-  open my $COMPOSE, '<', $filename or die "Could not open $filename: $!";
-
- COMPOSE_LINE:
-  while (my $cl = <$COMPOSE>) {
-    $line++;
-    chomp($cl);
-    my $original_line = $cl;
-
-    # Special handling for changes cpp makes to .pre files
-    if ($pre_file == 1) {
-      if ($in_c_comment) {		# Look for end of multi-line C comment
-	if ($cl =~ m{\*/(.*)$}) {
-	  $cl = $1;
-	  $in_c_comment = 0;
-	} else {
-	  next;
-	}
-      }
-      $cl =~ s{/\*.\**/}{};		# Remove single line C comments
-      if ($cl =~ m{^(.*)/\*}) {		# Start of a multi-line C comment
-	$cl = $1;
-	$in_c_comment = 1;
-      }
-      $cl =~ s{^\s*XCOMM}{#};		# Translate pre-processing comments
-    }
-
-    chomp($cl);
-
-    if ($cl =~ m{^\s*#\s*(.*)$}) {	# Comment only lines
-      # Combine commment blocks
-      my $comment = $1;
-
-      if ($in_comment) {
-	my $prev_comment = pop @compose_table;
-	$comment = join(' ', $prev_comment->{-comment}, $comment);
-      } else {
-	$in_comment = 1;
-      }
-
-      push @compose_table, { -type => 'comment', -comment => $comment };
-      next COMPOSE_LINE;
-    }
-
-    $in_comment = 0;
-
-    if ($cl =~ m{^\s*$}) {		# Skip blank lines
-      next COMPOSE_LINE;
-    }
-    elsif ($cl =~ m{^(STATE\s+|END_STATE)}) {
-      # Sun extension to compose file syntax
-      next COMPOSE_LINE;
-    }
-    elsif ($cl =~ m{^([^:]+)\s*:\s*(.+)$}) {
-      my ($seq, $action) = ($1, $2);
-      $seq =~ s{\s+$}{};
-
-      my @keys = grep { $_ !~ m/^\s*$/ } split /[\s\<\>]+/, $seq;
-
-      push @compose_table, {
-	-type => 'keyseq',
-	-keys => [ @keys ],
-	-action => $action
-      };
-      $keyseq_count++;
-      next COMPOSE_LINE;
-    } elsif ($cl =~ m{^(STATE_TYPE:|\@StartDeadKeyMap|\@EndDeadKeyMap)}) {
-      # ignore
-      next COMPOSE_LINE;
-    } elsif ($cl =~ m{^include "(.*)"}) {
-      my $incpath = $1;
-      $incpath =~ s{^X11_LOCALEDATADIR/(.*)/Compose}{the $1 compose table};
-
-      push @included_files, $incpath;
-      next COMPOSE_LINE;
-    } else {
-      print STDERR ('Unrecognized pattern in ', $filename,
-		    ' on line #', $line, ":\n  ", $cl, "\n");
-    }
-  }
-  close $COMPOSE;
-
-  if ($errors > 0) {
-    return $errors;
-  }
-
-  # Print Docbook output
-  open my $OUTPUT, '>', $output_filename
-      or die "Could not create $output_filename: $!";
-
-  print $OUTPUT
-      join ("\n",
-	    qq(<?xml version="1.0" encoding="$charset" ?>),
-	    q(<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"),
-	    q( "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">),
-	    qq(<article id="$locale_name">),
-	    q(<simplesect>),
-	    qq(<title>Xlib Compose Keys for $locale_name</title>),
-	    q(<para>Applications using Xlib input handling should recognize),
-	    q( these compose key sequences in locales using the),
-	    qq( $locale_name compose table.</para>),
-	    "\n"
-      );
-
-  if (@included_files) {
-    print $OUTPUT
-	q(<para>This compose table includes the non-conflicting),
-	q( entries from: ),
-	join(',', @included_files),
-	q(.  Those entries are not shown here - see those charts for the),
-	q( included key sequences.</para>),
-	"\n";
-  }
-
-  my @pretable_comments = ();
-
-  if ($keyseq_count == 0) {
-    @pretable_comments = @compose_table;
-  } elsif ($compose_table[0]->{-type} eq 'comment') {
-    push @pretable_comments, shift @compose_table;
-  }
-
-  foreach my $comment_ref (@pretable_comments) {
-    print $OUTPUT
-	qq(<para>), xml_escape($comment_ref->{-comment}), qq(</para>\n);
-  }
-
-  if ($keyseq_count > 0) {
-    start_table($OUTPUT);
-    my $row_count = 0;
-
-    foreach my $cr (@compose_table) {
-
-      if ($row_count++ > 750) {
-	# Break tables every 750 rows to avoid overflowing
-	# xmlto/xsltproc limits on the largest tables
-	end_table($OUTPUT);
-	start_table($OUTPUT);
-	$row_count = 0;
-      }
-
-      if ($cr->{-type} eq 'comment') {
-	print $OUTPUT
-	    qq(<row><entry namest='seq' nameend='action'>),
-	    xml_escape($cr->{-comment}), qq(</entry></row>\n);
-      } elsif ($cr->{-type} eq 'keyseq') {
-	my $action = join(" ", xml_escape($cr->{-action}));
-	if ($action =~ m{^\s*"\\([0-7]+)"}) {
-	  my $char = oct($1);
-	  if ($char >= 32) {
-	    $action =~ s{^\s*"\\[0-7]+"}{"&#$char;"};
-	  }
-	}
-	$action =~ s{^\s*"(.+)"}{"$1"};
-
-	print $OUTPUT
-	    qq(<row><entry>),
-	    qq(<keycombo action='seq'>),
-	    (map { qq(<keysym>$_</keysym>) } xml_escape(@{$cr->{-keys}})),
-	    qq(</keycombo>),
-	    qq(</entry><entry>),
-	    $action,
-	    qq(</entry></row>\n);
-      }
-    }
-
-    end_table($OUTPUT);
-  } else {
-    print $OUTPUT
-	qq(<para><emphasis>),
-	qq(This compose table defines no sequences of its own.),
-	qq(</emphasis></para>\n);
-  }
-  print $OUTPUT "</simplesect>\n</article>\n";
-
-  close $OUTPUT or die "Couldn't write $output_filename: $!";
-
-  return $errors;
-}
-
-sub xml_escape {
-  my @output;
-
-  foreach my $l (@_) {
-      $l =~ s{\&}{&amp;}g;
-      $l =~ s{\<}{&lt;}g;
-      $l =~ s{\>}{&gt;}g;
-      push @output, $l;
-  }
-  return @output;
-}
-
-sub start_table {
-  my ($OUTPUT) = @_;
-
-  print $OUTPUT
-      join("\n",
-	   qq(<table><title>Compose Key Sequences for $locale_name</title>),
-	   qq(<tgroup cols='2'>),
-	   qq( <colspec colname='seq' /><colspec colname='action' />),
-	   qq( <thead><row>),
-	   qq(  <entry>Key Sequence</entry><entry>Action</entry>),
-	   qq( </row></thead>),
-	   qq( <tbody>\n),
-      );
-}
-
-sub end_table {
-  my ($OUTPUT) = @_;
-
-  print $OUTPUT "</tbody>\n</tgroup>\n</table>\n";
-}
-
-__END__
-
-=head1 NAME
-
-compose-chart - Make DocBook/XML charts of compose table entries
-
-=head1 SYNOPSIS
-
-compose-chart [options] [file ...]
-
- Options:
-    --charset[=<cset>]	character set to specify in XML doctype
-    --locale=<locale>	name of locale to display in chart
-    --output=<file>	filename to output chart to
-    --index		make index of charts instead of individual chart
-    --help		brief help message
-    --man		full documentation
-
-=head1 OPTIONS
-
-=over 8
-
-=item B<--charset>[=I<cset>]
-
-Specify a character set to list in the doctype declaration in the XML output.
-If not specified, attempts to guess from the locale name, else default to
-"utf-8".
-
-=item B<--locale>=I<locale>
-
-Specify the locale name to use in the chart titles and introductory text.
-
-=item B<--output>=I<file>
-
-Specify the output file to write the DocBook output to.
-
-=item B<--index>
-
-Generate an index of the listed locale charts instead of a chart for a
-specific locale.
-
-=item B<--help>
-
-Print a brief help message and exit.
-
-=item B<--man>
-
-Print the manual page and exit.
-
-=back
-
-=head1 DESCRIPTION
-
-This program will read the given compose table file(s) and generate
-DocBook/XML charts listing the available characters for end-user reference.
-
-=cut
diff --git a/libX11/nls/xmlrules.in b/libX11/nls/xmlrules.in
deleted file mode 100644
index 5a6be24f5..000000000
--- a/libX11/nls/xmlrules.in
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# Copyright (c) 2010, Oracle and/or its affiliates. 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 (including the next
-# paragraph) 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.
-#
-
-if HAVE_XMLTO
-spec_DATA = $(doc_sources:.xml=.html)
-
-if HAVE_FOP
-spec_DATA += $(doc_sources:.xml=.ps) $(doc_sources:.xml=.pdf)
-endif
-
-if HAVE_XMLTO_TEXT
-spec_DATA += $(doc_sources:.xml=.txt)
-endif
-
-if HAVE_STYLESHEETS
-XMLTO_FLAGS += 			\
-	-m $(XSL_STYLESHEET)	\
-	--stringparam img.src.path=$(abs_builddir)/	\
-	--stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css
-endif
-
-CLEANFILES += $(spec_DATA)
-
-%.txt: %.xml $(dist_spec_DATA)
-	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) txt $<
-
-%.html: %.xml $(dist_spec_DATA)
-	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) xhtml-nochunks $<
-
-%.pdf: %.xml $(dist_spec_DATA)
-	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop pdf $<
-
-%.ps: %.xml $(dist_spec_DATA)
-	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop ps $<
-
-chunked-html: $(doc_sources)
-	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) -o html xhtml $(doc_sources)
-
-endif HAVE_XMLTO
diff --git a/libX11/specs/i18n/Makefile.am b/libX11/specs/i18n/Makefile.am
index 1fd341f21..a69a51e9f 100644
--- a/libX11/specs/i18n/Makefile.am
+++ b/libX11/specs/i18n/Makefile.am
@@ -1,24 +1,24 @@
-#
-# Copyright (c) 2010, Oracle and/or its affiliates. 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 (including the next
-# paragraph) 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.
-#
-
-SUBDIRS=framework localedb trans
+#
+# Copyright (c) 2010, Oracle and/or its affiliates. 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 (including the next
+# paragraph) 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.
+#
+
+SUBDIRS=compose framework localedb trans
diff --git a/libX11/specs/libX11/AppA.xml b/libX11/specs/libX11/AppA.xml
index fca0003c0..0bd585cdd 100644
--- a/libX11/specs/libX11/AppA.xml
+++ b/libX11/specs/libX11/AppA.xml
@@ -1,2105 +1,2105 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-	  "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
-<appendix id="xlib_functions_and_protocol_requests">
-<title>Xlib Functions and Protocol Requests</title>
-<para>
-This appendix provides two tables that relate to Xlib functions
-and the X protocol.
-The following table lists each Xlib function (in alphabetical order)
-and the corresponding protocol request that it generates.
-</para>
-<table>
-  <title>Protocol requests made by each Xlib function</title>
-  <tgroup cols="2">
-    <thead>
-      <row>
-	<entry>Xlib Function</entry>
-	<entry>Protocol Request</entry>
-      </row>
-    </thead>
-    <tbody>
-      <row>
-	<entry><function>XActivateScreenSaver</function></entry>
-	<entry><systemitem>ForceScreenSaver</systemitem></entry></row>
-      <row>
-	<entry><function>XAddHost</function></entry>
-	<entry><systemitem>ChangeHosts</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XAddHosts</function></entry>
-	<entry><systemitem>ChangeHosts</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XAddToSaveSet</function></entry>
-	<entry><systemitem>ChangeSaveSet</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XAllocColor</function></entry>
-	<entry><systemitem>AllocColor</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XAllocColorCells</function></entry>
-	<entry><systemitem>AllocColorCells</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XAllocColorPlanes</function></entry>
-	<entry><systemitem>AllocColorPlanes</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XAllocNamedColor</function></entry>
-	<entry><systemitem>AllocNamedColor</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XAllowEvents</function></entry>
-	<entry><systemitem>AllowEvents</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XAutoRepeatOff</function></entry>
-	<entry><systemitem>ChangeKeyboardControl</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XAutoRepeatOn</function></entry>
-	<entry><systemitem>ChangeKeyboardControl</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XBell</function></entry>
-	<entry><systemitem>Bell</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XChangeActivePointerGrab</function></entry>
-	<entry><systemitem>ChangeActivePointerGrab</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XChangeGC</function></entry>
-	<entry><systemitem>ChangeGC</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XChangeKeyboardControl</function></entry>
-	<entry><systemitem>ChangeKeyboardControl</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XChangeKeyboardMapping</function></entry>
-	<entry><systemitem>ChangeKeyboardMapping</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XChangePointerControl</function></entry>
-	<entry><systemitem>ChangePointerControl</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XChangeProperty</function></entry>
-	<entry><systemitem>ChangeProperty</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XChangeSaveSet</function></entry>
-	<entry><systemitem>ChangeSaveSet</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XChangeWindowAttributes</function></entry>
-	<entry><systemitem>ChangeWindowAttributes</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XCirculateSubwindows</function></entry>
-	<entry><systemitem>CirculateWindow</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XCirculateSubwindowsDown</function></entry>
-	<entry><systemitem>CirculateWindow</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XCirculateSubwindowsUp</function></entry>
-	<entry><systemitem>CirculateWindow</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XClearArea</function></entry>
-	<entry><systemitem>ClearArea</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XClearWindow</function></entry>
-	<entry><systemitem>ClearArea</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XConfigureWindow</function></entry>
-	<entry><systemitem>ConfigureWindow</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XConvertSelection</function></entry>
-	<entry><systemitem>ConvertSelection</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XCopyArea</function></entry>
-	<entry><systemitem>CopyArea</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XCopyColormapAndFree</function></entry>
-	<entry><systemitem>CopyColormapAndFree</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XCopyGC</function></entry>
-	<entry><systemitem>CopyGC</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XCopyPlane</function></entry>
-	<entry><systemitem>CopyPlane</systemitem></entry>
-      </row>
-      <row>
-	<entry morerows="3"><function>XCreateBitmapFromData</function></entry>
-	<entry><systemitem>CreateGC</systemitem></entry>
-      </row>
-      <row>
-
-	<entry><systemitem>CreatePixmap</systemitem></entry>
-      </row>
-      <row>
-
-	<entry><systemitem>FreeGC</systemitem></entry>
-      </row>
-      <row>
-
-	<entry><systemitem>PutImage</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XCreateColormap</function></entry>
-	<entry><systemitem>CreateColormap</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XCreateFontCursor</function></entry>
-	<entry><systemitem>CreateGlyphCursor</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XCreateGC</function></entry>
-	<entry><systemitem>CreateGC</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XCreateGlyphCursor</function></entry>
-	<entry><systemitem>CreateGlyphCursor</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XCreatePixmap</function></entry>
-	<entry><systemitem>CreatePixmap</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XCreatePixmapCursor</function></entry>
-	<entry><systemitem>CreateCursor</systemitem></entry>
-      </row>
-      <row>
-	<entry morerows="3"><function>XCreatePixmapFromData</function></entry>
-	<entry><systemitem>CreateGC</systemitem></entry>
-      </row>
-      <row>
-
-	<entry><systemitem>CreatePixmap</systemitem></entry>
-      </row>
-      <row>
-
-	<entry><systemitem>FreeGC</systemitem></entry>
-      </row>
-      <row>
-
-	<entry><systemitem>PutImage</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XCreateSimpleWindow</function></entry>
-	<entry><systemitem>CreateWindow</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XCreateWindow</function></entry>
-	<entry><systemitem>CreateWindow</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XDefineCursor</function></entry>
-	<entry><systemitem>ChangeWindowAttributes</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XDeleteProperty</function></entry>
-	<entry><systemitem>DeleteProperty</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XDestroySubwindows</function></entry>
-	<entry><systemitem>DestroySubwindows</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XDestroyWindow</function></entry>
-	<entry><systemitem>DestroyWindow</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XDisableAccessControl</function></entry>
-	<entry><systemitem>SetAccessControl</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XDrawArc</function></entry>
-	<entry><systemitem>PolyArc</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XDrawArcs</function></entry>
-	<entry><systemitem>PolyArc</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XDrawImageString</function></entry>
-	<entry><systemitem>ImageText8</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XDrawImageString16</function></entry>
-	<entry><systemitem>ImageText16</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XDrawLine</function></entry>
-	<entry><systemitem>PolySegment</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XDrawLines</function></entry>
-	<entry><systemitem>PolyLine</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XDrawPoint</function></entry>
-	<entry><systemitem>PolyPoint</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XDrawPoints</function></entry>
-	<entry><systemitem>PolyPoint</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XDrawRectangle</function></entry>
-	<entry><systemitem>PolyRectangle</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XDrawRectangles</function></entry>
-	<entry><systemitem>PolyRectangle</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XDrawSegments</function></entry>
-	<entry><systemitem>PolySegment</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XDrawString</function></entry>
-	<entry><systemitem>PolyText8</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XDrawString16</function></entry>
-	<entry><systemitem>PolyText16</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XDrawText</function></entry>
-	<entry><systemitem>PolyText8</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XDrawText16</function></entry>
-	<entry><systemitem>PolyText16</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XEnableAccessControl</function></entry>
-	<entry><systemitem>SetAccessControl</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XFetchBytes</function></entry>
-	<entry><systemitem>GetProperty</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XFetchName</function></entry>
-	<entry><systemitem>GetProperty</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XFillArc</function></entry>
-	<entry><systemitem>PolyFillArc</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XFillArcs</function></entry>
-	<entry><systemitem>PolyFillArc</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XFillPolygon</function></entry>
-	<entry><systemitem>FillPoly</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XFillRectangle</function></entry>
-	<entry><systemitem>PolyFillRectangle</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XFillRectangles</function></entry>
-	<entry><systemitem>PolyFillRectangle</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XForceScreenSaver</function></entry>
-	<entry><systemitem>ForceScreenSaver</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XFreeColormap</function></entry>
-	<entry><systemitem>FreeColormap</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XFreeColors</function></entry>
-	<entry><systemitem>FreeColors</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XFreeCursor</function></entry>
-	<entry><systemitem>FreeCursor</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XFreeFont</function></entry>
-	<entry><systemitem>CloseFont</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XFreeGC</function></entry>
-	<entry><systemitem>FreeGC</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XFreePixmap</function></entry>
-	<entry><systemitem>FreePixmap</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XGetAtomName</function></entry>
-	<entry><systemitem>GetAtomName</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XGetClassHint</function></entry>
-	<entry><systemitem>GetProperty</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XGetFontPath</function></entry>
-	<entry><systemitem>GetFontPath</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XGetGeometry</function></entry>
-	<entry><systemitem>GetGeometry</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XGetIconName</function></entry>
-	<entry><systemitem>GetProperty</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XGetIconSizes</function></entry>
-	<entry><systemitem>GetProperty</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XGetImage</function></entry>
-	<entry><systemitem>GetImage</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XGetInputFocus</function></entry>
-	<entry><systemitem>GetInputFocus</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XGetKeyboardControl</function></entry>
-	<entry><systemitem>GetKeyboardControl</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XGetKeyboardMapping</function></entry>
-	<entry><systemitem>GetKeyboardMapping</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XGetModifierMapping</function></entry>
-	<entry><systemitem>GetModifierMapping</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XGetMotionEvents</function></entry>
-	<entry><systemitem>GetMotionEvents</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XGetNormalHints</function></entry>
-	<entry><systemitem>GetProperty</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XGetPointerControl</function></entry>
-	<entry><systemitem>GetPointerControl</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XGetPointerMapping</function></entry>
-	<entry><systemitem>GetPointerMapping</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XGetRGBColormaps</function></entry>
-	<entry><systemitem>GetProperty</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XGetScreenSaver</function></entry>
-	<entry><systemitem>GetScreenSaver</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XGetSelectionOwner</function></entry>
-	<entry><systemitem>GetSelectionOwner</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XGetSizeHints</function></entry>
-	<entry><systemitem>GetProperty</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XGetTextProperty</function></entry>
-	<entry><systemitem>GetProperty</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XGetTransientForHint</function></entry>
-	<entry><systemitem>GetProperty</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XGetWMClientMachine</function></entry>
-	<entry><systemitem>GetProperty</systemitem></entry>
-      </row>
-      <row>
-	<entry morerows="1"><function>XGetWMColormapWindows</function></entry>
-	<entry><systemitem>GetProperty</systemitem></entry>
-      </row>
-      <row>
-
-	<entry><systemitem>InternAtom</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XGetWMHints</function></entry>
-	<entry><systemitem>GetProperty</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XGetWMIconName</function></entry>
-	<entry><systemitem>GetProperty</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XGetWMName</function></entry>
-	<entry><systemitem>GetProperty</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XGetWMNormalHints</function></entry>
-	<entry><systemitem>GetProperty</systemitem></entry>
-      </row>
-      <row>
-	<entry morerows="1"><function>XGetWMProtocols</function></entry>
-	<entry><systemitem>GetProperty</systemitem></entry>
-      </row>
-      <row>
-
-	<entry><systemitem>InternAtom</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XGetWMSizeHints</function></entry>
-	<entry><systemitem>GetProperty</systemitem></entry>
-      </row>
-      <row>
-	<entry morerows="1"><function>XGetWindowAttributes</function></entry>
-	<entry><systemitem>GetWindowAttributes</systemitem></entry>
-      </row>
-      <row>
-
-	<entry><systemitem>GetGeometry</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XGetWindowProperty</function></entry>
-	<entry><systemitem>GetProperty</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XGetZoomHints</function></entry>
-	<entry><systemitem>GetProperty</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XGrabButton</function></entry>
-	<entry><systemitem>GrabButton</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XGrabKey</function></entry>
-	<entry><systemitem>GrabKey</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XGrabKeyboard</function></entry>
-	<entry><systemitem>GrabKeyboard</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XGrabPointer</function></entry>
-	<entry><systemitem>GrabPointer</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XGrabServer</function></entry>
-	<entry><systemitem>GrabServer</systemitem></entry>
-      </row>
-      <row>
-	<entry morerows="1"><function>XIconifyWindow</function></entry>
-	<entry><systemitem>InternAtom</systemitem></entry>
-      </row>
-      <row>
-
-	<entry><systemitem>SendEvent</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XInitExtension</function></entry>
-	<entry><systemitem>QueryExtension</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XInstallColormap</function></entry>
-	<entry><systemitem>InstallColormap</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XInternAtom</function></entry>
-	<entry><systemitem>InternAtom</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XKillClient</function></entry>
-	<entry><systemitem>KillClient</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XListExtensions</function></entry>
-	<entry><systemitem>ListExtensions</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XListFonts</function></entry>
-	<entry><systemitem>ListFonts</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XListFontsWithInfo</function></entry>
-	<entry><systemitem>ListFontsWithInfo</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XListHosts</function></entry>
-	<entry><systemitem>ListHosts</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XListInstalledColormaps</function></entry>
-	<entry><systemitem>ListInstalledColormaps</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XListProperties</function></entry>
-	<entry><systemitem>ListProperties</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XLoadFont</function></entry>
-	<entry><systemitem>OpenFont</systemitem></entry>
-      </row>
-      <row>
-	<entry morerows="1"><function>XLoadQueryFont</function></entry>
-	<entry><systemitem>OpenFont</systemitem></entry>
-      </row>
-      <row>
-
-	<entry><systemitem>QueryFont</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XLookupColor</function></entry>
-	<entry><systemitem>LookupColor</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XLowerWindow</function></entry>
-	<entry><systemitem>ConfigureWindow</systemitem></entry>
-      </row>
-      <row>
-	<entry morerows="1"><function>XMapRaised</function></entry>
-	<entry><systemitem>ConfigureWindow</systemitem></entry>
-      </row>
-      <row>
-
-	<entry><systemitem>MapWindow</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XMapSubwindows</function></entry>
-	<entry><systemitem>MapSubwindows</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XMapWindow</function></entry>
-	<entry><systemitem>MapWindow</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XMoveResizeWindow</function></entry>
-	<entry><systemitem>ConfigureWindow</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XMoveWindow</function></entry>
-	<entry><systemitem>ConfigureWindow</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XNoOp</function></entry>
-	<entry><systemitem>NoOperation</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XOpenDisplay</function></entry>
-	<entry><systemitem>CreateGC</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XParseColor</function></entry>
-	<entry><systemitem>LookupColor</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XPutImage</function></entry>
-	<entry><systemitem>PutImage</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XQueryBestCursor</function></entry>
-	<entry><systemitem>QueryBestSize</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XQueryBestSize</function></entry>
-	<entry><systemitem>QueryBestSize</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XQueryBestStipple</function></entry>
-	<entry><systemitem>QueryBestSize</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XQueryBestTile</function></entry>
-	<entry><systemitem>QueryBestSize</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XQueryColor</function></entry>
-	<entry><systemitem>QueryColors</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XQueryColors</function></entry>
-	<entry><systemitem>QueryColors</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XQueryExtension</function></entry>
-	<entry><systemitem>QueryExtension</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XQueryFont</function></entry>
-	<entry><systemitem>QueryFont</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XQueryKeymap</function></entry>
-	<entry><systemitem>QueryKeymap</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XQueryPointer</function></entry>
-	<entry><systemitem>QueryPointer</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XQueryTextExtents</function></entry>
-	<entry><systemitem>QueryTextExtents</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XQueryTextExtents16</function></entry>
-	<entry><systemitem>QueryTextExtents</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XQueryTree</function></entry>
-	<entry><systemitem>QueryTree</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XRaiseWindow</function></entry>
-	<entry><systemitem>ConfigureWindow</systemitem></entry>
-      </row>
-      <row>
-	<entry morerows="3"><function>XReadBitmapFile</function></entry>
-	<entry><systemitem>CreateGC</systemitem></entry>
-      </row>
-      <row>
-
-	<entry><systemitem>CreatePixmap</systemitem></entry>
-      </row>
-      <row>
-
-	<entry><systemitem>FreeGC</systemitem></entry>
-      </row>
-      <row>
-
-	<entry><systemitem>PutImage</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XRecolorCursor</function></entry>
-	<entry><systemitem>RecolorCursor</systemitem></entry>
-      </row>
-      <row>
-	<entry morerows="1"><function>XReconfigureWMWindow</function></entry>
-	<entry><systemitem>ConfigureWindow</systemitem></entry>
-      </row>
-      <row>
-
-	<entry><systemitem>SendEvent</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XRemoveFromSaveSet</function></entry>
-	<entry><systemitem>ChangeSaveSet</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XRemoveHost</function></entry>
-	<entry><systemitem>ChangeHosts</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XRemoveHosts</function></entry>
-	<entry><systemitem>ChangeHosts</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XReparentWindow</function></entry>
-	<entry><systemitem>ReparentWindow</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XResetScreenSaver</function></entry>
-	<entry><systemitem>ForceScreenSaver</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XResizeWindow</function></entry>
-	<entry><systemitem>ConfigureWindow</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XRestackWindows</function></entry>
-	<entry><systemitem>ConfigureWindow</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XRotateBuffers</function></entry>
-	<entry><systemitem>RotateProperties</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XRotateWindowProperties</function></entry>
-	<entry><systemitem>RotateProperties</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XSelectInput</function></entry>
-	<entry><systemitem>ChangeWindowAttributes</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XSendEvent</function></entry>
-	<entry><systemitem>SendEvent</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XSetAccessControl</function></entry>
-	<entry><systemitem>SetAccessControl</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XSetArcMode</function></entry>
-	<entry><systemitem>ChangeGC</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XSetBackground</function></entry>
-	<entry><systemitem>ChangeGC</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XSetClassHint</function></entry>
-	<entry><systemitem>ChangeProperty</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XSetClipMask</function></entry>
-	<entry><systemitem>ChangeGC</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XSetClipOrigin</function></entry>
-	<entry><systemitem>ChangeGC</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XSetClipRectangles</function></entry>
-	<entry><systemitem>SetClipRectangles</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XSetCloseDownMode</function></entry>
-	<entry><systemitem>SetCloseDownMode</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XSetCommand</function></entry>
-	<entry><systemitem>ChangeProperty</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XSetDashes</function></entry>
-	<entry><systemitem>SetDashes</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XSetFillRule</function></entry>
-	<entry><systemitem>ChangeGC</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XSetFillStyle</function></entry>
-	<entry><systemitem>ChangeGC</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XSetFont</function></entry>
-	<entry><systemitem>ChangeGC</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XSetFontPath</function></entry>
-	<entry><systemitem>SetFontPath</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XSetForeground</function></entry>
-	<entry><systemitem>ChangeGC</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XSetFunction</function></entry>
-	<entry><systemitem>ChangeGC</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XSetGraphicsExposures</function></entry>
-	<entry><systemitem>ChangeGC</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XSetIconName</function></entry>
-	<entry><systemitem>ChangeProperty</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XSetIconSizes</function></entry>
-	<entry><systemitem>ChangeProperty</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XSetInputFocus</function></entry>
-	<entry><systemitem>SetInputFocus</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XSetLineAttributes</function></entry>
-	<entry><systemitem>ChangeGC</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XSetModifierMapping</function></entry>
-	<entry><systemitem>SetModifierMapping</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XSetNormalHints</function></entry>
-	<entry><systemitem>ChangeProperty</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XSetPlaneMask</function></entry>
-	<entry><systemitem>ChangeGC</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XSetPointerMapping</function></entry>
-	<entry><systemitem>SetPointerMapping</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XSetRGBColormaps</function></entry>
-	<entry><systemitem>ChangeProperty</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XSetScreenSaver</function></entry>
-	<entry><systemitem>SetScreenSaver</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XSetSelectionOwner</function></entry>
-	<entry><systemitem>SetSelectionOwner</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XSetSizeHints</function></entry>
-	<entry><systemitem>ChangeProperty</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XSetStandardProperties</function></entry>
-	<entry><systemitem>ChangeProperty</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XSetState</function></entry>
-	<entry><systemitem>ChangeGC</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XSetStipple</function></entry>
-	<entry><systemitem>ChangeGC</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XSetSubwindowMode</function></entry>
-	<entry><systemitem>ChangeGC</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XSetTextProperty</function></entry>
-	<entry><systemitem>ChangeProperty</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XSetTile</function></entry>
-	<entry><systemitem>ChangeGC</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XSetTransientForHint</function></entry>
-	<entry><systemitem>ChangeProperty</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XSetTSOrigin</function></entry>
-	<entry><systemitem>ChangeGC</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XSetWMClientMachine</function></entry>
-	<entry><systemitem>ChangeProperty</systemitem></entry>
-      </row>
-      <row>
-	<entry morerows="1"><function>XSetWMColormapWindows</function></entry>
-	<entry><systemitem>ChangeProperty</systemitem></entry>
-      </row>
-      <row>
-
-	<entry><systemitem>InternAtom</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XSetWMHints</function></entry>
-	<entry><systemitem>ChangeProperty</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XSetWMIconName</function></entry>
-	<entry><systemitem>ChangeProperty</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XSetWMName</function></entry>
-	<entry><systemitem>ChangeProperty</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XSetWMNormalHints</function></entry>
-	<entry><systemitem>ChangeProperty</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XSetWMProperties</function></entry>
-	<entry><systemitem>ChangeProperty</systemitem></entry>
-      </row>
-      <row>
-	<entry morerows="1"><function>XSetWMProtocols</function></entry>
-	<entry><systemitem>ChangeProperty</systemitem></entry>
-      </row>
-      <row>
-
-	<entry><systemitem>InternAtom</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XSetWMSizeHints</function></entry>
-	<entry><systemitem>ChangeProperty</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XSetWindowBackground</function></entry>
-	<entry><systemitem>ChangeWindowAttributes</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XSetWindowBackgroundPixmap</function></entry>
-	<entry><systemitem>ChangeWindowAttributes</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XSetWindowBorder</function></entry>
-	<entry><systemitem>ChangeWindowAttributes</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XSetWindowBorderPixmap</function></entry>
-	<entry><systemitem>ChangeWindowAttributes</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XSetWindowBorderWidth</function></entry>
-	<entry><systemitem>ConfigureWindow</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XSetWindowColormap</function></entry>
-	<entry><systemitem>ChangeWindowAttributes</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XSetZoomHints</function></entry>
-	<entry><systemitem>ChangeProperty</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XStoreBuffer</function></entry>
-	<entry><systemitem>ChangeProperty</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XStoreBytes</function></entry>
-	<entry><systemitem>ChangeProperty</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XStoreColor</function></entry>
-	<entry><systemitem>StoreColors</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XStoreColors</function></entry>
-	<entry><systemitem>StoreColors</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XStoreName</function></entry>
-	<entry><systemitem>ChangeProperty</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XStoreNamedColor</function></entry>
-	<entry><systemitem>StoreNamedColor</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XSync</function></entry>
-	<entry><systemitem>GetInputFocus</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XSynchronize</function></entry>
-	<entry><systemitem>GetInputFocus</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XTranslateCoordinates</function></entry>
-	<entry><systemitem>TranslateCoordinates</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XUndefineCursor</function></entry>
-	<entry><systemitem>ChangeWindowAttributes</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XUngrabButton</function></entry>
-	<entry><systemitem>UngrabButton</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XUngrabKey</function></entry>
-	<entry><systemitem>UngrabKey</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XUngrabKeyboard</function></entry>
-	<entry><systemitem>UngrabKeyboard</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XUngrabPointer</function></entry>
-	<entry><systemitem>UngrabPointer</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XUngrabServer</function></entry>
-	<entry><systemitem>UngrabServer</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XUninstallColormap</function></entry>
-	<entry><systemitem>UninstallColormap</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XUnloadFont</function></entry>
-	<entry><systemitem>CloseFont</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XUnmapSubwindows</function></entry>
-	<entry><systemitem>UnmapSubwindows</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XUnmapWindow</function></entry>
-	<entry><systemitem>UnmapWindow</systemitem></entry>
-      </row>
-      <row>
-	<entry><function>XWarpPointer</function></entry>
-	<entry><systemitem>WarpPointer</systemitem></entry>
-      </row>
-      <row>
-	<entry morerows="1"><function>XWithdrawWindow</function></entry>
-	<entry><systemitem>SendEvent</systemitem></entry>
-      </row>
-      <row>
-
-	<entry><systemitem>UnmapWindow</systemitem></entry>
-      </row>
-    </tbody>
-  </tgroup>
-</table>
-<para>
-The following table lists each X protocol request (in alphabetical
-order) and the Xlib functions that reference it.
-</para>
-<table>
-  <title>Xlib functions which use each Protocol Request</title>
-  <tgroup cols="2">
-    <thead>
-      <row>
-	<entry>Protocol Request</entry>
-	<entry>Xlib Function</entry>
-      </row>
-    </thead>
-    <tbody>
-      <row>
-	<entry><systemitem>AllocColor</systemitem></entry>
-	<entry><function>XAllocColor</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>AllocColorCells</systemitem></entry>
-	<entry><function>XAllocColorCells</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>AllocColorPlanes</systemitem></entry>
-	<entry><function>XAllocColorPlanes</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>AllocNamedColor</systemitem></entry>
-	<entry><function>XAllocNamedColor</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>AllowEvents</systemitem></entry>
-	<entry><function>XAllowEvents</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>Bell</systemitem></entry>
-	<entry><function>XBell</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>ChangeActivePointerGrab</systemitem></entry>
-	<entry><function>XChangeActivePointerGrab</function></entry>
-      </row>
-      <row>
-	<entry morerows="17"><systemitem>ChangeGC</systemitem></entry>
-	<entry><function>XChangeGC</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XSetArcMode</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XSetBackground</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XSetClipMask</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XSetClipOrigin</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XSetFillRule</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XSetFillStyle</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XSetFont</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XSetForeground</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XSetFunction</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XSetGraphicsExposures</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XSetLineAttributes</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XSetPlaneMask</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XSetState</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XSetStipple</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XSetSubwindowMode</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XSetTile</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XSetTSOrigin</function></entry>
-      </row>
-      <row>
-	<entry morerows="3"><systemitem>ChangeHosts</systemitem></entry>
-	<entry><function>XAddHost</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XAddHosts</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XRemoveHost</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XRemoveHosts</function></entry>
-      </row>
-      <row>
-	<entry morerows="2"><systemitem>ChangeKeyboardControl</systemitem></entry>
-	<entry><function>XAutoRepeatOff</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XAutoRepeatOn</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XChangeKeyboardControl</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>ChangeKeyboardMapping</systemitem></entry>
-	<entry><function>XChangeKeyboardMapping</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>ChangePointerControl</systemitem></entry>
-	<entry><function>XChangePointerControl</function></entry>
-      </row>
-      <row>
-	<entry morerows="23"><systemitem>ChangeProperty</systemitem></entry>
-	<entry><function>XChangeProperty</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XSetClassHint</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XSetCommand</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XSetIconName</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XSetIconSizes</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XSetNormalHints</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XSetRGBColormaps</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XSetSizeHints</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XSetStandardProperties</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XSetTextProperty</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XSetTransientForHint</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XSetWMClientMachine</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XSetWMColormapWindows</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XSetWMHints</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XSetWMIconName</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XSetWMName</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XSetWMNormalHints</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XSetWMProperties</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XSetWMProtocols</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XSetWMSizeHints</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XSetZoomHints</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XStoreBuffer</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XStoreBytes</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XStoreName</function></entry>
-      </row>
-      <row>
-	<entry morerows="2"><systemitem>ChangeSaveSet</systemitem></entry>
-	<entry><function>XAddToSaveSet</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XChangeSaveSet</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XRemoveFromSaveSet</function></entry>
-      </row>
-      <row>
-	<entry morerows="8"><systemitem>ChangeWindowAttributes</systemitem></entry>
-	<entry><function>XChangeWindowAttributes</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XDefineCursor</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XSelectInput</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XSetWindowBackground</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XSetWindowBackgroundPixmap</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XSetWindowBorder</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XSetWindowBorderPixmap</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XSetWindowColormap</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XUndefineCursor</function></entry>
-      </row>
-      <row>
-	<entry morerows="2"><systemitem>CirculateWindow</systemitem></entry>
-	<entry><function>XCirculateSubwindowsDown</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XCirculateSubwindowsUp</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XCirculateSubwindows</function></entry>
-      </row>
-      <row>
-	<entry morerows="1"><systemitem>ClearArea</systemitem></entry>
-	<entry><function>XClearArea</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XClearWindow</function></entry>
-      </row>
-      <row>
-	<entry morerows="1"><systemitem>CloseFont</systemitem></entry>
-	<entry><function>XFreeFont</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XUnloadFont</function></entry>
-      </row>
-      <row>
-	<entry morerows="9"><systemitem>ConfigureWindow</systemitem></entry>
-	<entry><function>XConfigureWindow</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XLowerWindow</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XMapRaised</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XMoveResizeWindow</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XMoveWindow</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XRaiseWindow</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XReconfigureWMWindow</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XResizeWindow</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XRestackWindows</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XSetWindowBorderWidth</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>ConvertSelection</systemitem></entry>
-	<entry><function>XConvertSelection</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>CopyArea</systemitem></entry>
-	<entry><function>XCopyArea</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>CopyColormapAndFree</systemitem></entry>
-	<entry><function>XCopyColormapAndFree</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>CopyGC</systemitem></entry>
-	<entry><function>XCopyGC</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>CopyPlane</systemitem></entry>
-	<entry><function>XCopyPlane</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>CreateColormap</systemitem></entry>
-	<entry><function>XCreateColormap</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>CreateCursor</systemitem></entry>
-	<entry><function>XCreatePixmapCursor</function></entry>
-      </row>
-      <row>
-	<entry morerows="4"><systemitem>CreateGC</systemitem></entry>
-	<entry><function>XCreateGC</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XCreateBitmapFromData</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XCreatePixmapFromData</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XOpenDisplay</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XReadBitmapFile</function></entry>
-      </row>
-      <row>
-	<entry morerows="1"><systemitem>CreateGlyphCursor</systemitem></entry>
-	<entry><function>XCreateFontCursor</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XCreateGlyphCursor</function></entry>
-      </row>
-      <row>
-	<entry morerows="3"><systemitem>CreatePixmap</systemitem></entry>
-	<entry><function>XCreatePixmap</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XCreateBitmapFromData</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XCreatePixmapFromData</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XReadBitmapFile</function></entry>
-      </row>
-      <row>
-	<entry morerows="1"><systemitem>CreateWindow</systemitem></entry>
-	<entry><function>XCreateSimpleWindow</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XCreateWindow</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>DeleteProperty</systemitem></entry>
-	<entry><function>XDeleteProperty</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>DestroySubwindows</systemitem></entry>
-	<entry><function>XDestroySubwindows</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>DestroyWindow</systemitem></entry>
-	<entry><function>XDestroyWindow</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>FillPoly</systemitem></entry>
-	<entry><function>XFillPolygon</function></entry>
-      </row>
-      <row>
-	<entry morerows="2"><systemitem>ForceScreenSaver</systemitem></entry>
-	<entry><function>XActivateScreenSaver</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XForceScreenSaver</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XResetScreenSaver</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>FreeColormap</systemitem></entry>
-	<entry><function>XFreeColormap</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>FreeColors</systemitem></entry>
-	<entry><function>XFreeColors</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>FreeCursor</systemitem></entry>
-	<entry><function>XFreeCursor</function></entry>
-      </row>
-      <row>
-	<entry morerows="3"><systemitem>FreeGC</systemitem></entry>
-	<entry><function>XFreeGC</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XCreateBitmapFromData</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XCreatePixmapFromData</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XReadBitmapFile</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>FreePixmap</systemitem></entry>
-	<entry><function>XFreePixmap</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>GetAtomName</systemitem></entry>
-	<entry><function>XGetAtomName</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>GetFontPath</systemitem></entry>
-	<entry><function>XGetFontPath</function></entry>
-      </row>
-      <row>
-	<entry morerows="1"><systemitem>GetGeometry</systemitem></entry>
-	<entry><function>XGetGeometry</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XGetWindowAttributes</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>GetImage</systemitem></entry>
-	<entry><function>XGetImage</function></entry>
-      </row>
-      <row>
-	<entry morerows="2"><systemitem>GetInputFocus</systemitem></entry>
-	<entry><function>XGetInputFocus</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XSync</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XSynchronize</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>GetKeyboardControl</systemitem></entry>
-	<entry><function>XGetKeyboardControl</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>GetKeyboardMapping</systemitem></entry>
-	<entry><function>XGetKeyboardMapping</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>GetModifierMapping</systemitem></entry>
-	<entry><function>XGetModifierMapping</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>GetMotionEvents</systemitem></entry>
-	<entry><function>XGetMotionEvents</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>GetPointerControl</systemitem></entry>
-	<entry><function>XGetPointerControl</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>GetPointerMapping</systemitem></entry>
-	<entry><function>XGetPointerMapping</function></entry>
-      </row>
-      <row>
-	<entry morerows="19"><systemitem>GetProperty</systemitem></entry>
-	<entry><function>XFetchBytes</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XFetchName</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XGetClassHint</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XGetIconName</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XGetIconSizes</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XGetNormalHints</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XGetRGBColormaps</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XGetSizeHints</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XGetTextProperty</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XGetTransientForHint</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XGetWMClientMachine</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XGetWMColormapWindows</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XGetWMHints</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XGetWMIconName</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XGetWMName</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XGetWMNormalHints</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XGetWMProtocols</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XGetWMSizeHints</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XGetWindowProperty</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XGetZoomHints</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>GetSelectionOwner</systemitem></entry>
-	<entry><function>XGetSelectionOwner</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>GetWindowAttributes</systemitem></entry>
-	<entry><function>XGetWindowAttributes</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>GrabButton</systemitem></entry>
-	<entry><function>XGrabButton</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>GrabKey</systemitem></entry>
-	<entry><function>XGrabKey</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>GrabKeyboard</systemitem></entry>
-	<entry><function>XGrabKeyboard</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>GrabPointer</systemitem></entry>
-	<entry><function>XGrabPointer</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>GrabServer</systemitem></entry>
-	<entry><function>XGrabServer</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>ImageText8</systemitem></entry>
-	<entry><function>XDrawImageString</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>ImageText16</systemitem></entry>
-	<entry><function>XDrawImageString16</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>InstallColormap</systemitem></entry>
-	<entry><function>XInstallColormap</function></entry>
-      </row>
-      <row>
-	<entry morerows="5"><systemitem>InternAtom</systemitem></entry>
-	<entry><function>XGetWMColormapWindows</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XGetWMProtocols</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XIconifyWindow</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XInternAtom</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XSetWMColormapWindows</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XSetWMProtocols</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>KillClient</systemitem></entry>
-	<entry><function>XKillClient</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>ListExtensions</systemitem></entry>
-	<entry><function>XListExtensions</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>ListFonts</systemitem></entry>
-	<entry><function>XListFonts</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>ListFontsWithInfo</systemitem></entry>
-	<entry><function>XListFontsWithInfo</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>ListHosts</systemitem></entry>
-	<entry><function>XListHosts</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>ListInstalledColormaps</systemitem></entry>
-	<entry><function>XListInstalledColormaps</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>ListProperties</systemitem></entry>
-	<entry><function>XListProperties</function></entry>
-      </row>
-      <row>
-	<entry morerows="1"><systemitem>LookupColor</systemitem></entry>
-	<entry><function>XLookupColor</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XParseColor</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>MapSubwindows</systemitem></entry>
-	<entry><function>XMapSubwindows</function></entry>
-      </row>
-      <row>
-	<entry morerows="1"><systemitem>MapWindow</systemitem></entry>
-	<entry><function>XMapRaised</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XMapWindow</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>NoOperation</systemitem></entry>
-	<entry><function>XNoOp</function></entry>
-      </row>
-      <row>
-	<entry morerows="1"><systemitem>OpenFont</systemitem></entry>
-	<entry><function>XLoadFont</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XLoadQueryFont</function></entry>
-      </row>
-      <row>
-	<entry morerows="1"><systemitem>PolyArc</systemitem></entry>
-	<entry><function>XDrawArc</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XDrawArcs</function></entry>
-      </row>
-      <row>
-	<entry morerows="1"><systemitem>PolyFillArc</systemitem></entry>
-	<entry><function>XFillArc</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XFillArcs</function></entry>
-      </row>
-      <row>
-	<entry morerows="1"><systemitem>PolyFillRectangle</systemitem></entry>
-	<entry><function>XFillRectangle</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XFillRectangles</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>PolyLine</systemitem></entry>
-	<entry><function>XDrawLines</function></entry>
-      </row>
-      <row>
-	<entry morerows="1"><systemitem>PolyPoint</systemitem></entry>
-	<entry><function>XDrawPoint</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XDrawPoints</function></entry>
-      </row>
-      <row>
-	<entry morerows="1"><systemitem>PolyRectangle</systemitem></entry>
-	<entry><function>XDrawRectangle</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XDrawRectangles</function></entry>
-      </row>
-      <row>
-	<entry morerows="1"><systemitem>PolySegment</systemitem></entry>
-	<entry><function>XDrawLine</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XDrawSegments</function></entry>
-      </row>
-      <row>
-	<entry morerows="1"><systemitem>PolyText8</systemitem></entry>
-	<entry><function>XDrawString</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XDrawText</function></entry>
-      </row>
-      <row>
-	<entry morerows="1"><systemitem>PolyText16</systemitem></entry>
-	<entry><function>XDrawString16</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XDrawText16</function></entry>
-      </row>
-      <row>
-	<entry morerows="3"><systemitem>PutImage</systemitem></entry>
-	<entry><function>XPutImage</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XCreateBitmapFromData</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XCreatePixmapFromData</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XReadBitmapFile</function></entry>
-      </row>
-      <row>
-	<entry morerows="3"><systemitem>QueryBestSize</systemitem></entry>
-	<entry><function>XQueryBestCursor</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XQueryBestSize</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XQueryBestStipple</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XQueryBestTile</function></entry>
-      </row>
-      <row>
-	<entry morerows="1"><systemitem>QueryColors</systemitem></entry>
-	<entry><function>XQueryColor</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XQueryColors</function></entry>
-      </row>
-      <row>
-	<entry morerows="1"><systemitem>QueryExtension</systemitem></entry>
-	<entry><function>XInitExtension</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XQueryExtension</function></entry>
-      </row>
-      <row>
-	<entry morerows="1"><systemitem>QueryFont</systemitem></entry>
-	<entry><function>XLoadQueryFont</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XQueryFont</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>QueryKeymap</systemitem></entry>
-	<entry><function>XQueryKeymap</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>QueryPointer</systemitem></entry>
-	<entry><function>XQueryPointer</function></entry>
-      </row>
-      <row>
-	<entry morerows="1"><systemitem>QueryTextExtents</systemitem></entry>
-	<entry><function>XQueryTextExtents</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XQueryTextExtents16</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>QueryTree</systemitem></entry>
-	<entry><function>XQueryTree</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>RecolorCursor</systemitem></entry>
-	<entry><function>XRecolorCursor</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>ReparentWindow</systemitem></entry>
-	<entry><function>XReparentWindow</function></entry>
-      </row>
-      <row>
-	<entry morerows="1"><systemitem>RotateProperties</systemitem></entry>
-	<entry><function>XRotateBuffers</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XRotateWindowProperties</function></entry>
-      </row>
-      <row>
-	<entry morerows="3"><systemitem>SendEvent</systemitem></entry>
-	<entry><function>XIconifyWindow</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XReconfigureWMWindow</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XSendEvent</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XWithdrawWindow</function></entry>
-      </row>
-      <row>
-	<entry morerows="2"><systemitem>SetAccessControl</systemitem></entry>
-	<entry><function>XDisableAccessControl</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XEnableAccessControl</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XSetAccessControl</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>SetClipRectangles</systemitem></entry>
-	<entry><function>XSetClipRectangles</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>SetCloseDownMode</systemitem></entry>
-	<entry><function>XSetCloseDownMode</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>SetDashes</systemitem></entry>
-	<entry><function>XSetDashes</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>SetFontPath</systemitem></entry>
-	<entry><function>XSetFontPath</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>SetInputFocus</systemitem></entry>
-	<entry><function>XSetInputFocus</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>SetModifierMapping</systemitem></entry>
-	<entry><function>XSetModifierMapping</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>SetPointerMapping</systemitem></entry>
-	<entry><function>XSetPointerMapping</function></entry>
-      </row>
-      <row>
-	<entry morerows="1"><systemitem>SetScreenSaver</systemitem></entry>
-	<entry><function>XGetScreenSaver</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XSetScreenSaver</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>SetSelectionOwner</systemitem></entry>
-	<entry><function>XSetSelectionOwner</function></entry>
-      </row>
-      <row>
-	<entry morerows="1"><systemitem>StoreColors</systemitem></entry>
-	<entry><function>XStoreColor</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XStoreColors</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>StoreNamedColor</systemitem></entry>
-	<entry><function>XStoreNamedColor</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>TranslateCoordinates</systemitem></entry>
-	<entry><function>XTranslateCoordinates</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>UngrabButton</systemitem></entry>
-	<entry><function>XUngrabButton</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>UngrabKey</systemitem></entry>
-	<entry><function>XUngrabKey</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>UngrabKeyboard</systemitem></entry>
-	<entry><function>XUngrabKeyboard</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>UngrabPointer</systemitem></entry>
-	<entry><function>XUngrabPointer</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>UngrabServer</systemitem></entry>
-	<entry><function>XUngrabServer</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>UninstallColormap</systemitem></entry>
-	<entry><function>XUninstallColormap</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>UnmapSubwindows</systemitem></entry>
-	<entry><function>XUnmapSubWindows</function></entry>
-      </row>
-      <row>
-	<entry morerows="1"><systemitem>UnmapWindow</systemitem></entry>
-	<entry><function>XUnmapWindow</function></entry>
-      </row>
-      <row>
-
-	<entry><function>XWithdrawWindow</function></entry>
-      </row>
-      <row>
-	<entry><systemitem>WarpPointer</systemitem></entry>
-	<entry><function>XWarpPointer</function></entry>
-      </row>
-    </tbody>
-  </tgroup>
-</table>
-</appendix>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+	  "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
+<appendix id="xlib_functions_and_protocol_requests">
+<title>Xlib Functions and Protocol Requests</title>
+<para>
+This appendix provides two tables that relate to Xlib functions
+and the X protocol.
+The following table lists each Xlib function (in alphabetical order)
+and the corresponding protocol request that it generates.
+</para>
+<table>
+  <title>Protocol requests made by each Xlib function</title>
+  <tgroup cols="2">
+    <thead>
+      <row>
+	<entry align='left'>Xlib Function</entry>
+	<entry align='left'>Protocol Request</entry>
+      </row>
+    </thead>
+    <tbody>
+      <row>
+	<entry><function>XActivateScreenSaver</function></entry>
+	<entry><systemitem>ForceScreenSaver</systemitem></entry></row>
+      <row>
+	<entry><function>XAddHost</function></entry>
+	<entry><systemitem>ChangeHosts</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XAddHosts</function></entry>
+	<entry><systemitem>ChangeHosts</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XAddToSaveSet</function></entry>
+	<entry><systemitem>ChangeSaveSet</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XAllocColor</function></entry>
+	<entry><systemitem>AllocColor</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XAllocColorCells</function></entry>
+	<entry><systemitem>AllocColorCells</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XAllocColorPlanes</function></entry>
+	<entry><systemitem>AllocColorPlanes</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XAllocNamedColor</function></entry>
+	<entry><systemitem>AllocNamedColor</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XAllowEvents</function></entry>
+	<entry><systemitem>AllowEvents</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XAutoRepeatOff</function></entry>
+	<entry><systemitem>ChangeKeyboardControl</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XAutoRepeatOn</function></entry>
+	<entry><systemitem>ChangeKeyboardControl</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XBell</function></entry>
+	<entry><systemitem>Bell</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XChangeActivePointerGrab</function></entry>
+	<entry><systemitem>ChangeActivePointerGrab</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XChangeGC</function></entry>
+	<entry><systemitem>ChangeGC</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XChangeKeyboardControl</function></entry>
+	<entry><systemitem>ChangeKeyboardControl</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XChangeKeyboardMapping</function></entry>
+	<entry><systemitem>ChangeKeyboardMapping</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XChangePointerControl</function></entry>
+	<entry><systemitem>ChangePointerControl</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XChangeProperty</function></entry>
+	<entry><systemitem>ChangeProperty</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XChangeSaveSet</function></entry>
+	<entry><systemitem>ChangeSaveSet</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XChangeWindowAttributes</function></entry>
+	<entry><systemitem>ChangeWindowAttributes</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XCirculateSubwindows</function></entry>
+	<entry><systemitem>CirculateWindow</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XCirculateSubwindowsDown</function></entry>
+	<entry><systemitem>CirculateWindow</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XCirculateSubwindowsUp</function></entry>
+	<entry><systemitem>CirculateWindow</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XClearArea</function></entry>
+	<entry><systemitem>ClearArea</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XClearWindow</function></entry>
+	<entry><systemitem>ClearArea</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XConfigureWindow</function></entry>
+	<entry><systemitem>ConfigureWindow</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XConvertSelection</function></entry>
+	<entry><systemitem>ConvertSelection</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XCopyArea</function></entry>
+	<entry><systemitem>CopyArea</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XCopyColormapAndFree</function></entry>
+	<entry><systemitem>CopyColormapAndFree</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XCopyGC</function></entry>
+	<entry><systemitem>CopyGC</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XCopyPlane</function></entry>
+	<entry><systemitem>CopyPlane</systemitem></entry>
+      </row>
+      <row>
+	<entry morerows="3"><function>XCreateBitmapFromData</function></entry>
+	<entry><systemitem>CreateGC</systemitem></entry>
+      </row>
+      <row>
+
+	<entry><systemitem>CreatePixmap</systemitem></entry>
+      </row>
+      <row>
+
+	<entry><systemitem>FreeGC</systemitem></entry>
+      </row>
+      <row>
+
+	<entry><systemitem>PutImage</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XCreateColormap</function></entry>
+	<entry><systemitem>CreateColormap</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XCreateFontCursor</function></entry>
+	<entry><systemitem>CreateGlyphCursor</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XCreateGC</function></entry>
+	<entry><systemitem>CreateGC</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XCreateGlyphCursor</function></entry>
+	<entry><systemitem>CreateGlyphCursor</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XCreatePixmap</function></entry>
+	<entry><systemitem>CreatePixmap</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XCreatePixmapCursor</function></entry>
+	<entry><systemitem>CreateCursor</systemitem></entry>
+      </row>
+      <row>
+	<entry morerows="3"><function>XCreatePixmapFromData</function></entry>
+	<entry><systemitem>CreateGC</systemitem></entry>
+      </row>
+      <row>
+
+	<entry><systemitem>CreatePixmap</systemitem></entry>
+      </row>
+      <row>
+
+	<entry><systemitem>FreeGC</systemitem></entry>
+      </row>
+      <row>
+
+	<entry><systemitem>PutImage</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XCreateSimpleWindow</function></entry>
+	<entry><systemitem>CreateWindow</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XCreateWindow</function></entry>
+	<entry><systemitem>CreateWindow</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XDefineCursor</function></entry>
+	<entry><systemitem>ChangeWindowAttributes</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XDeleteProperty</function></entry>
+	<entry><systemitem>DeleteProperty</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XDestroySubwindows</function></entry>
+	<entry><systemitem>DestroySubwindows</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XDestroyWindow</function></entry>
+	<entry><systemitem>DestroyWindow</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XDisableAccessControl</function></entry>
+	<entry><systemitem>SetAccessControl</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XDrawArc</function></entry>
+	<entry><systemitem>PolyArc</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XDrawArcs</function></entry>
+	<entry><systemitem>PolyArc</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XDrawImageString</function></entry>
+	<entry><systemitem>ImageText8</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XDrawImageString16</function></entry>
+	<entry><systemitem>ImageText16</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XDrawLine</function></entry>
+	<entry><systemitem>PolySegment</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XDrawLines</function></entry>
+	<entry><systemitem>PolyLine</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XDrawPoint</function></entry>
+	<entry><systemitem>PolyPoint</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XDrawPoints</function></entry>
+	<entry><systemitem>PolyPoint</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XDrawRectangle</function></entry>
+	<entry><systemitem>PolyRectangle</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XDrawRectangles</function></entry>
+	<entry><systemitem>PolyRectangle</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XDrawSegments</function></entry>
+	<entry><systemitem>PolySegment</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XDrawString</function></entry>
+	<entry><systemitem>PolyText8</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XDrawString16</function></entry>
+	<entry><systemitem>PolyText16</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XDrawText</function></entry>
+	<entry><systemitem>PolyText8</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XDrawText16</function></entry>
+	<entry><systemitem>PolyText16</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XEnableAccessControl</function></entry>
+	<entry><systemitem>SetAccessControl</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XFetchBytes</function></entry>
+	<entry><systemitem>GetProperty</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XFetchName</function></entry>
+	<entry><systemitem>GetProperty</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XFillArc</function></entry>
+	<entry><systemitem>PolyFillArc</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XFillArcs</function></entry>
+	<entry><systemitem>PolyFillArc</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XFillPolygon</function></entry>
+	<entry><systemitem>FillPoly</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XFillRectangle</function></entry>
+	<entry><systemitem>PolyFillRectangle</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XFillRectangles</function></entry>
+	<entry><systemitem>PolyFillRectangle</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XForceScreenSaver</function></entry>
+	<entry><systemitem>ForceScreenSaver</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XFreeColormap</function></entry>
+	<entry><systemitem>FreeColormap</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XFreeColors</function></entry>
+	<entry><systemitem>FreeColors</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XFreeCursor</function></entry>
+	<entry><systemitem>FreeCursor</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XFreeFont</function></entry>
+	<entry><systemitem>CloseFont</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XFreeGC</function></entry>
+	<entry><systemitem>FreeGC</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XFreePixmap</function></entry>
+	<entry><systemitem>FreePixmap</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XGetAtomName</function></entry>
+	<entry><systemitem>GetAtomName</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XGetClassHint</function></entry>
+	<entry><systemitem>GetProperty</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XGetFontPath</function></entry>
+	<entry><systemitem>GetFontPath</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XGetGeometry</function></entry>
+	<entry><systemitem>GetGeometry</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XGetIconName</function></entry>
+	<entry><systemitem>GetProperty</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XGetIconSizes</function></entry>
+	<entry><systemitem>GetProperty</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XGetImage</function></entry>
+	<entry><systemitem>GetImage</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XGetInputFocus</function></entry>
+	<entry><systemitem>GetInputFocus</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XGetKeyboardControl</function></entry>
+	<entry><systemitem>GetKeyboardControl</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XGetKeyboardMapping</function></entry>
+	<entry><systemitem>GetKeyboardMapping</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XGetModifierMapping</function></entry>
+	<entry><systemitem>GetModifierMapping</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XGetMotionEvents</function></entry>
+	<entry><systemitem>GetMotionEvents</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XGetNormalHints</function></entry>
+	<entry><systemitem>GetProperty</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XGetPointerControl</function></entry>
+	<entry><systemitem>GetPointerControl</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XGetPointerMapping</function></entry>
+	<entry><systemitem>GetPointerMapping</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XGetRGBColormaps</function></entry>
+	<entry><systemitem>GetProperty</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XGetScreenSaver</function></entry>
+	<entry><systemitem>GetScreenSaver</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XGetSelectionOwner</function></entry>
+	<entry><systemitem>GetSelectionOwner</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XGetSizeHints</function></entry>
+	<entry><systemitem>GetProperty</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XGetTextProperty</function></entry>
+	<entry><systemitem>GetProperty</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XGetTransientForHint</function></entry>
+	<entry><systemitem>GetProperty</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XGetWMClientMachine</function></entry>
+	<entry><systemitem>GetProperty</systemitem></entry>
+      </row>
+      <row>
+	<entry morerows="1"><function>XGetWMColormapWindows</function></entry>
+	<entry><systemitem>GetProperty</systemitem></entry>
+      </row>
+      <row>
+
+	<entry><systemitem>InternAtom</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XGetWMHints</function></entry>
+	<entry><systemitem>GetProperty</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XGetWMIconName</function></entry>
+	<entry><systemitem>GetProperty</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XGetWMName</function></entry>
+	<entry><systemitem>GetProperty</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XGetWMNormalHints</function></entry>
+	<entry><systemitem>GetProperty</systemitem></entry>
+      </row>
+      <row>
+	<entry morerows="1"><function>XGetWMProtocols</function></entry>
+	<entry><systemitem>GetProperty</systemitem></entry>
+      </row>
+      <row>
+
+	<entry><systemitem>InternAtom</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XGetWMSizeHints</function></entry>
+	<entry><systemitem>GetProperty</systemitem></entry>
+      </row>
+      <row>
+	<entry morerows="1"><function>XGetWindowAttributes</function></entry>
+	<entry><systemitem>GetWindowAttributes</systemitem></entry>
+      </row>
+      <row>
+
+	<entry><systemitem>GetGeometry</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XGetWindowProperty</function></entry>
+	<entry><systemitem>GetProperty</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XGetZoomHints</function></entry>
+	<entry><systemitem>GetProperty</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XGrabButton</function></entry>
+	<entry><systemitem>GrabButton</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XGrabKey</function></entry>
+	<entry><systemitem>GrabKey</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XGrabKeyboard</function></entry>
+	<entry><systemitem>GrabKeyboard</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XGrabPointer</function></entry>
+	<entry><systemitem>GrabPointer</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XGrabServer</function></entry>
+	<entry><systemitem>GrabServer</systemitem></entry>
+      </row>
+      <row>
+	<entry morerows="1"><function>XIconifyWindow</function></entry>
+	<entry><systemitem>InternAtom</systemitem></entry>
+      </row>
+      <row>
+
+	<entry><systemitem>SendEvent</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XInitExtension</function></entry>
+	<entry><systemitem>QueryExtension</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XInstallColormap</function></entry>
+	<entry><systemitem>InstallColormap</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XInternAtom</function></entry>
+	<entry><systemitem>InternAtom</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XKillClient</function></entry>
+	<entry><systemitem>KillClient</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XListExtensions</function></entry>
+	<entry><systemitem>ListExtensions</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XListFonts</function></entry>
+	<entry><systemitem>ListFonts</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XListFontsWithInfo</function></entry>
+	<entry><systemitem>ListFontsWithInfo</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XListHosts</function></entry>
+	<entry><systemitem>ListHosts</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XListInstalledColormaps</function></entry>
+	<entry><systemitem>ListInstalledColormaps</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XListProperties</function></entry>
+	<entry><systemitem>ListProperties</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XLoadFont</function></entry>
+	<entry><systemitem>OpenFont</systemitem></entry>
+      </row>
+      <row>
+	<entry morerows="1"><function>XLoadQueryFont</function></entry>
+	<entry><systemitem>OpenFont</systemitem></entry>
+      </row>
+      <row>
+
+	<entry><systemitem>QueryFont</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XLookupColor</function></entry>
+	<entry><systemitem>LookupColor</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XLowerWindow</function></entry>
+	<entry><systemitem>ConfigureWindow</systemitem></entry>
+      </row>
+      <row>
+	<entry morerows="1"><function>XMapRaised</function></entry>
+	<entry><systemitem>ConfigureWindow</systemitem></entry>
+      </row>
+      <row>
+
+	<entry><systemitem>MapWindow</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XMapSubwindows</function></entry>
+	<entry><systemitem>MapSubwindows</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XMapWindow</function></entry>
+	<entry><systemitem>MapWindow</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XMoveResizeWindow</function></entry>
+	<entry><systemitem>ConfigureWindow</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XMoveWindow</function></entry>
+	<entry><systemitem>ConfigureWindow</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XNoOp</function></entry>
+	<entry><systemitem>NoOperation</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XOpenDisplay</function></entry>
+	<entry><systemitem>CreateGC</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XParseColor</function></entry>
+	<entry><systemitem>LookupColor</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XPutImage</function></entry>
+	<entry><systemitem>PutImage</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XQueryBestCursor</function></entry>
+	<entry><systemitem>QueryBestSize</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XQueryBestSize</function></entry>
+	<entry><systemitem>QueryBestSize</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XQueryBestStipple</function></entry>
+	<entry><systemitem>QueryBestSize</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XQueryBestTile</function></entry>
+	<entry><systemitem>QueryBestSize</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XQueryColor</function></entry>
+	<entry><systemitem>QueryColors</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XQueryColors</function></entry>
+	<entry><systemitem>QueryColors</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XQueryExtension</function></entry>
+	<entry><systemitem>QueryExtension</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XQueryFont</function></entry>
+	<entry><systemitem>QueryFont</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XQueryKeymap</function></entry>
+	<entry><systemitem>QueryKeymap</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XQueryPointer</function></entry>
+	<entry><systemitem>QueryPointer</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XQueryTextExtents</function></entry>
+	<entry><systemitem>QueryTextExtents</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XQueryTextExtents16</function></entry>
+	<entry><systemitem>QueryTextExtents</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XQueryTree</function></entry>
+	<entry><systemitem>QueryTree</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XRaiseWindow</function></entry>
+	<entry><systemitem>ConfigureWindow</systemitem></entry>
+      </row>
+      <row>
+	<entry morerows="3"><function>XReadBitmapFile</function></entry>
+	<entry><systemitem>CreateGC</systemitem></entry>
+      </row>
+      <row>
+
+	<entry><systemitem>CreatePixmap</systemitem></entry>
+      </row>
+      <row>
+
+	<entry><systemitem>FreeGC</systemitem></entry>
+      </row>
+      <row>
+
+	<entry><systemitem>PutImage</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XRecolorCursor</function></entry>
+	<entry><systemitem>RecolorCursor</systemitem></entry>
+      </row>
+      <row>
+	<entry morerows="1"><function>XReconfigureWMWindow</function></entry>
+	<entry><systemitem>ConfigureWindow</systemitem></entry>
+      </row>
+      <row>
+
+	<entry><systemitem>SendEvent</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XRemoveFromSaveSet</function></entry>
+	<entry><systemitem>ChangeSaveSet</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XRemoveHost</function></entry>
+	<entry><systemitem>ChangeHosts</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XRemoveHosts</function></entry>
+	<entry><systemitem>ChangeHosts</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XReparentWindow</function></entry>
+	<entry><systemitem>ReparentWindow</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XResetScreenSaver</function></entry>
+	<entry><systemitem>ForceScreenSaver</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XResizeWindow</function></entry>
+	<entry><systemitem>ConfigureWindow</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XRestackWindows</function></entry>
+	<entry><systemitem>ConfigureWindow</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XRotateBuffers</function></entry>
+	<entry><systemitem>RotateProperties</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XRotateWindowProperties</function></entry>
+	<entry><systemitem>RotateProperties</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XSelectInput</function></entry>
+	<entry><systemitem>ChangeWindowAttributes</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XSendEvent</function></entry>
+	<entry><systemitem>SendEvent</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XSetAccessControl</function></entry>
+	<entry><systemitem>SetAccessControl</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XSetArcMode</function></entry>
+	<entry><systemitem>ChangeGC</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XSetBackground</function></entry>
+	<entry><systemitem>ChangeGC</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XSetClassHint</function></entry>
+	<entry><systemitem>ChangeProperty</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XSetClipMask</function></entry>
+	<entry><systemitem>ChangeGC</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XSetClipOrigin</function></entry>
+	<entry><systemitem>ChangeGC</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XSetClipRectangles</function></entry>
+	<entry><systemitem>SetClipRectangles</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XSetCloseDownMode</function></entry>
+	<entry><systemitem>SetCloseDownMode</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XSetCommand</function></entry>
+	<entry><systemitem>ChangeProperty</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XSetDashes</function></entry>
+	<entry><systemitem>SetDashes</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XSetFillRule</function></entry>
+	<entry><systemitem>ChangeGC</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XSetFillStyle</function></entry>
+	<entry><systemitem>ChangeGC</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XSetFont</function></entry>
+	<entry><systemitem>ChangeGC</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XSetFontPath</function></entry>
+	<entry><systemitem>SetFontPath</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XSetForeground</function></entry>
+	<entry><systemitem>ChangeGC</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XSetFunction</function></entry>
+	<entry><systemitem>ChangeGC</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XSetGraphicsExposures</function></entry>
+	<entry><systemitem>ChangeGC</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XSetIconName</function></entry>
+	<entry><systemitem>ChangeProperty</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XSetIconSizes</function></entry>
+	<entry><systemitem>ChangeProperty</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XSetInputFocus</function></entry>
+	<entry><systemitem>SetInputFocus</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XSetLineAttributes</function></entry>
+	<entry><systemitem>ChangeGC</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XSetModifierMapping</function></entry>
+	<entry><systemitem>SetModifierMapping</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XSetNormalHints</function></entry>
+	<entry><systemitem>ChangeProperty</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XSetPlaneMask</function></entry>
+	<entry><systemitem>ChangeGC</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XSetPointerMapping</function></entry>
+	<entry><systemitem>SetPointerMapping</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XSetRGBColormaps</function></entry>
+	<entry><systemitem>ChangeProperty</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XSetScreenSaver</function></entry>
+	<entry><systemitem>SetScreenSaver</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XSetSelectionOwner</function></entry>
+	<entry><systemitem>SetSelectionOwner</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XSetSizeHints</function></entry>
+	<entry><systemitem>ChangeProperty</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XSetStandardProperties</function></entry>
+	<entry><systemitem>ChangeProperty</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XSetState</function></entry>
+	<entry><systemitem>ChangeGC</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XSetStipple</function></entry>
+	<entry><systemitem>ChangeGC</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XSetSubwindowMode</function></entry>
+	<entry><systemitem>ChangeGC</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XSetTextProperty</function></entry>
+	<entry><systemitem>ChangeProperty</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XSetTile</function></entry>
+	<entry><systemitem>ChangeGC</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XSetTransientForHint</function></entry>
+	<entry><systemitem>ChangeProperty</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XSetTSOrigin</function></entry>
+	<entry><systemitem>ChangeGC</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XSetWMClientMachine</function></entry>
+	<entry><systemitem>ChangeProperty</systemitem></entry>
+      </row>
+      <row>
+	<entry morerows="1"><function>XSetWMColormapWindows</function></entry>
+	<entry><systemitem>ChangeProperty</systemitem></entry>
+      </row>
+      <row>
+
+	<entry><systemitem>InternAtom</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XSetWMHints</function></entry>
+	<entry><systemitem>ChangeProperty</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XSetWMIconName</function></entry>
+	<entry><systemitem>ChangeProperty</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XSetWMName</function></entry>
+	<entry><systemitem>ChangeProperty</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XSetWMNormalHints</function></entry>
+	<entry><systemitem>ChangeProperty</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XSetWMProperties</function></entry>
+	<entry><systemitem>ChangeProperty</systemitem></entry>
+      </row>
+      <row>
+	<entry morerows="1"><function>XSetWMProtocols</function></entry>
+	<entry><systemitem>ChangeProperty</systemitem></entry>
+      </row>
+      <row>
+
+	<entry><systemitem>InternAtom</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XSetWMSizeHints</function></entry>
+	<entry><systemitem>ChangeProperty</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XSetWindowBackground</function></entry>
+	<entry><systemitem>ChangeWindowAttributes</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XSetWindowBackgroundPixmap</function></entry>
+	<entry><systemitem>ChangeWindowAttributes</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XSetWindowBorder</function></entry>
+	<entry><systemitem>ChangeWindowAttributes</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XSetWindowBorderPixmap</function></entry>
+	<entry><systemitem>ChangeWindowAttributes</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XSetWindowBorderWidth</function></entry>
+	<entry><systemitem>ConfigureWindow</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XSetWindowColormap</function></entry>
+	<entry><systemitem>ChangeWindowAttributes</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XSetZoomHints</function></entry>
+	<entry><systemitem>ChangeProperty</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XStoreBuffer</function></entry>
+	<entry><systemitem>ChangeProperty</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XStoreBytes</function></entry>
+	<entry><systemitem>ChangeProperty</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XStoreColor</function></entry>
+	<entry><systemitem>StoreColors</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XStoreColors</function></entry>
+	<entry><systemitem>StoreColors</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XStoreName</function></entry>
+	<entry><systemitem>ChangeProperty</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XStoreNamedColor</function></entry>
+	<entry><systemitem>StoreNamedColor</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XSync</function></entry>
+	<entry><systemitem>GetInputFocus</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XSynchronize</function></entry>
+	<entry><systemitem>GetInputFocus</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XTranslateCoordinates</function></entry>
+	<entry><systemitem>TranslateCoordinates</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XUndefineCursor</function></entry>
+	<entry><systemitem>ChangeWindowAttributes</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XUngrabButton</function></entry>
+	<entry><systemitem>UngrabButton</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XUngrabKey</function></entry>
+	<entry><systemitem>UngrabKey</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XUngrabKeyboard</function></entry>
+	<entry><systemitem>UngrabKeyboard</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XUngrabPointer</function></entry>
+	<entry><systemitem>UngrabPointer</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XUngrabServer</function></entry>
+	<entry><systemitem>UngrabServer</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XUninstallColormap</function></entry>
+	<entry><systemitem>UninstallColormap</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XUnloadFont</function></entry>
+	<entry><systemitem>CloseFont</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XUnmapSubwindows</function></entry>
+	<entry><systemitem>UnmapSubwindows</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XUnmapWindow</function></entry>
+	<entry><systemitem>UnmapWindow</systemitem></entry>
+      </row>
+      <row>
+	<entry><function>XWarpPointer</function></entry>
+	<entry><systemitem>WarpPointer</systemitem></entry>
+      </row>
+      <row>
+	<entry morerows="1"><function>XWithdrawWindow</function></entry>
+	<entry><systemitem>SendEvent</systemitem></entry>
+      </row>
+      <row>
+
+	<entry><systemitem>UnmapWindow</systemitem></entry>
+      </row>
+    </tbody>
+  </tgroup>
+</table>
+<para>
+The following table lists each X protocol request (in alphabetical
+order) and the Xlib functions that reference it.
+</para>
+<table>
+  <title>Xlib functions which use each Protocol Request</title>
+  <tgroup cols="2">
+    <thead>
+      <row>
+	<entry align='left'>Protocol Request</entry>
+	<entry align='left'>Xlib Function</entry>
+      </row>
+    </thead>
+    <tbody>
+      <row>
+	<entry><systemitem>AllocColor</systemitem></entry>
+	<entry><function>XAllocColor</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>AllocColorCells</systemitem></entry>
+	<entry><function>XAllocColorCells</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>AllocColorPlanes</systemitem></entry>
+	<entry><function>XAllocColorPlanes</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>AllocNamedColor</systemitem></entry>
+	<entry><function>XAllocNamedColor</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>AllowEvents</systemitem></entry>
+	<entry><function>XAllowEvents</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>Bell</systemitem></entry>
+	<entry><function>XBell</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>ChangeActivePointerGrab</systemitem></entry>
+	<entry><function>XChangeActivePointerGrab</function></entry>
+      </row>
+      <row>
+	<entry morerows="17"><systemitem>ChangeGC</systemitem></entry>
+	<entry><function>XChangeGC</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XSetArcMode</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XSetBackground</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XSetClipMask</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XSetClipOrigin</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XSetFillRule</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XSetFillStyle</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XSetFont</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XSetForeground</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XSetFunction</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XSetGraphicsExposures</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XSetLineAttributes</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XSetPlaneMask</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XSetState</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XSetStipple</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XSetSubwindowMode</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XSetTile</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XSetTSOrigin</function></entry>
+      </row>
+      <row>
+	<entry morerows="3"><systemitem>ChangeHosts</systemitem></entry>
+	<entry><function>XAddHost</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XAddHosts</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XRemoveHost</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XRemoveHosts</function></entry>
+      </row>
+      <row>
+	<entry morerows="2"><systemitem>ChangeKeyboardControl</systemitem></entry>
+	<entry><function>XAutoRepeatOff</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XAutoRepeatOn</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XChangeKeyboardControl</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>ChangeKeyboardMapping</systemitem></entry>
+	<entry><function>XChangeKeyboardMapping</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>ChangePointerControl</systemitem></entry>
+	<entry><function>XChangePointerControl</function></entry>
+      </row>
+      <row>
+	<entry morerows="23"><systemitem>ChangeProperty</systemitem></entry>
+	<entry><function>XChangeProperty</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XSetClassHint</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XSetCommand</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XSetIconName</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XSetIconSizes</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XSetNormalHints</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XSetRGBColormaps</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XSetSizeHints</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XSetStandardProperties</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XSetTextProperty</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XSetTransientForHint</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XSetWMClientMachine</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XSetWMColormapWindows</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XSetWMHints</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XSetWMIconName</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XSetWMName</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XSetWMNormalHints</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XSetWMProperties</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XSetWMProtocols</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XSetWMSizeHints</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XSetZoomHints</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XStoreBuffer</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XStoreBytes</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XStoreName</function></entry>
+      </row>
+      <row>
+	<entry morerows="2"><systemitem>ChangeSaveSet</systemitem></entry>
+	<entry><function>XAddToSaveSet</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XChangeSaveSet</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XRemoveFromSaveSet</function></entry>
+      </row>
+      <row>
+	<entry morerows="8"><systemitem>ChangeWindowAttributes</systemitem></entry>
+	<entry><function>XChangeWindowAttributes</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XDefineCursor</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XSelectInput</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XSetWindowBackground</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XSetWindowBackgroundPixmap</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XSetWindowBorder</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XSetWindowBorderPixmap</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XSetWindowColormap</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XUndefineCursor</function></entry>
+      </row>
+      <row>
+	<entry morerows="2"><systemitem>CirculateWindow</systemitem></entry>
+	<entry><function>XCirculateSubwindowsDown</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XCirculateSubwindowsUp</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XCirculateSubwindows</function></entry>
+      </row>
+      <row>
+	<entry morerows="1"><systemitem>ClearArea</systemitem></entry>
+	<entry><function>XClearArea</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XClearWindow</function></entry>
+      </row>
+      <row>
+	<entry morerows="1"><systemitem>CloseFont</systemitem></entry>
+	<entry><function>XFreeFont</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XUnloadFont</function></entry>
+      </row>
+      <row>
+	<entry morerows="9"><systemitem>ConfigureWindow</systemitem></entry>
+	<entry><function>XConfigureWindow</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XLowerWindow</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XMapRaised</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XMoveResizeWindow</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XMoveWindow</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XRaiseWindow</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XReconfigureWMWindow</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XResizeWindow</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XRestackWindows</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XSetWindowBorderWidth</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>ConvertSelection</systemitem></entry>
+	<entry><function>XConvertSelection</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>CopyArea</systemitem></entry>
+	<entry><function>XCopyArea</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>CopyColormapAndFree</systemitem></entry>
+	<entry><function>XCopyColormapAndFree</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>CopyGC</systemitem></entry>
+	<entry><function>XCopyGC</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>CopyPlane</systemitem></entry>
+	<entry><function>XCopyPlane</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>CreateColormap</systemitem></entry>
+	<entry><function>XCreateColormap</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>CreateCursor</systemitem></entry>
+	<entry><function>XCreatePixmapCursor</function></entry>
+      </row>
+      <row>
+	<entry morerows="4"><systemitem>CreateGC</systemitem></entry>
+	<entry><function>XCreateGC</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XCreateBitmapFromData</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XCreatePixmapFromData</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XOpenDisplay</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XReadBitmapFile</function></entry>
+      </row>
+      <row>
+	<entry morerows="1"><systemitem>CreateGlyphCursor</systemitem></entry>
+	<entry><function>XCreateFontCursor</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XCreateGlyphCursor</function></entry>
+      </row>
+      <row>
+	<entry morerows="3"><systemitem>CreatePixmap</systemitem></entry>
+	<entry><function>XCreatePixmap</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XCreateBitmapFromData</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XCreatePixmapFromData</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XReadBitmapFile</function></entry>
+      </row>
+      <row>
+	<entry morerows="1"><systemitem>CreateWindow</systemitem></entry>
+	<entry><function>XCreateSimpleWindow</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XCreateWindow</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>DeleteProperty</systemitem></entry>
+	<entry><function>XDeleteProperty</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>DestroySubwindows</systemitem></entry>
+	<entry><function>XDestroySubwindows</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>DestroyWindow</systemitem></entry>
+	<entry><function>XDestroyWindow</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>FillPoly</systemitem></entry>
+	<entry><function>XFillPolygon</function></entry>
+      </row>
+      <row>
+	<entry morerows="2"><systemitem>ForceScreenSaver</systemitem></entry>
+	<entry><function>XActivateScreenSaver</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XForceScreenSaver</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XResetScreenSaver</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>FreeColormap</systemitem></entry>
+	<entry><function>XFreeColormap</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>FreeColors</systemitem></entry>
+	<entry><function>XFreeColors</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>FreeCursor</systemitem></entry>
+	<entry><function>XFreeCursor</function></entry>
+      </row>
+      <row>
+	<entry morerows="3"><systemitem>FreeGC</systemitem></entry>
+	<entry><function>XFreeGC</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XCreateBitmapFromData</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XCreatePixmapFromData</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XReadBitmapFile</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>FreePixmap</systemitem></entry>
+	<entry><function>XFreePixmap</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>GetAtomName</systemitem></entry>
+	<entry><function>XGetAtomName</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>GetFontPath</systemitem></entry>
+	<entry><function>XGetFontPath</function></entry>
+      </row>
+      <row>
+	<entry morerows="1"><systemitem>GetGeometry</systemitem></entry>
+	<entry><function>XGetGeometry</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XGetWindowAttributes</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>GetImage</systemitem></entry>
+	<entry><function>XGetImage</function></entry>
+      </row>
+      <row>
+	<entry morerows="2"><systemitem>GetInputFocus</systemitem></entry>
+	<entry><function>XGetInputFocus</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XSync</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XSynchronize</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>GetKeyboardControl</systemitem></entry>
+	<entry><function>XGetKeyboardControl</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>GetKeyboardMapping</systemitem></entry>
+	<entry><function>XGetKeyboardMapping</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>GetModifierMapping</systemitem></entry>
+	<entry><function>XGetModifierMapping</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>GetMotionEvents</systemitem></entry>
+	<entry><function>XGetMotionEvents</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>GetPointerControl</systemitem></entry>
+	<entry><function>XGetPointerControl</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>GetPointerMapping</systemitem></entry>
+	<entry><function>XGetPointerMapping</function></entry>
+      </row>
+      <row>
+	<entry morerows="19"><systemitem>GetProperty</systemitem></entry>
+	<entry><function>XFetchBytes</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XFetchName</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XGetClassHint</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XGetIconName</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XGetIconSizes</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XGetNormalHints</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XGetRGBColormaps</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XGetSizeHints</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XGetTextProperty</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XGetTransientForHint</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XGetWMClientMachine</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XGetWMColormapWindows</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XGetWMHints</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XGetWMIconName</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XGetWMName</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XGetWMNormalHints</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XGetWMProtocols</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XGetWMSizeHints</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XGetWindowProperty</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XGetZoomHints</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>GetSelectionOwner</systemitem></entry>
+	<entry><function>XGetSelectionOwner</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>GetWindowAttributes</systemitem></entry>
+	<entry><function>XGetWindowAttributes</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>GrabButton</systemitem></entry>
+	<entry><function>XGrabButton</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>GrabKey</systemitem></entry>
+	<entry><function>XGrabKey</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>GrabKeyboard</systemitem></entry>
+	<entry><function>XGrabKeyboard</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>GrabPointer</systemitem></entry>
+	<entry><function>XGrabPointer</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>GrabServer</systemitem></entry>
+	<entry><function>XGrabServer</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>ImageText8</systemitem></entry>
+	<entry><function>XDrawImageString</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>ImageText16</systemitem></entry>
+	<entry><function>XDrawImageString16</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>InstallColormap</systemitem></entry>
+	<entry><function>XInstallColormap</function></entry>
+      </row>
+      <row>
+	<entry morerows="5"><systemitem>InternAtom</systemitem></entry>
+	<entry><function>XGetWMColormapWindows</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XGetWMProtocols</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XIconifyWindow</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XInternAtom</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XSetWMColormapWindows</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XSetWMProtocols</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>KillClient</systemitem></entry>
+	<entry><function>XKillClient</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>ListExtensions</systemitem></entry>
+	<entry><function>XListExtensions</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>ListFonts</systemitem></entry>
+	<entry><function>XListFonts</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>ListFontsWithInfo</systemitem></entry>
+	<entry><function>XListFontsWithInfo</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>ListHosts</systemitem></entry>
+	<entry><function>XListHosts</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>ListInstalledColormaps</systemitem></entry>
+	<entry><function>XListInstalledColormaps</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>ListProperties</systemitem></entry>
+	<entry><function>XListProperties</function></entry>
+      </row>
+      <row>
+	<entry morerows="1"><systemitem>LookupColor</systemitem></entry>
+	<entry><function>XLookupColor</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XParseColor</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>MapSubwindows</systemitem></entry>
+	<entry><function>XMapSubwindows</function></entry>
+      </row>
+      <row>
+	<entry morerows="1"><systemitem>MapWindow</systemitem></entry>
+	<entry><function>XMapRaised</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XMapWindow</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>NoOperation</systemitem></entry>
+	<entry><function>XNoOp</function></entry>
+      </row>
+      <row>
+	<entry morerows="1"><systemitem>OpenFont</systemitem></entry>
+	<entry><function>XLoadFont</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XLoadQueryFont</function></entry>
+      </row>
+      <row>
+	<entry morerows="1"><systemitem>PolyArc</systemitem></entry>
+	<entry><function>XDrawArc</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XDrawArcs</function></entry>
+      </row>
+      <row>
+	<entry morerows="1"><systemitem>PolyFillArc</systemitem></entry>
+	<entry><function>XFillArc</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XFillArcs</function></entry>
+      </row>
+      <row>
+	<entry morerows="1"><systemitem>PolyFillRectangle</systemitem></entry>
+	<entry><function>XFillRectangle</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XFillRectangles</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>PolyLine</systemitem></entry>
+	<entry><function>XDrawLines</function></entry>
+      </row>
+      <row>
+	<entry morerows="1"><systemitem>PolyPoint</systemitem></entry>
+	<entry><function>XDrawPoint</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XDrawPoints</function></entry>
+      </row>
+      <row>
+	<entry morerows="1"><systemitem>PolyRectangle</systemitem></entry>
+	<entry><function>XDrawRectangle</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XDrawRectangles</function></entry>
+      </row>
+      <row>
+	<entry morerows="1"><systemitem>PolySegment</systemitem></entry>
+	<entry><function>XDrawLine</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XDrawSegments</function></entry>
+      </row>
+      <row>
+	<entry morerows="1"><systemitem>PolyText8</systemitem></entry>
+	<entry><function>XDrawString</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XDrawText</function></entry>
+      </row>
+      <row>
+	<entry morerows="1"><systemitem>PolyText16</systemitem></entry>
+	<entry><function>XDrawString16</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XDrawText16</function></entry>
+      </row>
+      <row>
+	<entry morerows="3"><systemitem>PutImage</systemitem></entry>
+	<entry><function>XPutImage</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XCreateBitmapFromData</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XCreatePixmapFromData</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XReadBitmapFile</function></entry>
+      </row>
+      <row>
+	<entry morerows="3"><systemitem>QueryBestSize</systemitem></entry>
+	<entry><function>XQueryBestCursor</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XQueryBestSize</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XQueryBestStipple</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XQueryBestTile</function></entry>
+      </row>
+      <row>
+	<entry morerows="1"><systemitem>QueryColors</systemitem></entry>
+	<entry><function>XQueryColor</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XQueryColors</function></entry>
+      </row>
+      <row>
+	<entry morerows="1"><systemitem>QueryExtension</systemitem></entry>
+	<entry><function>XInitExtension</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XQueryExtension</function></entry>
+      </row>
+      <row>
+	<entry morerows="1"><systemitem>QueryFont</systemitem></entry>
+	<entry><function>XLoadQueryFont</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XQueryFont</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>QueryKeymap</systemitem></entry>
+	<entry><function>XQueryKeymap</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>QueryPointer</systemitem></entry>
+	<entry><function>XQueryPointer</function></entry>
+      </row>
+      <row>
+	<entry morerows="1"><systemitem>QueryTextExtents</systemitem></entry>
+	<entry><function>XQueryTextExtents</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XQueryTextExtents16</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>QueryTree</systemitem></entry>
+	<entry><function>XQueryTree</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>RecolorCursor</systemitem></entry>
+	<entry><function>XRecolorCursor</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>ReparentWindow</systemitem></entry>
+	<entry><function>XReparentWindow</function></entry>
+      </row>
+      <row>
+	<entry morerows="1"><systemitem>RotateProperties</systemitem></entry>
+	<entry><function>XRotateBuffers</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XRotateWindowProperties</function></entry>
+      </row>
+      <row>
+	<entry morerows="3"><systemitem>SendEvent</systemitem></entry>
+	<entry><function>XIconifyWindow</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XReconfigureWMWindow</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XSendEvent</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XWithdrawWindow</function></entry>
+      </row>
+      <row>
+	<entry morerows="2"><systemitem>SetAccessControl</systemitem></entry>
+	<entry><function>XDisableAccessControl</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XEnableAccessControl</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XSetAccessControl</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>SetClipRectangles</systemitem></entry>
+	<entry><function>XSetClipRectangles</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>SetCloseDownMode</systemitem></entry>
+	<entry><function>XSetCloseDownMode</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>SetDashes</systemitem></entry>
+	<entry><function>XSetDashes</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>SetFontPath</systemitem></entry>
+	<entry><function>XSetFontPath</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>SetInputFocus</systemitem></entry>
+	<entry><function>XSetInputFocus</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>SetModifierMapping</systemitem></entry>
+	<entry><function>XSetModifierMapping</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>SetPointerMapping</systemitem></entry>
+	<entry><function>XSetPointerMapping</function></entry>
+      </row>
+      <row>
+	<entry morerows="1"><systemitem>SetScreenSaver</systemitem></entry>
+	<entry><function>XGetScreenSaver</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XSetScreenSaver</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>SetSelectionOwner</systemitem></entry>
+	<entry><function>XSetSelectionOwner</function></entry>
+      </row>
+      <row>
+	<entry morerows="1"><systemitem>StoreColors</systemitem></entry>
+	<entry><function>XStoreColor</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XStoreColors</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>StoreNamedColor</systemitem></entry>
+	<entry><function>XStoreNamedColor</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>TranslateCoordinates</systemitem></entry>
+	<entry><function>XTranslateCoordinates</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>UngrabButton</systemitem></entry>
+	<entry><function>XUngrabButton</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>UngrabKey</systemitem></entry>
+	<entry><function>XUngrabKey</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>UngrabKeyboard</systemitem></entry>
+	<entry><function>XUngrabKeyboard</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>UngrabPointer</systemitem></entry>
+	<entry><function>XUngrabPointer</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>UngrabServer</systemitem></entry>
+	<entry><function>XUngrabServer</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>UninstallColormap</systemitem></entry>
+	<entry><function>XUninstallColormap</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>UnmapSubwindows</systemitem></entry>
+	<entry><function>XUnmapSubWindows</function></entry>
+      </row>
+      <row>
+	<entry morerows="1"><systemitem>UnmapWindow</systemitem></entry>
+	<entry><function>XUnmapWindow</function></entry>
+      </row>
+      <row>
+
+	<entry><function>XWithdrawWindow</function></entry>
+      </row>
+      <row>
+	<entry><systemitem>WarpPointer</systemitem></entry>
+	<entry><function>XWarpPointer</function></entry>
+      </row>
+    </tbody>
+  </tgroup>
+</table>
+</appendix>
diff --git a/libX11/specs/libX11/AppC.xml b/libX11/specs/libX11/AppC.xml
index 28f5b5395..cb2db3440 100644
--- a/libX11/specs/libX11/AppC.xml
+++ b/libX11/specs/libX11/AppC.xml
@@ -131,6 +131,7 @@ the result is implementation-dependent.
 Uppercase and lowercase matter;
 the strings ``thing'', ``Thing'', and ``thinG'' 
 are all considered different names.
+</para>
 <indexterm significance="preferred"><primary>XListExtensions</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xlistextensions'>
@@ -163,7 +164,6 @@ Returns the number of extensions listed.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -173,6 +173,7 @@ function returns a list of all extensions supported by the server.
 If the data returned by the server is in the Latin Portable Character Encoding,
 then the returned strings are in the Host Portable Character Encoding.
 Otherwise, the result is implementation-dependent.
+</para>
 <indexterm significance="preferred"><primary>XFreeExtensionList</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xfreeextensionlist'>
@@ -194,7 +195,6 @@ Specifies the list of extension names.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -253,7 +253,6 @@ typedef struct _XExtCodes {	/* public to extension, cannot be changed */
 } XExtCodes;
 </synopsis>
 </para>
-<para>
 <!-- .LP -->
 <!-- .eM -->
 <indexterm significance="preferred"><primary>XInitExtension</primary></indexterm>
@@ -288,7 +287,6 @@ Specifies the extension name.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -320,7 +318,6 @@ structure is
 needed in the other calls that follow.  
 This extension number is unique only to a single connection.
 </para>
-<para>
 <!-- .LP -->
 <indexterm significance="preferred"><primary>XAddExtension</primary></indexterm>
 <!-- .sM -->
@@ -343,7 +340,6 @@ Specifies the connection to the X server.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -370,6 +366,7 @@ format, and the handling of errors.
 <!-- .LP -->
 All of these functions return the previous procedure defined for this
 extension.
+</para>
 <indexterm significance="preferred"><primary>XESetCloseDisplay</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xesetclosedisplay'>
@@ -413,7 +410,6 @@ Specifies the procedure to call when the display is closed.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -439,7 +435,6 @@ with these arguments:
 </funcprototype>
 </funcsynopsis>
 </para>
-<para>
 <indexterm significance="preferred"><primary>XESetCreateGC</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xesetcreategc'>
@@ -483,7 +478,6 @@ Specifies the procedure to call when a GC is closed.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -640,7 +634,6 @@ your procedure is called with these arguments:
 </funcprototype>
 </funcsynopsis>
 </para>
-<para>
 <!-- .LP -->
 <!-- .eM -->
 <indexterm significance="preferred"><primary>XESetCreateFont</primary></indexterm>
@@ -686,7 +679,6 @@ Specifies the procedure to call when a font is created.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -721,7 +713,6 @@ your procedure is called with these arguments:
 </funcprototype>
 </funcsynopsis>
 </para>
-<para>
 <!-- .LP -->
 <!-- .eM -->
 <indexterm significance="preferred"><primary>XESetFreeFont</primary></indexterm>
@@ -767,7 +758,6 @@ Specifies the procedure to call when a font is freed.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -835,6 +825,7 @@ structure size cannot be bigger than the size of the
 union of structures.
 There also is no way to guarantee that more than 24 elements or 96 characters
 in the structure will be fully portable between machines.
+</para>
 <!-- .NE -->
 <indexterm significance="preferred"><primary>XESetWireToEvent</primary></indexterm>
 <!-- .sM -->
@@ -879,7 +870,6 @@ Specifies the procedure to call when converting an event.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -944,7 +934,6 @@ To initialize the serial number component of the event, call
 <function>_XSetLastRequestRead</function>
 with the event and use the return value.
 </para>
-<para>
 <!-- .LP -->
 <indexterm significance="preferred"><primary>_XSetLastRequestRead</primary></indexterm>
 <!-- .sM -->
@@ -978,7 +967,6 @@ Specifies the wire event structure.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -988,7 +976,6 @@ function computes and returns a complete serial number from the partial
 serial number in the event.
 <!-- .sp -->
 </para>
-<para>
 <!-- .LP -->
 <indexterm significance="preferred"><primary>XESetEventToWire</primary></indexterm>
 <!-- .sM -->
@@ -1033,7 +1020,6 @@ Specifies the procedure to call when converting an event.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1082,6 +1068,7 @@ structure.
 All other members then should be copied from the host format to the 
 <structname>xEvent</structname>
 structure.
+</para>
 <indexterm significance="preferred"><primary>XESetWireToError</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xesetwiretoerror'>
@@ -1125,7 +1112,6 @@ Specifies the procedure to call when an error is received.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1177,6 +1163,7 @@ then the function should return
 <symbol>False</symbol>;
 otherwise, it should return
 <symbol>True</symbol>.
+</para>
 <indexterm significance="preferred"><primary>XESetError</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xeseterror'>
@@ -1220,7 +1207,6 @@ Specifies the procedure to call when an error is received.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1268,6 +1254,7 @@ If your procedure returns nonzero,
 the error is suppressed, and 
 <function>_XReply</function>
 returns the value of ret_code.
+</para>
 <indexterm significance="preferred"><primary>XESetErrorString</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xeseterrorstring'>
@@ -1311,7 +1298,6 @@ Specifies the procedure to call to obtain an error string.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1344,6 +1330,7 @@ The following is an example.
 Your procedure is called with the error code for every error detected.
 You should copy nbytes of a null-terminated string containing the
 error message into buffer.
+</para>
 <indexterm significance="preferred"><primary>XESetPrintErrorValues</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xesetprinterrorvalues'>
@@ -1387,7 +1374,6 @@ Specifies the procedure to call when an error is printed.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1426,6 +1412,7 @@ to obtain additional values set by using
 <function>XESetWireToError</function>.
 The underlying type of the fp argument is system dependent;
 on a <acronym>POSIX</acronym>-compliant system, fp should be cast to type FILE*.
+</para>
 <indexterm significance="preferred"><primary>XESetFlushGC</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xesetflushgc'>
@@ -1469,7 +1456,6 @@ Specifies the procedure to call when a GC is flushed.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1478,6 +1464,7 @@ The procedure set by the
 function has the same interface as the procedure set by the
 <function>XESetCopyGC</function>
 function, but is called when a GC cache needs to be updated in the server.
+</para>
 <indexterm significance="preferred"><primary>XESetBeforeFlush</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis>
@@ -1521,7 +1508,6 @@ Specifies the procedure to call when a buffer is flushed.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1613,7 +1599,6 @@ union {	Display *display;
 	XFontStruct *font } XEDataObject;
 </synopsis>
 </para>
-<para>
 <!-- .LP -->
 <!-- .eM -->
 <indexterm significance="preferred"><primary>XEHeadOfExtensionList</primary></indexterm>
@@ -1637,7 +1622,6 @@ Specifies the object.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1652,7 +1636,6 @@ allows an extension to attach arbitrary data to any of the structures
 of types contained in
 <structname>XEDataObject</structname>.
 </para>
-<para>
 <!-- .LP -->
 <indexterm significance="preferred"><primary>XAddToExtensionList</primary></indexterm>
 <!-- .sM -->
@@ -1686,7 +1669,6 @@ Specifies the extension data structure to add.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1694,6 +1676,7 @@ The structure argument is a pointer to one of the data structures
 enumerated above.
 You must initialize ext_data-&gt;number with the extension number
 before calling this function.
+</para>
 <indexterm significance="preferred"><primary>XFindOnExtensionList</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xfindonextensionlist'>
@@ -1727,7 +1710,6 @@ Specifies the extension number from
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1745,6 +1727,7 @@ The
 <function>XAllocID</function>
 macro, which allocates and returns a resource ID, is defined in 
 <filename class="headerfile">&lt;X11/Xlib.h&gt;</filename>.
+</para>
 <indexterm significance="preferred"><primary>XAllocID</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xallocid'>
@@ -1766,7 +1749,6 @@ Specifies the connection to the X server.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1780,6 +1762,7 @@ It returns a resource ID that you can use when creating new resources.
 The 
 <function>XAllocIDs</function>
 macro allocates and returns an array of resource ID.
+</para>
 <indexterm significance="preferred"><primary>XAllocIDs</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xallocids'>
@@ -1823,7 +1806,6 @@ Specifies the number of resource IDs requested.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1857,6 +1839,7 @@ if any elements have changed.
 The
 <function>FlushGC</function>
 macro is defined as follows:
+</para>
 <indexterm significance="preferred"><primary>FlushGC</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='flushgc'>
@@ -1889,7 +1872,6 @@ Specifies the GC.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1907,6 +1889,7 @@ The
 <function>_XFlushGCCache</function>
 procedure
 is defined as follows:
+</para>
 <indexterm significance="preferred"><primary>_XFlushGCCache</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='_xflushgccache'>
@@ -1939,7 +1922,6 @@ Specifies the GC.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -2340,7 +2322,6 @@ Two calls, which are generally implemented as macros, have been provided.
 </funcsynopsis>
 <!-- .FN -->
 </para>
-<para>
 <!-- .LP -->
 <indexterm significance="preferred"><primary>UnlockDisplay</primary></indexterm>
 <funcsynopsis id='unlockdisplay'>
@@ -2362,7 +2343,6 @@ Specifies the connection to the X server.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -2581,6 +2561,7 @@ packet to arrive.
 If any events arrive in the meantime,
 <function>_XReply</function>
 places them in the queue for later use.
+</para>
 <indexterm significance="preferred"><primary>_XReply</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='_xreply'>
@@ -2636,7 +2617,6 @@ should be discarded.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -2748,7 +2728,6 @@ and use the appropriate
 <function>_XRead</function>
 function to read the variable-length data.
 </para>
-<para>
 <!-- .LP -->
 <!-- .sM -->
 <funcsynopsis id='_xread'>
@@ -2792,7 +2771,6 @@ Specifies the number of bytes required.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -2800,7 +2778,6 @@ The
 <function>_XRead</function>
 function reads the specified number of bytes into data_return.
 </para>
-<para>
 <!-- .LP -->
 <!-- .sM -->
 <funcsynopsis id='_xread16'>
@@ -2844,7 +2821,6 @@ Specifies the number of bytes required.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -2854,7 +2830,6 @@ function reads the specified number of bytes,
 unpacking them as 16-bit quantities,
 into the specified array as shorts.
 </para>
-<para>
 <!-- .LP -->
 <!-- .sM -->
 <funcsynopsis id='_xread32'>
@@ -2898,7 +2873,6 @@ Specifies the number of bytes required.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -2908,7 +2882,6 @@ function reads the specified number of bytes,
 unpacking them as 32-bit quantities,
 into the specified array as longs.
 </para>
-<para>
 <!-- .LP -->
 <!-- .sM -->
 <funcsynopsis id='_xread16pad'>
@@ -2952,7 +2925,6 @@ Specifies the number of bytes required.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -2965,7 +2937,6 @@ If the number of bytes is not a multiple of four,
 <function>_XRead16Pad</function>
 reads and discards up to two additional pad bytes.
 </para>
-<para>
 <!-- .LP -->
 <!-- .sM -->
 <funcsynopsis id='_xreadpad'>
@@ -3009,7 +2980,6 @@ Specifies the number of bytes required.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -3066,6 +3036,7 @@ the general memory allocators may be too expensive to use
 (particularly in output functions, which are performance critical).  
 The following function returns a scratch buffer for use within a
 critical section:
+</para>
 <indexterm significance="preferred"><primary>_XAllocScratch</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='_xallocscratch'>
@@ -3098,7 +3069,6 @@ Specifies the number of bytes required.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -3123,6 +3093,7 @@ families of functions.
 <!-- .sp -->
 The following function returns a scratch buffer for use across
 critical sections:
+</para>
 <indexterm significance="preferred"><primary>_XAllocTemp</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='_xalloctemp'>
@@ -3155,13 +3126,13 @@ Specifies the number of bytes required.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
 This storage can be used across calls that might permit another thread to
 execute inside Xlib.  The storage must be explicitly returned to Xlib.
 The following function returns the storage:
+</para>
 <indexterm significance="preferred"><primary>_XFreeTemp</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='_xfreetemp'>
@@ -3205,7 +3176,6 @@ Specifies the size of the buffer.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
diff --git a/libX11/specs/libX11/AppD.xml b/libX11/specs/libX11/AppD.xml
index ec77ef6a8..4cde16240 100644
--- a/libX11/specs/libX11/AppD.xml
+++ b/libX11/specs/libX11/AppD.xml
@@ -53,6 +53,7 @@ This function has been superseded by
 and sets all or portions of the 
 <property>WM_NAME</property>, <property>WM_ICON_NAME</property>, <property>WM_HINTS</property>, <property>WM_COMMAND</property>, 
 and <property>WM_NORMAL_HINTS</property> properties.
+</para>
 <indexterm significance="preferred"><primary>XSetStandardProperties</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xsetstandardproperties'>
@@ -154,7 +155,6 @@ Specifies a pointer to the size hints for the window in its normal state.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -202,6 +202,7 @@ To set the size hints for a given window in its normal state, use
 <function>XSetNormalHints</function>.
 This function has been superseded by
 <function>XSetWMNormalHints</function>.
+</para>
 <indexterm significance="preferred"><primary>XSetNormalHints</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xsetnormalhints'>
@@ -245,7 +246,6 @@ Specifies a pointer to the size hints for the window in its normal state.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -291,6 +291,7 @@ To return the size hints for a window in its normal state, use
 <function>XGetNormalHints</function>.
 This function has been superseded by
 <function>XGetWMNormalHints</function>.
+</para>
 <indexterm significance="preferred"><primary>XGetNormalHints</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xgetnormalhints'>
@@ -334,7 +335,6 @@ Returns the size hints for the window in its normal state.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -362,6 +362,7 @@ To set the zoom hints for a window, use
 <function>XSetZoomHints</function>.
 This function is no longer supported by the
 <emphasis remap='I'>Inter-Client Communication Conventions Manual</emphasis>.
+</para>
 <indexterm significance="preferred"><primary>XSetZoomHints</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xsetzoomhints'>
@@ -405,7 +406,6 @@ Specifies a pointer to the zoom hints.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -432,6 +432,7 @@ To read the zoom hints for a window, use
 <function>XGetZoomHints</function>.
 This function is no longer supported by the
 <emphasis remap='I'>Inter-Client Communication Conventions Manual</emphasis>.
+</para>
 <indexterm significance="preferred"><primary>XGetZoomHints</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xgetzoomhints'>
@@ -475,7 +476,6 @@ Returns the zoom hints.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -499,6 +499,7 @@ To set the value of any property of type <property>WM_SIZE_HINTS</property>, use
 <function>XSetSizeHints</function>.
 This function has been superseded by
 <function>XSetWMSizeHints</function>.
+</para>
 <indexterm significance="preferred"><primary>XSetSizeHints</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xsetsizehints'>
@@ -553,7 +554,6 @@ Specifies the property name.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -586,6 +586,7 @@ To read the value of any property of type <property>WM_SIZE_HINTS</property>, us
 <function>XGetSizeHints</function>.
 This function has been superseded by
 <function>XGetWMSizeHints</function>.
+</para>
 <indexterm significance="preferred"><primary>XGetSizeHints</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xgetsizehints'>
@@ -640,7 +641,6 @@ Specifies the property name.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -679,6 +679,7 @@ structure associated with one of the described atoms, use
 <function>XGetStandardColormap</function>.
 This function has been superseded by
 <function>XGetRGBColormaps</function>.
+</para>
 <indexterm significance="preferred"><primary>XGetStandardColormap</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xgetstandardcolormap'>
@@ -733,7 +734,6 @@ Specifies the property name.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -772,6 +772,7 @@ To set a standard colormap, use
 <function>XSetStandardColormap</function>.
 This function has been superseded by
 <function>XSetRGBColormaps</function>.
+</para>
 <indexterm significance="preferred"><primary>XSetStandardColormap</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xsetstandardcolormap'>
@@ -826,7 +827,6 @@ Specifies the property name.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -854,6 +854,7 @@ and a default position, use
 <function>XGeometry</function>.
 This function has been superseded by
 <function>XWMGeometry</function>.
+</para>
 <indexterm><primary>Window</primary><secondary>determining location</secondary></indexterm>
 <indexterm significance="preferred"><primary>XGeometry</primary></indexterm>
 <!-- .sM -->
@@ -1008,7 +1009,6 @@ Return the width and height determined.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1054,7 +1054,6 @@ function provides a primitive interface to the resource manager facilities
 discussed in <link linkend="resource_manager_functions">chapter 15</link>.
 It is only useful in very simple applications.
 </para>
-<para>
 <!-- .LP -->
 <!-- .sp -->
 <indexterm significance="preferred"><primary>XGetDefault</primary></indexterm>
@@ -1101,7 +1100,6 @@ Specifies the option name.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1735,6 +1733,7 @@ To obtain data from a given
 <function>XAssocTable</function>,
 use 
 <function>XLookUpAssoc</function>.
+</para>
 <indexterm significance="preferred"><primary>XLookUpAssoc</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xlookupassoc'>
@@ -1778,7 +1777,6 @@ Specifies the X resource ID.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1800,6 +1798,7 @@ To delete an entry from a given
 <function>XAssocTable</function>,
 use 
 <function>XDeleteAssoc</function>.
+</para>
 <indexterm significance="preferred"><primary>XDeleteAssoc</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xdeleteassoc'>
@@ -1843,7 +1842,6 @@ Specifies the X resource ID.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
diff --git a/libX11/specs/libX11/CH03.xml b/libX11/specs/libX11/CH03.xml
index 2699e00d4..dbdcd86be 100644
--- a/libX11/specs/libX11/CH03.xml
+++ b/libX11/specs/libX11/CH03.xml
@@ -178,6 +178,7 @@ To obtain the visual ID from a
 use
 <function>XVisualIDFromVisual</function>.
 <indexterm significance="preferred"><primary>XVisualIDFromVisual</primary></indexterm>
+</para>
 <!-- .sM -->
 <funcsynopsis id='xvisualidfromvisual'>
 <funcprototype>
@@ -198,7 +199,6 @@ Specifies the visual type.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -426,17 +426,17 @@ and
 windows:
 </para>
 <informaltable>
-  <tgroup cols='4' align='center'>
-  <colspec colname='c1'/>
-  <colspec colname='c2'/>
-  <colspec colname='c3'/>
-  <colspec colname='c4'/>
+  <tgroup cols='4'>
+  <colspec colname='c1' align='left'/>
+  <colspec colname='c2' align='left'/>
+  <colspec colname='c3' align='center'/>
+  <colspec colname='c4' align='center'/>
   <thead>
     <row>
       <entry>Attribute</entry>
       <entry>Default</entry>
       <entry>InputOutput</entry>
-      <entry>nputOnly</entry>
+      <entry>InputOnly</entry>
     </row>
   </thead>
   <tbody>
@@ -758,9 +758,9 @@ change of width and height, the (x, y) pairs are defined:
 <para>
 <!-- .LP -->
 <informaltable>
-  <tgroup cols='2' align='center'>
-  <colspec colname='c1'/>
-  <colspec colname='c2'/>
+  <tgroup cols='2'>
+  <colspec colname='c1' align='left'/>
+  <colspec colname='c2' align='left'/>
   <thead>
     <row>
       <entry>Gravity Direction</entry>
@@ -1246,6 +1246,7 @@ Extension packages can define other classes of windows.
 <!-- .LP -->
 To create an unmapped window and set its window attributes, use
 <function>XCreateWindow</function>.
+</para>
 <indexterm significance="preferred"><primary>XCreateWindow</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xcreatewindow'>
@@ -1419,7 +1420,6 @@ set to indicate which attributes have been set in the structure.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1511,6 +1511,7 @@ To create an unmapped
 <symbol>InputOutput</symbol>
 subwindow of a given parent window, use
 <function>XCreateSimpleWindow</function>.
+</para>
 <indexterm significance="preferred"><primary>XCreateSimpleWindow</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xcreatesimplewindow'>
@@ -1629,7 +1630,6 @@ Specifies the background pixel value of the window.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1681,6 +1681,7 @@ subwindows of a window.
 <!-- .sp -->
 To destroy a window and all of its subwindows, use
 <function>XDestroyWindow</function>.
+</para>
 <indexterm significance="preferred"><primary>XDestroyWindow</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xdestroywindow'>
@@ -1713,7 +1714,6 @@ Specifies the window.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1751,6 +1751,7 @@ error.
 <!-- .sp -->
 To destroy all subwindows of a specified window, use 
 <function>XDestroySubwindows</function>.
+</para>
 <indexterm significance="preferred"><primary>XDestroySubwindows</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xdestroysubwindows'>
@@ -1783,7 +1784,6 @@ Specifies the window.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1895,6 +1895,7 @@ event.
 <!-- .sp -->
 To map a given window, use 
 <function>XMapWindow</function>.
+</para>
 <indexterm significance="preferred"><primary>XMapWindow</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xmapwindow'>
@@ -1927,7 +1928,6 @@ Specifies the window.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -2021,6 +2021,7 @@ error.
 <!-- .sp -->
 To map and raise a window, use
 <function>XMapRaised</function>.
+</para>
 <indexterm significance="preferred"><primary>XMapRaised</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xmapraised'>
@@ -2053,7 +2054,6 @@ Specifies the window.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -2081,6 +2081,7 @@ errors.
 <!-- .sp -->
 To map all subwindows for a specified window, use 
 <function>XMapSubwindows</function>.
+</para>
 <indexterm significance="preferred"><primary>XMapSubwindows</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xmapsubwindows'>
@@ -2113,7 +2114,6 @@ Specifies the window.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -2151,6 +2151,7 @@ Xlib provides functions that you can use to unmap a window or all subwindows.
 <!-- .sp -->
 To unmap a window, use 
 <function>XUnmapWindow</function>.
+</para>
 <indexterm significance="preferred"><primary>XUnmapWindow</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xunmapwindow'>
@@ -2183,7 +2184,6 @@ Specifies the window.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -2218,6 +2218,7 @@ error.
 <!-- .sp -->
 To unmap all subwindows for a specified window, use 
 <function>XUnmapSubwindows</function>.
+</para>
 <indexterm significance="preferred"><primary>XUnmapSubwindows</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xunmapsubwindows'>
@@ -2250,7 +2251,6 @@ Specifies the window.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -2437,8 +2437,8 @@ error results.
 If a sibling and a stack_mode are specified, 
 the window is restacked as follows:
 </para>
-<informaltable>
-  <tgroup cols='2' align='center'>
+<informaltable  frame="none">
+  <tgroup cols='2'>
   <colspec colname='c1'/>
   <colspec colname='c2'/>
   <tbody>
@@ -2476,8 +2476,8 @@ If a stack_mode is specified but no sibling is specified,
 the window is restacked as follows:
 </para>
 
-<informaltable>
-  <tgroup cols='2' align='center'>
+<informaltable  frame="none">
+  <tgroup cols='2'>
   <colspec colname='c1'/>
   <colspec colname='c2'/>
   <tbody>
@@ -2497,6 +2497,7 @@ the top of the stack.
       </entry>
     </row>
     <row>
+      <entry><symbol>BottomIf</symbol></entry>
       <entry>
 If the window occludes any sibling, the window is placed at
 the bottom of the stack.
@@ -2524,6 +2525,7 @@ Attempts to configure a root window have no effect.
 <!-- .sp -->
 To configure a window's size, location, stacking, or border, use
 <function>XConfigureWindow</function>.
+</para>
 <indexterm significance="preferred"><primary>XConfigureWindow</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xconfigurewindow'>
@@ -2583,7 +2585,6 @@ structure.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -2630,6 +2631,7 @@ errors.
 <!-- .sp -->
 To move a window without changing its size, use 
 <function>XMoveWindow</function>.
+</para>
 <indexterm significance="preferred"><primary>XMoveWindow</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xmovewindow'>
@@ -2687,7 +2689,6 @@ Specify the x and y coordinates(Xy.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -2732,6 +2733,7 @@ error.
 <!-- .sp -->
 To change a window's size without changing the upper-left coordinate, use 
 <function>XResizeWindow</function>.
+</para>
 <indexterm significance="preferred"><primary>XResizeWindow</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xresizewindow'>
@@ -2788,7 +2790,6 @@ Specify the width and height(Wh.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -2835,6 +2836,7 @@ errors.
 <!-- .sp -->
 To change the size and location of a window, use 
 <function>XMoveResizeWindow</function>.
+</para>
 <indexterm significance="preferred"><primary>XMoveResizeWindow</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xmoveresizewindow'>
@@ -2914,7 +2916,6 @@ Specify the width and height(Wh.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -2956,6 +2957,7 @@ errors.
 <!-- .sp -->
 To change the border width of a given window, use
 <function>XSetWindowBorderWidth</function>.
+</para>
 <indexterm significance="preferred"><primary>XSetWindowBorderWidth</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xsetwindowborderwidth'>
@@ -2999,7 +3001,6 @@ Specifies the width of the window border.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -3033,6 +3034,7 @@ or restack windows.
 <!-- .sp -->
 To raise a window so that no sibling window obscures it, use 
 <function>XRaiseWindow</function>.
+</para>
 <indexterm significance="preferred"><primary>XRaiseWindow</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xraisewindow'>
@@ -3065,7 +3067,6 @@ Specifies the window.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -3106,6 +3107,7 @@ error.
 <!-- .sp -->
 To lower a window so that it does not obscure any sibling windows, use 
 <function>XLowerWindow</function>.
+</para>
 <indexterm significance="preferred"><primary>XLowerWindow</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xlowerwindow'>
@@ -3138,7 +3140,6 @@ Specifies the window.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -3180,6 +3181,7 @@ error.
 <!-- .sp -->
 To circulate a subwindow up or down, use
 <function>XCirculateSubwindows</function>.
+</para>
 <indexterm significance="preferred"><primary>XCirculateSubwindows</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xcirculatesubwindows'>
@@ -3228,7 +3230,6 @@ or
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -3272,6 +3273,7 @@ errors.
 To raise the lowest mapped child of a window that is partially or completely
 occluded by another child, use
 <function>XCirculateSubwindowsUp</function>.
+</para>
 <indexterm significance="preferred"><primary>XCirculateSubwindowsUp</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xcirculatesubwindowsup'>
@@ -3304,7 +3306,6 @@ Specifies the window.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -3334,6 +3335,7 @@ error.
 To lower the highest mapped child of a window that partially or 
 completely occludes another child, use 
 <function>XCirculateSubwindowsDown</function>.
+</para>
 <indexterm significance="preferred"><primary>XCirculateSubwindowsDown</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xcirculatesubwindowsdown'>
@@ -3366,7 +3368,6 @@ Specifies the window.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -3393,6 +3394,7 @@ error.
 <!-- .sp -->
 To restack a set of windows from top to bottom, use 
 <function>XRestackWindows</function>.
+</para>
 <indexterm significance="preferred"><primary>XRestackWindows</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xrestackwindows'>
@@ -3436,7 +3438,6 @@ Specifies the number of windows to be restacked.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -3498,6 +3499,7 @@ window attribute, such as a window's background.
 <!-- .sp -->
 To change one or more attributes for a given window, use
 <function>XChangeWindowAttributes</function>.
+</para>
 <indexterm significance="preferred"><primary>XChangeWindowAttributes</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xchangewindowattributes'>
@@ -3572,7 +3574,6 @@ set to indicate which attributes have been set in the structure
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -3656,6 +3657,7 @@ errors.
 <!-- .sp -->
 To set the background of a window to a given pixel, use 
 <function>XSetWindowBackground</function>.
+</para>
 <indexterm significance="preferred"><primary>XSetWindowBackground</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xsetwindowbackground'>
@@ -3699,7 +3701,6 @@ Specifies the pixel that is to be used for the background.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -3732,6 +3733,7 @@ errors.
 <!-- .LP -->
 To set the background of a window to a given pixmap, use 
 <function>XSetWindowBackgroundPixmap</function>.
+</para>
 <indexterm><primary>Window</primary><secondary>background</secondary></indexterm>
 <indexterm significance="preferred"><primary>XSetWindowBackgroundPixmap</primary></indexterm>
 <!-- .sM -->
@@ -3779,7 +3781,6 @@ or
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -3825,6 +3826,7 @@ do not change the current contents of the window.
 <!-- .sp -->
 To change and repaint a window's border to a given pixel, use 
 <function>XSetWindowBorder</function>.
+</para>
 <indexterm significance="preferred"><primary>XSetWindowBorder</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xsetwindowborder'>
@@ -3868,7 +3870,6 @@ Specifies the entry in the colormap.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -3895,6 +3896,7 @@ errors.
 <!-- .sp -->
 To change and repaint the border tile of a given window, use 
 <function>XSetWindowBorderPixmap</function>.
+</para>
 <indexterm significance="preferred"><primary>XSetWindowBorderPixmap</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xsetwindowborderpixmap'>
@@ -3939,7 +3941,6 @@ Specifies the border pixmap or
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -3974,6 +3975,7 @@ errors.
 <!-- .sp -->
 To set the colormap of a given window, use
 <function>XSetWindowColormap</function>.
+</para>
 <indexterm significance="preferred"><primary>XSetWindowColormap</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xsetwindowcolormap'>
@@ -4017,7 +4019,6 @@ Specifies the colormap.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -4044,6 +4045,7 @@ errors.
 <!-- .sp -->
 To define which cursor will be used in a window, use
 <function>XDefineCursor</function>.
+</para>
 <indexterm><primary>Window</primary><secondary>defining the cursor</secondary></indexterm>
 <indexterm significance="preferred"><primary>XDefineCursor</primary></indexterm>
 <!-- .sM -->
@@ -4089,7 +4091,6 @@ Specifies the cursor that is to be displayed or
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -4113,6 +4114,7 @@ errors.
 <!-- .sp -->
 To undefine the cursor in a given window, use
 <function>XUndefineCursor</function>.
+</para>
 <indexterm><primary>Window</primary><secondary>undefining the cursor</secondary></indexterm>
 <indexterm significance="preferred"><primary>XUndefineCursor</primary></indexterm>
 <!-- .sM -->
@@ -4146,7 +4148,6 @@ Specifies the window.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
diff --git a/libX11/specs/libX11/CH04.xml b/libX11/specs/libX11/CH04.xml
index 18f352593..3bd5d04aa 100644
--- a/libX11/specs/libX11/CH04.xml
+++ b/libX11/specs/libX11/CH04.xml
@@ -36,6 +36,7 @@ exists.
 To obtain the parent, a list of children, and number of children for 
 a given window, use 
 <function>XQueryTree</function>.
+</para>
 <indexterm><primary>Child Window</primary></indexterm>
 <indexterm><primary>Parent Window</primary></indexterm>
 <indexterm significance="preferred"><primary>XQueryTree</primary></indexterm>
@@ -116,7 +117,6 @@ Returns the number of children.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -145,6 +145,7 @@ error.
 <!-- .sp -->
 To obtain the current attributes of a given window, use 
 <function>XGetWindowAttributes</function>.
+</para>
 <indexterm significance="preferred"><primary>XGetWindowAttributes</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xgetwindowattributes'>
@@ -191,7 +192,6 @@ structure.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -370,6 +370,7 @@ errors.
 <!-- .sp -->
 To obtain the current geometry of a given drawable, use 
 <function>XGetGeometry</function>.
+</para>
 <indexterm significance="preferred"><primary>XGetGeometry</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xgetgeometry'>
@@ -487,7 +488,6 @@ Returns the depth of the drawable (bits per pixel for the object).
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -531,6 +531,7 @@ asking the X server to perform these operations.
 To translate a coordinate in one window to the coordinate
 space of another window, use
 <function>XTranslateCoordinates</function>.
+</para>
 <indexterm significance="preferred"><primary>XTranslateCoordinates</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xtranslatecoordinates'>
@@ -629,7 +630,6 @@ destination window.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -665,6 +665,7 @@ error.
 To obtain the screen coordinates of the pointer
 or to determine the pointer coordinates relative to a specified window, use 
 <function>XQueryPointer</function>.
+</para>
 <indexterm significance="preferred"><primary>XQueryPointer</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xquerypointer'>
@@ -774,7 +775,6 @@ Returns the current state of the modifier keys and pointer buttons.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1047,6 +1047,7 @@ see <link linkend="Font_Metrics">section 8.5</link>.
 <!-- .sp -->
 To return an atom for a given name, use 
 <function>XInternAtom</function>.
+</para>
 <indexterm><primary>Atom</primary><secondary>interning</secondary></indexterm>
 <indexterm significance="preferred"><primary>XInternAtom</primary></indexterm>
 <!-- .sM -->
@@ -1091,7 +1092,6 @@ Specifies a Boolean value that indicates whether the atom must be created.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1129,6 +1129,7 @@ errors.
 <!-- .sp -->
 To return atoms for an array of names, use 
 <function>XInternAtoms</function>.
+</para>
 <indexterm><primary>Atom</primary><secondary>interning</secondary></indexterm>
 <indexterm significance="preferred"><primary>XInternAtoms</primary></indexterm>
 <!-- .sM -->
@@ -1196,7 +1197,6 @@ Returns the atoms.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1230,6 +1230,7 @@ errors.
 <!-- .sp -->
 To return a name for a given atom identifier, use 
 <function>XGetAtomName</function>.
+</para>
 <indexterm><primary>Atom</primary><secondary>getting name</secondary></indexterm>
 <indexterm significance="preferred"><primary>XGetAtomName</primary></indexterm>
 <!-- .sM -->
@@ -1263,7 +1264,6 @@ Specifies the atom for the property name you want returned.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1289,6 +1289,7 @@ error.
 <!-- .sp -->
 To return the names for an array of atom identifiers, use 
 <function>XGetAtomNames</function>.
+</para>
 <indexterm><primary>Atom</primary><secondary>getting name</secondary></indexterm>
 <indexterm significance="preferred"><primary>XGetAtomNames</primary></indexterm>
 <!-- .sM -->
@@ -1345,7 +1346,6 @@ Returns the atom names.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1407,7 +1407,6 @@ To obtain the type, format, and value of a property of a given window, use
 <function>XGetWindowProperty</function>.
 <indexterm><primary>Property</primary><secondary>getting</secondary></indexterm>
 </para>
-<para>
 <!-- .LP -->
 <indexterm significance="preferred"><primary>XGetWindowProperty</primary></indexterm>
 <!-- .sM -->
@@ -1556,7 +1555,6 @@ Returns the data in the specified format.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1688,6 +1686,7 @@ errors.
 <!-- .sp -->
 To obtain a given window's property list, use 
 <function>XListProperties</function>.
+</para>
 <indexterm><primary>Property</primary><secondary>listing</secondary></indexterm>
 <indexterm significance="preferred"><primary>XListProperties</primary></indexterm>
 <!-- .sM -->
@@ -1733,7 +1732,6 @@ Returns the length of the properties array.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1756,6 +1754,7 @@ error.
 <!-- .sp -->
 To change a property of a given window, use
 <function>XChangeProperty</function>.
+</para>
 <indexterm><primary>Property</primary><secondary>changing</secondary></indexterm>
 <indexterm><primary>Property</primary><secondary>appending</secondary></indexterm>
 <indexterm><primary>Property</primary><secondary>prepending</secondary></indexterm>
@@ -1877,7 +1876,6 @@ Specifies the number of elements of the specified data format.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1961,7 +1959,6 @@ errors.
 To rotate a window's property list, use
 <function>XRotateWindowProperties</function>.
 </para>
-<para>
 <!-- .LP -->
 <indexterm significance="preferred"><primary>XRotateWindowProperties</primary></indexterm>
 <!-- .sM -->
@@ -2028,7 +2025,6 @@ Specifies the rotation amount.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -2076,6 +2072,7 @@ errors.
 <!-- .sp -->
 To delete a property on a given window, use 
 <function>XDeleteProperty</function>.
+</para>
 <indexterm><primary>Property</primary><secondary>deleting</secondary></indexterm>
 <indexterm significance="preferred"><primary>XDeleteProperty</primary></indexterm>
 <!-- .sM -->
@@ -2121,7 +2118,6 @@ Specifies the property name.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -2199,6 +2195,7 @@ The protocol does not constrain the semantics.
 <!-- .sp -->
 To set the selection owner, use 
 <function>XSetSelectionOwner</function>.
+</para>
 <indexterm><primary>Selection</primary><secondary>setting the owner</secondary></indexterm>
 <indexterm significance="preferred"><primary>XSetSelectionOwner</primary></indexterm>
 <!-- .sM -->
@@ -2258,7 +2255,6 @@ You can pass either a timestamp or
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -2322,6 +2318,7 @@ errors.
 <!-- .sp -->
 To return the selection owner, use 
 <function>XGetSelectionOwner</function>.
+</para>
 <indexterm><primary>Selection</primary><secondary>getting the owner</secondary></indexterm>
 <indexterm significance="preferred"><primary>XGetSelectionOwner</primary></indexterm>
 <!-- .sM -->
@@ -2356,7 +2353,6 @@ Specifies the selection atom (Se.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -2384,6 +2380,7 @@ error.
 <!-- .sp -->
 To request conversion of a selection, use 
 <function>XConvertSelection</function>.
+</para>
 <indexterm><primary>Selection</primary><secondary>converting</secondary></indexterm>
 <indexterm significance="preferred"><primary>XConvertSelection</primary></indexterm>
 <!-- .sM -->
@@ -2464,7 +2461,6 @@ You can pass either a timestamp or
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
diff --git a/libX11/specs/libX11/CH05.xml b/libX11/specs/libX11/CH05.xml
index a9e06d32e..1dd8e675a 100644
--- a/libX11/specs/libX11/CH05.xml
+++ b/libX11/specs/libX11/CH05.xml
@@ -22,6 +22,7 @@ A bitmap is a single bit-plane pixmap.
 <!-- .sp -->
 To create a pixmap of a given size, use
 <function>XCreatePixmap</function>.
+</para>
 <indexterm significance="preferred"><primary>XCreatePixmap</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xcreatepixmap'>
@@ -88,7 +89,6 @@ Specifies the depth of the pixmap.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM  -->
@@ -134,6 +134,7 @@ errors.
 <!-- .sp -->
 To free all storage associated with a specified pixmap, use
 <function>XFreePixmap</function>.
+</para>
 <indexterm significance="preferred"><primary>XFreePixmap</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xfreepixmap'>
@@ -166,7 +167,6 @@ Specifies the pixmap.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM  -->
@@ -293,6 +293,7 @@ errors.
 <!-- .sp -->
 To create a cursor from font glyphs, use
 <function>XCreateGlyphCursor</function>.
+</para>
 <indexterm significance="preferred"><primary>XCreateGlyphCursor</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xcreateglyphcursor'>
@@ -379,7 +380,6 @@ Specifies the <acronym>RGB</acronym> values for the background of the source.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -432,6 +432,7 @@ errors.
 To create a cursor from two bitmaps,
 use
 <function>XCreatePixmapCursor</function>.
+</para>
 <indexterm significance="preferred"><primary>XCreatePixmapCursor</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xcreatepixmapcursor'>
@@ -522,7 +523,6 @@ Specify the x and y coordinates(Xy.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -579,6 +579,7 @@ errors.
 <!-- .sp -->
 To determine useful cursor sizes, use
 <function>XQueryBestCursor</function>.
+</para>
 <indexterm significance="preferred"><primary>XQueryBestCursor</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xquerybestcursor'>
@@ -658,7 +659,6 @@ and height.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -684,6 +684,7 @@ error.
 <!-- .sp -->
 To change the color of a given cursor, use
 <function>XRecolorCursor</function>.
+</para>
 <indexterm significance="preferred"><primary>XRecolorCursor</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xrecolorcursor'>
@@ -737,7 +738,6 @@ Specifies the <acronym>RGB</acronym> values for the background of the source.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -762,6 +762,7 @@ error.
 <!-- .sp -->
 To free (destroy) a given cursor, use
 <function>XFreeCursor</function>.
+</para>
 <indexterm significance="preferred"><primary>XFreeCursor</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xfreecursor'>
@@ -794,7 +795,6 @@ Specifies the cursor.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM  -->
diff --git a/libX11/specs/libX11/CH06.xml b/libX11/specs/libX11/CH06.xml
index 59f38ec4e..87379fff7 100644
--- a/libX11/specs/libX11/CH06.xml
+++ b/libX11/specs/libX11/CH06.xml
@@ -961,6 +961,7 @@ errors.
 To create a new colormap when the allocation out of a previously
 shared colormap has failed because of resource exhaustion, use
 <function>XCopyColormapAndFree</function>.
+</para>
 <indexterm significance="preferred"><primary>XCopyColormapAndFree</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xcopycolormapandfree'>
@@ -993,7 +994,6 @@ Specifies the colormap.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -6996,15 +6996,15 @@ spaces.
 The conversion functions provided by Xlib are:
 </para>
 <informaltable>
-  <tgroup cols='3' align='center'>
+  <tgroup cols='3'>
   <colspec colname='c1'/>
   <colspec colname='c2'/>
   <colspec colname='c3'/>
   <thead>
     <row>
-      <entry>Function</entry>
-      <entry>Converts from</entry>
-      <entry>Converts to</entry>
+      <entry align='center'>Function</entry>
+      <entry align='center'>Converts from</entry>
+      <entry align='center'>Converts to</entry>
     </row>
   </thead>
   <tbody>
diff --git a/libX11/specs/libX11/CH07.xml b/libX11/specs/libX11/CH07.xml
index d9f73887e..38baccc39 100644
--- a/libX11/specs/libX11/CH07.xml
+++ b/libX11/specs/libX11/CH07.xml
@@ -137,14 +137,13 @@ typedef struct {
 The default GC values are:
 </para>
 <informaltable>
-  <tgroup cols='3' align='center'>
+  <tgroup cols='2'>
   <colspec colname='c1'/>
   <colspec colname='c2'/>
-  <colspec colname='c3'/>
   <thead>
     <row>
-      <entry>Component</entry>
-      <entry>Default</entry>
+      <entry align='center'>Component</entry>
+      <entry align='center'>Default</entry>
     </row>
   </thead>
   <tbody>
@@ -194,15 +193,11 @@ The default GC values are:
     </row>
     <row>
       <entry>tile</entry>
-      <entry>Pixmap of unspecified size filled with foreground pixel</entry>
-    </row>
-    <row>
-      <entry></entry>
-      <entry>(that is, client specified pixel if any, else 0)</entry>
-    </row>
-    <row>
-      <entry></entry>
-      <entry>(subsequent changes to foreground do not affect this pixmap)</entry>
+      <entry>
+      <para>Pixmap of unspecified size filled with foreground pixel</para>
+      <para>(that is, client specified pixel if any, else 0)</para>
+      <para>(subsequent changes to foreground do not affect this pixmap)</para>
+      </entry>
     </row>
     <row>
       <entry>stipple</entry>
@@ -284,15 +279,15 @@ are:
 <!-- .\".CP T 1 -->
 <!-- .\"Display Functions -->
 <informaltable>
-  <tgroup cols='3' align='center'>
+  <tgroup cols='3'>
   <colspec colname='c1'/>
   <colspec colname='c2'/>
   <colspec colname='c3'/>
   <thead>
     <row>
-      <entry>Function Name</entry>
-      <entry>Value</entry>
-      <entry>Operation</entry>
+      <entry align='center'>Function Name</entry>
+      <entry align='center'>Value</entry>
+      <entry align='center'>Operation</entry>
     </row>
   </thead>
   <tbody>
@@ -632,7 +627,7 @@ the semantics depends on the line-width and the cap-style:
 </para>
 
 <informaltable>
-  <tgroup cols='3' align='center'>
+  <tgroup cols='3'>
   <colspec colname='c1'/>
   <colspec colname='c2'/>
   <colspec colname='c3'/>
@@ -747,7 +742,7 @@ the following apply:
 </para>
 
 <informaltable>
-  <tgroup cols='2' align='center'>
+  <tgroup cols='2'>
   <colspec colname='c1'/>
   <colspec colname='c2'/>
   <tbody>
@@ -781,7 +776,7 @@ the odd dashes are controlled by the fill-style in the following manner:
 </para>
 
 <informaltable>
-  <tgroup cols='2' align='center'>
+  <tgroup cols='2'>
   <colspec colname='c1'/>
   <colspec colname='c2'/>
   <tbody>
@@ -962,6 +957,7 @@ requests (and any similar requests defined by extensions).
 To create a new GC that is usable on a given screen with a 
 depth of drawable, use
 <function>XCreateGC</function>.
+</para>
 <indexterm><primary>Graphics context</primary><secondary>initializing</secondary></indexterm>
 <indexterm significance="preferred"><primary>XCreateGC</primary></indexterm>
 <!-- .sM -->
@@ -1020,7 +1016,6 @@ Specifies any values as specified by the valuemask.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1051,6 +1046,7 @@ errors.
 <!-- .sp -->
 To copy components from a source GC to a destination GC, use
 <function>XCopyGC</function>.
+</para>
 <indexterm significance="preferred"><primary>XCopyGC</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xcopygc'>
@@ -1107,7 +1103,6 @@ Specifies the destination GC.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM  -->
@@ -1137,6 +1132,7 @@ errors.
 <!-- .sp -->
 To change the components in a given GC, use
 <function>XChangeGC</function>.
+</para>
 <indexterm significance="preferred"><primary>XChangeGC</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xchangegc'>
@@ -1194,7 +1190,6 @@ Specifies any values as specified by the valuemask.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1233,6 +1228,7 @@ errors.
 <!-- .sp -->
 To obtain components of a given GC, use
 <function>XGetGCValues</function>.
+</para>
 <indexterm significance="preferred"><primary>XGetGCValues</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xgetgcvalues'>
@@ -1292,7 +1288,6 @@ structure.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1345,6 +1340,7 @@ if the component has never been explicitly set by the client.
 <!-- .sp -->
 To free a given GC, use
 <function>XFreeGC</function>.
+</para>
 <indexterm significance="preferred"><primary>XFreeGC</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xfreegc'>
@@ -1377,7 +1373,6 @@ Specifies the GC.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1399,6 +1394,7 @@ To obtain the
 <type>GContext</type>
 resource ID for a given GC, use 
 <function>XGContextFromGC</function>.
+</para>
 <indexterm significance="preferred"><primary>XGContextFromGC</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xgcontextfromgc'>
@@ -1421,7 +1417,6 @@ Specifies the GC (Gc.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1435,6 +1430,7 @@ An example might be when a protocol extension uses the GC indirectly,
 in such a way that the extension interface cannot know what GC will be used.
 To force sending GC component changes, use
 <function>XFlushGC</function>.
+</para>
 <indexterm significance="preferred"><primary>XFlushGC</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xflushgc'>
@@ -1467,7 +1463,6 @@ Specifies the GC.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1529,6 +1524,7 @@ Arc mode, subwindow mode, and graphics exposure components
 To set the foreground, background, plane mask, and function components
 for a given GC, use
 <function>XSetState</function>.
+</para>
 <indexterm significance="preferred"><primary>XSetState</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xsetstate'>
@@ -1605,7 +1601,6 @@ Specifies the plane mask.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1622,6 +1617,7 @@ errors.
 <!-- .sp -->
 To set the foreground of a given GC, use
 <function>XSetForeground</function>.
+</para>
 <indexterm significance="preferred"><primary>XSetForeground</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xsetforeground'>
@@ -1665,7 +1661,6 @@ Specifies the foreground you want to set for the specified GC.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1681,6 +1676,7 @@ errors.
 <!-- .sp -->
 To set the background of a given GC, use
 <function>XSetBackground</function>.
+</para>
 <indexterm significance="preferred"><primary>XSetBackground</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xsetbackground'>
@@ -1724,7 +1720,6 @@ Specifies the background you want to set for the specified GC.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1740,6 +1735,7 @@ errors.
 <!-- .sp -->
 To set the display function in a given GC, use
 <function>XSetFunction</function>.
+</para>
 <indexterm significance="preferred"><primary>XSetFunction</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xsetfunction'>
@@ -1783,7 +1779,6 @@ Specifies the function you want to set for the specified GC.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1800,6 +1795,7 @@ errors.
 <!-- .sp -->
 To set the plane mask of a given GC, use
 <function>XSetPlaneMask</function>.
+</para>
 <indexterm significance="preferred"><primary>XSetPlaneMask</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xsetplanemask'>
@@ -1844,7 +1840,6 @@ Specifies the plane mask.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1865,6 +1860,7 @@ errors.
 <!-- .LP -->
 To set the line drawing components of a given GC, use
 <function>XSetLineAttributes</function>.
+</para>
 <indexterm significance="preferred"><primary>XSetLineAttributes</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xsetlineattributes'>
@@ -1957,7 +1953,6 @@ or
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1974,6 +1969,7 @@ errors.
 <!-- .sp -->
 To set the dash-offset and dash-list for dashed line styles of a given GC, use
 <function>XSetDashes</function>.
+</para>
 <indexterm significance="preferred"><primary>XSetDashes</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xsetdashes'>
@@ -2041,7 +2037,6 @@ Specifies the number of elements in dash_list.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM  -->
@@ -2103,6 +2098,7 @@ errors.
 <!-- .LP -->
 To set the fill-style of a given GC, use
 <function>XSetFillStyle</function>.
+</para>
 <indexterm significance="preferred"><primary>XSetFillStyle</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xsetfillstyle'>
@@ -2152,7 +2148,6 @@ or
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -2169,6 +2164,7 @@ errors.
 <!-- .sp -->
 To set the fill-rule of a given GC, use
 <function>XSetFillRule</function>.
+</para>
 <indexterm significance="preferred"><primary>XSetFillRule</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xsetfillrule'>
@@ -2216,7 +2212,6 @@ or
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -2249,6 +2244,7 @@ as well as to set the tile or stipple shape and the tile or stipple origin.
 <!-- .sp -->
 To obtain the best size of a tile, stipple, or cursor, use
 <function>XQueryBestSize</function>.
+</para>
 <indexterm significance="preferred"><primary>XQueryBestSize</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xquerybestsize'>
@@ -2342,7 +2338,6 @@ by the display hardware.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -2392,6 +2387,7 @@ errors.
 <!-- .sp -->
 To obtain the best fill tile shape, use
 <function>XQueryBestTile</function>.
+</para>
 <indexterm significance="preferred"><primary>XQueryBestTile</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xquerybesttile'>
@@ -2469,7 +2465,6 @@ by the display hardware.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -2498,6 +2493,7 @@ errors.
 <!-- .sp -->
 To obtain the best stipple shape, use
 <function>XQueryBestStipple</function>.
+</para>
 <indexterm significance="preferred"><primary>XQueryBestStipple</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xquerybeststipple'>
@@ -2575,7 +2571,6 @@ by the display hardware.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -2604,6 +2599,7 @@ errors.
 <!-- .sp -->
 To set the fill tile of a given GC, use
 <function>XSetTile</function>.
+</para>
 <indexterm significance="preferred"><primary>XSetTile</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xsettile'>
@@ -2647,7 +2643,6 @@ Specifies the fill tile you want to set for the specified GC.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -2672,6 +2667,7 @@ errors.
 <!-- .sp -->
 To set the stipple of a given GC, use
 <function>XSetStipple</function>.
+</para>
 <indexterm significance="preferred"><primary>XSetStipple</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xsetstipple'>
@@ -2715,7 +2711,6 @@ Specifies the stipple you want to set for the specified GC.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -2740,6 +2735,7 @@ errors.
 <!-- .sp -->
 To set the tile or stipple origin of a given GC, use
 <function>XSetTSOrigin</function>.
+</para>
 <indexterm significance="preferred"><primary>XSetTSOrigin</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xsettsorigin'>
@@ -2794,7 +2790,6 @@ Specify the x and y coordinates of the tile and stipple origin.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -2821,6 +2816,7 @@ errors.
 <!-- .LP -->
 To set the current font of a given GC, use
 <function>XSetFont</function>.
+</para>
 <indexterm significance="preferred"><primary>XSetFont</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xsetfont'>
@@ -2864,7 +2860,6 @@ Specifies the font.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -2892,6 +2887,7 @@ and the clip-mask or set the clip-mask to a list of rectangles.
 <!-- .sp -->
 To set the clip-origin of a given GC, use
 <function>XSetClipOrigin</function>.
+</para>
 <indexterm significance="preferred"><primary>XSetClipOrigin</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xsetcliporigin'>
@@ -2946,7 +2942,6 @@ Specify the x and y coordinates of the clip-mask origin.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -2967,6 +2962,7 @@ errors.
 <!-- .sp -->
 To set the clip-mask of a given GC to the specified pixmap, use
 <function>XSetClipMask</function>.
+</para>
 <indexterm significance="preferred"><primary>XSetClipMask</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xsetclipmask'>
@@ -3011,7 +3007,6 @@ Specifies the pixmap or
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -3035,6 +3030,7 @@ errors.
 <!-- .sp -->
 To set the clip-mask of a given GC to the specified list of rectangles, use
 <function>XSetClipRectangles</function>.
+</para>
 <indexterm significance="preferred"><primary>XSetClipRectangles</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xsetcliprectangles'>
@@ -3128,7 +3124,6 @@ or
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -3209,6 +3204,7 @@ see <link linkend="Manipulating_Regions">section 16.5</link>.
 <!-- .LP -->
 To set the arc mode of a given GC, use
 <function>XSetArcMode</function>.
+</para>
 <indexterm significance="preferred"><primary>XSetArcMode</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xsetarcmode'>
@@ -3256,7 +3252,6 @@ or
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -3273,6 +3268,7 @@ errors.
 <!-- .sp -->
 To set the subwindow mode of a given GC, use
 <function>XSetSubwindowMode</function>.
+</para>
 <indexterm significance="preferred"><primary>XSetSubwindowMode</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xsetsubwindowmode'>
@@ -3320,7 +3316,6 @@ or
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -3337,6 +3332,7 @@ errors.
 <!-- .sp -->
 To set the graphics-exposures flag of a given GC, use
 <function>XSetGraphicsExposures</function>.
+</para>
 <indexterm significance="preferred"><primary>XSetGraphicsExposures</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xsetgraphicsexposures'>
@@ -3388,7 +3384,6 @@ with this GC.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
diff --git a/libX11/specs/libX11/CH08.xml b/libX11/specs/libX11/CH08.xml
index c0511a5cc..948040982 100644
--- a/libX11/specs/libX11/CH08.xml
+++ b/libX11/specs/libX11/CH08.xml
@@ -39,6 +39,7 @@ which sets the pixmap to a known value.
 <!-- .sp -->
 To clear a rectangular area of a given window, use
 <function>XClearArea</function>.
+</para>
 <indexterm><primary>Areas</primary><secondary>clearing</secondary></indexterm>
 <indexterm><primary>Clearing</primary><secondary>areas</secondary></indexterm>
 <indexterm significance="preferred"><primary>XClearArea</primary></indexterm>
@@ -133,7 +134,6 @@ events are to be generated.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -181,6 +181,7 @@ errors.
 <!-- .sp -->
 To clear the entire area in a given window, use
 <function>XClearWindow</function>.
+</para>
 <indexterm><primary>Window</primary><secondary>clearing</secondary></indexterm>
 <indexterm><primary>Clearing</primary><secondary>windows</secondary></indexterm>
 <indexterm significance="preferred"><primary>XClearWindow</primary></indexterm>
@@ -215,7 +216,6 @@ Specifies the window.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -265,6 +265,7 @@ Xlib provides functions that you can use to copy an area or a bit plane.
 To copy an area between drawables of the same
 root and depth, use
 <function>XCopyArea</function>.
+</para>
 <indexterm><primary>Areas</primary><secondary>copying</secondary></indexterm>
 <indexterm><primary>Copying</primary><secondary>areas</secondary></indexterm>
 <indexterm significance="preferred"><primary>XCopyArea</primary></indexterm>
@@ -393,7 +394,6 @@ Specify the x and y coordinates(Dx.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -460,6 +460,7 @@ errors.
 <!-- .LP -->
 To copy a single bit plane of a given drawable, use
 <function>XCopyPlane</function>.
+</para>
 <indexterm><primary>Plane</primary><secondary>copying</secondary></indexterm>
 <indexterm><primary>Copying</primary><secondary>planes</secondary></indexterm>
 <indexterm significance="preferred"><primary>XCopyPlane</primary></indexterm>
@@ -599,7 +600,6 @@ You must set exactly one bit to 1.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -766,6 +766,7 @@ for these values.
 <!-- .LP -->
 To draw a single point in a given drawable, use
 <function>XDrawPoint</function>.
+</para>
 <indexterm significance="preferred"><primary>XDrawPoint</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xdrawpoint'>
@@ -831,13 +832,13 @@ Specify the x and y coordinates where you want the point drawn.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
 <!-- .sp -->
 To draw multiple points in a given drawable, use
 <function>XDrawPoints</function>.
+</para>
 <indexterm significance="preferred"><primary>XDrawPoints</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xdrawpoints'>
@@ -918,7 +919,6 @@ or
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -979,6 +979,7 @@ errors.
 <!-- .LP -->
 To draw a single line between two points in a given drawable, use
 <function>XDrawLine</function>.
+</para>
 <indexterm significance="preferred"><primary>XDrawLine</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xdrawline'>
@@ -1066,13 +1067,13 @@ Specify the points (x1, y1) and (x2, y2) to be connected.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
 <!-- .sp -->
 To draw multiple lines in a given drawable, use
 <function>XDrawLines</function>.
+</para>
 <indexterm significance="preferred"><primary>XDrawLines</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xdrawlines'>
@@ -1153,7 +1154,6 @@ or
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1161,6 +1161,7 @@ or
 To draw multiple, unconnected lines in a given drawable,
 use
 <function>XDrawSegments</function>.
+</para>
 <indexterm significance="preferred"><primary>XDrawSegments</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xdrawsegments'>
@@ -1226,7 +1227,6 @@ Specifies the number of segments in the array.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1331,6 +1331,7 @@ errors.
 <!-- .LP -->
 To draw the outline of a single rectangle in a given drawable, use
 <function>XDrawRectangle</function>.
+</para>
 <indexterm significance="preferred"><primary>XDrawRectangle</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xdrawrectangle'>
@@ -1420,7 +1421,6 @@ Specify the width and height(Wh.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1428,6 +1428,7 @@ Specify the width and height(Wh.
 To draw the outline of multiple rectangles
 in a given drawable, use
 <function>XDrawRectangles</function>.
+</para>
 <indexterm significance="preferred"><primary>XDrawRectangles</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xdrawrectangles'>
@@ -1493,7 +1494,6 @@ Specifies the number of rectangles in the array.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1562,6 +1562,7 @@ errors.
 <!-- .sp -->
 To draw a single arc in a given drawable, use
 <function>XDrawArc</function>.
+</para>
 <indexterm significance="preferred"><primary>XDrawArc</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xdrawarc'>
@@ -1675,13 +1676,13 @@ arc, in units of degrees * 64.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
 <!-- .sp -->
 To draw multiple arcs in a given drawable, use
 <function>XDrawArcs</function>.
+</para>
 <indexterm significance="preferred"><primary>XDrawArcs</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xdrawarcs'>
@@ -1747,7 +1748,6 @@ Specifies the number of arcs in the array.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1920,6 +1920,7 @@ A single arc or multiple arcs
 <!-- .sp -->
 To fill a single rectangular area in a given drawable, use
 <function>XFillRectangle</function>.
+</para>
 <indexterm significance="preferred"><primary>XFillRectangle</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xfillrectangle'>
@@ -2010,13 +2011,13 @@ Specify the width and height(Wh.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
 <!-- .sp -->
 To fill multiple rectangular areas in a given drawable, use
 <function>XFillRectangles</function>.
+</para>
 <indexterm significance="preferred"><primary>XFillRectangles</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xfillrectangles'>
@@ -2082,7 +2083,6 @@ Specifies the number of rectangles in the array.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -2152,6 +2152,7 @@ To fill a polygon area in a given drawable, use
 <function>XFillPolygon</function>.
 <indexterm><primary>Polygons</primary><secondary>filling</secondary></indexterm>
 <indexterm><primary>Filling</primary><secondary>polygon</secondary></indexterm>
+</para>
 <indexterm significance="preferred"><primary>XFillPolygon</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xfillpolygon'>
@@ -2248,7 +2249,6 @@ or
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -2351,6 +2351,7 @@ errors.
 <indexterm><primary>Filling</primary><secondary>arcs</secondary></indexterm>
 To fill a single arc in a given drawable, use
 <function>XFillArc</function>.
+</para>
 <indexterm significance="preferred"><primary>XFillArc</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xfillarc'>
@@ -2464,13 +2465,13 @@ arc, in units of degrees * 64.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
 <!-- .sp -->
 To fill multiple arcs in a given drawable, use
 <function>XFillArcs</function>.
+</para>
 <indexterm significance="preferred"><primary>XFillArcs</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xfillarcs'>
@@ -2536,7 +2537,6 @@ Specifies the number of arcs in the array.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -3018,6 +3018,7 @@ resource ID or a font ID interchangeably.
 <!-- .sp -->
 To load a given font, use
 <function>XLoadFont</function>.
+</para>
 <indexterm significance="preferred"><primary>XLoadFont</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xloadfont'>
@@ -3051,7 +3052,6 @@ which is a null-terminated string.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -3094,6 +3094,7 @@ errors.
 <!-- .sp -->
 To return information about an available font, use
 <function>XQueryFont</function>.
+</para>
 <indexterm significance="preferred"><primary>XQueryFont</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xqueryfont'>
@@ -3128,7 +3129,6 @@ ID.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -3160,6 +3160,7 @@ and
 <function>XQueryFont</function>
 in a single operation, use
 <function>XLoadQueryFont</function>.
+</para>
 <indexterm significance="preferred"><primary>XLoadQueryFont</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xloadqueryfont'>
@@ -3193,7 +3194,6 @@ which is a null-terminated string.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -3228,6 +3228,7 @@ or
 <function>XLoadQueryFont</function>,
 use
 <function>XFreeFont</function>.
+</para>
 <indexterm significance="preferred"><primary>XFreeFont</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xfreefont'>
@@ -3260,7 +3261,6 @@ Specifies the storage associated with the font.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM  -->
@@ -3285,6 +3285,7 @@ error.
 <!-- .sp -->
 To return a given font property, use
 <function>XGetFontProperty</function>.
+</para>
 <indexterm significance="preferred"><primary>XGetFontProperty</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xgetfontproperty'>
@@ -3328,7 +3329,6 @@ Returns the value of the font property.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -3360,6 +3360,7 @@ To unload a font that was loaded by
 <function>XLoadFont</function>,
 use
 <function>XUnloadFont</function>.
+</para>
 <indexterm significance="preferred"><primary>XUnloadFont</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xunloadfont'>
@@ -3392,7 +3393,6 @@ Specifies the font.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -3425,6 +3425,7 @@ when querying a font type for a list of available sizes and so on.
 <!-- .sp -->
 To return a list of the available font names, use
 <function>XListFonts</function>.
+</para>
 <indexterm significance="preferred"><primary>XListFonts</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xlistfonts'>
@@ -3480,7 +3481,6 @@ Returns the actual number of font names.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -3512,6 +3512,7 @@ when finished with the result to free the memory.
 <!-- .sp -->
 To free a font name array, use
 <function>XFreeFontNames</function>.
+</para>
 <indexterm significance="preferred"><primary>XFreeFontNames</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xfreefontnames'>
@@ -3533,7 +3534,6 @@ Specifies the array of strings you want to free.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -3549,6 +3549,7 @@ or
 <!-- .sp -->
 To obtain the names and information about available fonts, use
 <function>XListFontsWithInfo</function>.
+</para>
 <indexterm significance="preferred"><primary>XListFontsWithInfo</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xlistfontswithinfo'>
@@ -3615,7 +3616,6 @@ Returns the font information.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -3656,6 +3656,7 @@ the client should call
 <!-- .sp -->
 To free font structures and font names, use
 <function>XFreeFontInfo</function>.
+</para>
 <indexterm significance="preferred"><primary>XFreeFontInfo</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xfreefontinfo'>
@@ -3702,7 +3703,6 @@ Specifies the actual number of font names.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -3740,6 +3740,7 @@ These functions return the sum of the character metrics in pixels.
 <!-- .sp -->
 To determine the width of an 8-bit character string, use
 <function>XTextWidth</function>.
+</para>
 <indexterm significance="preferred"><primary>XTextWidth</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xtextwidth'>
@@ -3783,13 +3784,13 @@ Specifies the character count in the specified string.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
 <!-- .sp -->
 To determine the width of a 2-byte character string, use
 <function>XTextWidth16</function>.
+</para>
 <indexterm significance="preferred"><primary>XTextWidth16</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xtextwidth16'>
@@ -3833,7 +3834,6 @@ Specifies the character count in the specified string.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -3848,6 +3848,7 @@ Specifies the character count in the specified string.
 <!-- .LP -->
 To compute the bounding box of an 8-bit character string in a given font, use
 <function>XTextExtents</function>.
+</para>
 <indexterm significance="preferred"><primary>XTextExtents</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xtextextents'>
@@ -3941,13 +3942,13 @@ structure.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
 <!-- .sp -->
 To compute the bounding box of a 2-byte character string in a given font, use
 <function>XTextExtents16</function>.
+</para>
 <indexterm significance="preferred"><primary>XTextExtents16</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xtextextents16'>
@@ -4041,7 +4042,6 @@ structure.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -4095,6 +4095,7 @@ undefined characters in the string are taken to have all zero metrics.
 To query the server for the bounding box of an 8-bit character string in a 
 given font, use 
 <function>XQueryTextExtents</function>.
+</para>
 <indexterm significance="preferred"><primary>XQueryTextExtents</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xquerytextextents'>
@@ -4199,7 +4200,6 @@ structure.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -4207,6 +4207,7 @@ structure.
 To query the server for the bounding box of a 2-byte character string
 in a given font, use
 <function>XQueryTextExtents16</function>.
+</para>
 <indexterm significance="preferred"><primary>XQueryTextExtents16</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xquerytextextents16'>
@@ -4311,7 +4312,6 @@ structure.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -4480,6 +4480,7 @@ structure.
 <!-- .LP -->
 To draw 8-bit characters in a given drawable, use
 <function>XDrawText</function>.
+</para>
 <indexterm significance="preferred"><primary>XDrawText</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xdrawtext'>
@@ -4569,13 +4570,13 @@ Specifies the number of text items in the array.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
 <!-- .sp -->
 To draw 2-byte characters in a given drawable, use
 <function>XDrawText16</function>.
+</para>
 <indexterm significance="preferred"><primary>XDrawText16</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xdrawtext16'>
@@ -4665,7 +4666,6 @@ Specifies the number of text items in the array.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -4736,6 +4736,7 @@ errors.
 <indexterm><primary>Drawing</primary><secondary>strings</secondary></indexterm>
 To draw 8-bit characters in a given drawable, use
 <function>XDrawString</function>.
+</para>
 <indexterm significance="preferred"><primary>XDrawString</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xdrawstring'>
@@ -4826,13 +4827,13 @@ Specifies the number of characters in the string argument.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
 <!-- .sp -->
 To draw 2-byte characters in a given drawable, use
 <function>XDrawString16</function>.
+</para>
 <indexterm significance="preferred"><primary>XDrawString16</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xdrawstring16'>
@@ -4922,7 +4923,6 @@ Specifies the number of characters in the string argument.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -4977,6 +4977,7 @@ This prevents annoying flicker on many displays.
 <!-- .sp -->
 To draw 8-bit image text characters in a given drawable, use
 <function>XDrawImageString</function>.
+</para>
 <indexterm significance="preferred"><primary>XDrawImageString</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xdrawimagestring'>
@@ -5066,13 +5067,13 @@ Specifies the number of characters in the string argument.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
 <!-- .sp -->
 To draw 2-byte image text characters in a given drawable, use
 <function>XDrawImageString16</function>.
+</para>
 <indexterm significance="preferred"><primary>XDrawImageString16</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xdrawimagestring16'>
@@ -5162,7 +5163,6 @@ Specifies the number of characters in the string argument.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -5318,6 +5318,7 @@ typedef struct _XImage {
 <!-- .sp -->
 To initialize the image manipulation routines of an image structure, use
 <function>XInitImage</function>.
+</para>
 <indexterm significance="preferred"><primary>XInitImage</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xinitimage'>
@@ -5339,7 +5340,6 @@ Specifies the image.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -5376,6 +5376,7 @@ or inconsistency in the structure, in which case the image is not changed.
 To combine an image with a rectangle of a drawable on the display,
 use
 <function>XPutImage</function>.
+</para>
 <indexterm significance="preferred"><primary>XPutImage</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xputimage'>
@@ -5504,7 +5505,6 @@ Specify the width and height(Wh.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -5565,6 +5565,7 @@ To return the contents of a rectangle in a given drawable on the display,
 use
 <function>XGetImage</function>.
 This function specifically supports rudimentary screen dumps.
+</para>
 <indexterm significance="preferred"><primary>XGetImage</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xgetimage'>
@@ -5671,7 +5672,6 @@ or
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -5752,6 +5752,7 @@ errors.
 To copy the contents of a rectangle on the display
 to a location within a preexisting image structure, use
 <function>XGetSubImage</function>.
+</para>
 <indexterm significance="preferred"><primary>XGetSubImage</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xgetsubimage'>
@@ -5894,7 +5895,6 @@ Specify the x and y coordinates(Dx.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
diff --git a/libX11/specs/libX11/CH09.xml b/libX11/specs/libX11/CH09.xml
index 294159294..50e29e070 100644
--- a/libX11/specs/libX11/CH09.xml
+++ b/libX11/specs/libX11/CH09.xml
@@ -33,6 +33,7 @@ management functions to:
 To change a window's parent to another window on the same screen, use
 <function>XReparentWindow</function>.
 There is no way to move a window between screens.
+</para>
 <indexterm significance="preferred"><primary>XReparentWindow</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xreparentwindow'>
@@ -99,7 +100,6 @@ Specify the x and y coordinates(Xy.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -217,6 +217,7 @@ when they are destroyed.
 <!-- .sp -->
 To add or remove a window from the client's save-set, use
 <function>XChangeSaveSet</function>.
+</para>
 <indexterm significance="preferred"><primary>XChangeSaveSet</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xchangesaveset'>
@@ -265,7 +266,6 @@ or
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -292,6 +292,7 @@ errors.
 <!-- .sp -->
 To add a window to the client's save-set, use
 <function>XAddToSaveSet</function>.
+</para>
 <indexterm significance="preferred"><primary>XAddToSaveSet</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xaddtosaveset'>
@@ -325,7 +326,6 @@ Specifies the window (Wi.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -351,6 +351,7 @@ errors.
 <!-- .sp -->
 To remove a window from the client's save-set, use
 <function>XRemoveFromSaveSet</function>.
+</para>
 <indexterm significance="preferred"><primary>XRemoveFromSaveSet</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xremovefromsaveset'>
@@ -384,7 +385,6 @@ Specifies the window (Wi.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -448,6 +448,7 @@ required list.
 <!-- .sp -->
 To install a colormap, use
 <function>XInstallColormap</function>.
+</para>
 <indexterm significance="preferred"><primary>XInstallColormap</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xinstallcolormap'>
@@ -480,7 +481,6 @@ Specifies the colormap.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -521,6 +521,7 @@ error.
 <!-- .sp -->
 To uninstall a colormap, use
 <function>XUninstallColormap</function>.
+</para>
 <indexterm significance="preferred"><primary>XUninstallColormap</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xuninstallcolormap'>
@@ -553,7 +554,6 @@ Specifies the colormap.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -592,6 +592,7 @@ error.
 <!-- .sp -->
 To obtain a list of the currently installed colormaps for a given screen, use
 <function>XListInstalledColormaps</function>.
+</para>
 <indexterm significance="preferred"><primary>XListInstalledColormaps</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xlistinstalledcolormaps'>
@@ -636,7 +637,6 @@ Returns the number of currently installed colormaps.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -674,6 +674,7 @@ search path for a server.
 <!-- .sp -->
 To set the font search path, use
 <function>XSetFontPath</function>.
+</para>
 <indexterm significance="preferred"><primary>XSetFontPath</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xsetfontpath'>
@@ -719,7 +720,6 @@ Specifies the number of directories in the path.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -752,6 +752,7 @@ error.
 <!-- .sp -->
 To get the current font search path, use
 <function>XGetFontPath</function>.
+</para>
 <indexterm significance="preferred"><primary>XGetFontPath</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xgetfontpath'>
@@ -784,7 +785,6 @@ Returns the number of strings in the font path array.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -804,6 +804,7 @@ To free data returned by
 <function>XGetFontPath</function>,
 use
 <function>XFreeFontPath</function>.
+</para>
 <indexterm significance="preferred"><primary>XFreeFontPath</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xfreefontpath'>
@@ -825,7 +826,6 @@ Specifies the array of strings you want to free.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -858,6 +858,7 @@ Although grabbing the server is highly discouraged, it is sometimes necessary.
 <!-- .sp -->
 To grab the server, use
 <function>XGrabServer</function>.
+</para>
 <indexterm><primary>Server</primary><secondary>grabbing</secondary></indexterm>
 <indexterm><primary>Grabbing</primary><secondary>server</secondary></indexterm>
 <indexterm significance="preferred"><primary>XGrabServer</primary></indexterm>
@@ -881,7 +882,6 @@ Specifies the connection to the X server.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -896,6 +896,7 @@ You should not grab the X server any more than is absolutely necessary.
 <!-- .sp -->
 To ungrab the server, use
 <function>XUngrabServer</function>.
+</para>
 <indexterm significance="preferred"><primary>XUngrabServer</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xungrabserver'>
@@ -917,7 +918,6 @@ Specifies the connection to the X server.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -938,6 +938,7 @@ Xlib provides a function to cause the connection to
 a client to be closed and its resources to be destroyed.
 To destroy a client, use
 <function>XKillClient</function>.
+</para>
 <indexterm significance="preferred"><primary>XKillClient</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xkillclient'>
@@ -971,7 +972,6 @@ Specifies any resource associated with the client that you want to destroy or
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1025,6 +1025,7 @@ or to obtain the current screen saver values.
 <!-- .sp -->
 To set the screen saver mode, use
 <function>XSetScreenSaver</function>.
+</para>
 <indexterm significance="preferred"><primary>XSetScreenSaver</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xsetscreensaver'>
@@ -1099,7 +1100,6 @@ or
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1160,6 +1160,7 @@ error.
 <!-- .sp -->
 To force the screen saver on or off, use
 <function>XForceScreenSaver</function>.
+</para>
 <indexterm significance="preferred"><primary>XForceScreenSaver</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xforcescreensaver'>
@@ -1196,7 +1197,6 @@ or
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1226,6 +1226,7 @@ error.
 <!-- .sp -->
 To activate the screen saver, use
 <function>XActivateScreenSaver</function>.
+</para>
 <indexterm significance="preferred"><primary>XActivateScreenSaver</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xactivatescreensaver'>
@@ -1247,13 +1248,13 @@ Specifies the connection to the X server.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
 <!-- .sp -->
 To reset the screen saver, use
 <function>XResetScreenSaver</function>.
+</para>
 <indexterm significance="preferred"><primary>XResetScreenSaver</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xresetscreensaver'>
@@ -1275,13 +1276,13 @@ Specifies the connection to the X server.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
 <!-- .sp -->
 To get the current screen saver values, use
 <function>XGetScreenSaver</function>.
+</para>
 <indexterm significance="preferred"><primary>XGetScreenSaver</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xgetscreensaver'>
@@ -1354,7 +1355,6 @@ or
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1529,6 +1529,7 @@ specify the length in byte of the type and value strings.
 <!-- .sp -->
 To add a single host, use
 <function>XAddHost</function>.
+</para>
 <indexterm significance="preferred"><primary>XAddHost</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xaddhost'>
@@ -1562,7 +1563,6 @@ Specifies the host that is to be (Ho.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1587,6 +1587,7 @@ errors.
 <!-- .sp -->
 To add multiple hosts at one time, use
 <function>XAddHosts</function>.
+</para>
 <indexterm significance="preferred"><primary>XAddHosts</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xaddhosts'>
@@ -1631,7 +1632,6 @@ Specifies the number of hosts.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1656,6 +1656,7 @@ errors.
 <!-- .sp -->
 To obtain a host list, use
 <function>XListHosts</function>.
+</para>
 <indexterm significance="preferred"><primary>XListHosts</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xlisthosts'>
@@ -1699,7 +1700,6 @@ Returns the state of the access control.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1720,6 +1720,7 @@ this memory should be freed by calling
 <!-- .sp -->
 To remove a single host, use
 <function>XRemoveHost</function>.
+</para>
 <indexterm significance="preferred"><primary>XRemoveHost</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xremovehost'>
@@ -1753,7 +1754,6 @@ Specifies the host that is to be (Ho.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1782,6 +1782,7 @@ errors.
 <!-- .sp -->
 To remove multiple hosts at one time, use
 <function>XRemoveHosts</function>.
+</para>
 <indexterm significance="preferred"><primary>XRemoveHosts</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xremovehosts'>
@@ -1826,7 +1827,6 @@ Specifies the number of hosts.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1873,6 +1873,7 @@ at connection setup.
 <!-- .sp -->
 To change access control, use
 <function>XSetAccessControl</function>.
+</para>
 <indexterm significance="preferred"><primary>XSetAccessControl</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xsetaccesscontrol'>
@@ -1909,7 +1910,6 @@ or
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1932,6 +1932,7 @@ errors.
 <!-- .sp -->
 To enable access control, use
 <function>XEnableAccessControl</function>.
+</para>
 <indexterm significance="preferred"><primary>XEnableAccessControl</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xenableaccesscontrol'>
@@ -1953,7 +1954,6 @@ Specifies the connection to the X server.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1973,6 +1973,7 @@ error.
 <!-- .sp -->
 To disable access control, use
 <function>XDisableAccessControl</function>.
+</para>
 <indexterm significance="preferred"><primary>XDisableAccessControl</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xdisableaccesscontrol'>
@@ -1994,7 +1995,6 @@ Specifies the connection to the X server.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
diff --git a/libX11/specs/libX11/CH10.xml b/libX11/specs/libX11/CH10.xml
index 8a06a706f..d3ddd3407 100644
--- a/libX11/specs/libX11/CH10.xml
+++ b/libX11/specs/libX11/CH10.xml
@@ -80,13 +80,13 @@ The processing associated with these events is discussed in section 10.5.
 <para>
 <!-- .LP -->
 <informaltable>
-  <tgroup cols='2' align='center'>
+  <tgroup cols='2'>
   <colspec colname='c1'/>
   <colspec colname='c2'/>
   <thead>
     <row>
-      <entry>Event Category</entry>
-      <entry>Event Type</entry>
+      <entry align='left'>Event Category</entry>
+      <entry align='left'>Event Type</entry>
     </row>
   </thead>
   <tbody>
@@ -370,13 +370,13 @@ event mask:
 <!-- .\" .CP T 2 -->
 <!-- .\"Event Mask Definitions -->
 <informaltable>
-  <tgroup cols='2' align='center'>
+  <tgroup cols='2'>
   <colspec colname='c1'/>
   <colspec colname='c2'/>
   <thead>
     <row>
-      <entry>Event Mask</entry>
-      <entry>Circumstances</entry>
+      <entry align='left'>Event Mask</entry>
+      <entry align='left'>Circumstances</entry>
     </row>
   </thead>
   <tbody>
@@ -558,42 +558,34 @@ Note that N.A. appears in columns for which the information is not applicable.
 <!-- .ps 9 -->
 <!-- .nr PS 9 -->
 <informaltable>
-  <tgroup cols='4' align='center'>
+  <tgroup cols='4'>
   <colspec colname='c1'/>
   <colspec colname='c2'/>
   <colspec colname='c3'/>
   <colspec colname='c4'/>
   <thead>
     <row>
-      <entry>Event Mask</entry>
-      <entry>Event Type</entry>
-      <entry>Structure</entry>
-      <entry>Generic Structure</entry>
+      <entry align='left'>Event Mask</entry>
+      <entry align='left'>Event Type</entry>
+      <entry align='left'>Structure</entry>
+      <entry align='left'>Generic Structure</entry>
     </row>
   </thead>
   <tbody>
     <row>
-      <entry>ButtonMotionMask</entry>
+      <entry>
+      <para>ButtonMotionMask</para>
+      <para>Button1MotionMask</para>
+      <para>Button2MotionMask</para>
+      <para>Button3MotionMask</para>
+      <para>Button4MotionMask</para>
+      <para>Button5MotionMask</para>
+      </entry>
       <entry>MotionNotify</entry>
       <entry>XPointerMovedEvent</entry>
       <entry>XMotionEvent</entry>
     </row>
     <row>
-      <entry>Button1MotionMask</entry>
-    </row>
-    <row>
-      <entry>Button2MotionMask</entry>
-    </row>
-    <row>
-      <entry>Button3MotionMask</entry>
-    </row>
-    <row>
-      <entry>Button4MotionMask</entry>
-    </row>
-    <row>
-      <entry>Button5MotionMask</entry>
-    </row>
-    <row>
       <entry>ButtonPressMask</entry>
       <entry>ButtonPress</entry>
       <entry>XButtonPressedEvent</entry>
@@ -628,23 +620,21 @@ Note that N.A. appears in columns for which the information is not applicable.
       <entry>XExposeEvent </entry>
     </row>
     <row>
-      <entry>GCGraphicsExposures in GC</entry>
+      <entry morerows='1'>GCGraphicsExposures in GC</entry>
       <entry>GraphicsExpose</entry>
       <entry>XGraphicsExposeEvent</entry>
     </row>
     <row>
-      <entry></entry>
       <entry>NoExpose</entry>
       <entry>XNoExposeEvent</entry>
     </row>
     <row>
-      <entry>FocusChangeMask</entry>
+      <entry morerows='1'>FocusChangeMask</entry>
       <entry>FocusIn</entry>
       <entry>XFocusInEvent</entry>
       <entry>XFocusChangeEvent</entry>
     </row>
     <row>
-      <entry></entry>
       <entry>FocusOut</entry>
       <entry>XFocusOutEvent</entry>
       <entry>XFocusChangeEvent</entry>
@@ -693,92 +683,77 @@ Note that N.A. appears in columns for which the information is not applicable.
       <entry>XResizeRequestEvent</entry>
     </row>
     <row>
-      <entry>StructureNotifyMask</entry>
+      <entry morerows='6'>StructureNotifyMask</entry>
       <entry>CirculateNotify</entry>
       <entry>XCirculateEvent</entry>
     </row>
     <row>
-      <entry></entry>
       <entry>ConfigureNotify</entry>
       <entry>XConfigureEvent</entry>
     </row>
     <row>
-      <entry></entry>
       <entry>DestroyNotify</entry>
       <entry>XDestroyWindowEvent</entry>
     </row>
     <row>
-      <entry></entry>
       <entry>GravityNotify</entry>
       <entry>XGravityEvent</entry>
     </row>
     <row>
-      <entry></entry>
       <entry>MapNotify</entry>
       <entry>XMapEvent</entry>
     </row>
     <row>
-      <entry></entry>
       <entry>ReparentNotify</entry>
       <entry>XReparentEvent</entry>
     </row>
     <row>
-      <entry></entry>
       <entry>UnmapNotify</entry>
       <entry>XUnmapEvent</entry>
     </row>
     <row>
-      <entry>SubstructureNotifyMask</entry>
+      <entry morerows='7'>SubstructureNotifyMask</entry>
       <entry>CirculateNotify</entry>
       <entry>XCirculateEvent</entry>
     </row>
     <row>
-      <entry></entry>
       <entry>ConfigureNotify</entry>
       <entry>XConfigureEvent</entry>
     </row>
     <row>
-      <entry></entry>
       <entry>CreateNotify</entry>
       <entry>XCreateWindowEvent</entry>
     </row>
     <row>
-      <entry></entry>
       <entry>DestroyNotify</entry>
       <entry>XDestroyWindowEvent</entry>
     </row>
     <row>
-      <entry></entry>
       <entry>GravityNotify</entry>
       <entry>XGravityEvent</entry>
     </row>
     <row>
-      <entry></entry>
       <entry>MapNotify</entry>
       <entry>XMapEvent</entry>
     </row>
     <row>
-      <entry></entry>
       <entry>ReparentNotify</entry>
       <entry>XReparentEvent</entry>
     </row>
     <row>
-      <entry></entry>
       <entry>UnmapNotify</entry>
       <entry>XUnmapEvent</entry>
     </row>
     <row>
-      <entry>SubstructureRedirectMask</entry>
+      <entry morerows='2'>SubstructureRedirectMask</entry>
       <entry>CirculateRequest</entry>
       <entry>XCirculateRequestEvent</entry>
     </row>
     <row>
-      <entry></entry>
       <entry>ConfigureRequest</entry>
       <entry>XConfigureRequestEvent</entry>
     </row>
     <row>
-      <entry></entry>
       <entry>MapRequest</entry>
       <entry>XMapRequestEvent</entry>
     </row>
@@ -812,9 +787,6 @@ Note that N.A. appears in columns for which the information is not applicable.
       <entry>VisibilityNotify</entry>
       <entry>XVisibilityEvent</entry>
     </row>
-    <row>
-      <entry>_</entry>
-    </row>
   </tbody>
   </tgroup>
 </informaltable>
@@ -919,13 +891,13 @@ The effect is essentially equivalent to an
 with these client passed arguments:
 </para>
 <informaltable>
-  <tgroup cols='2' align='center'>
+  <tgroup cols='2'>
   <colspec colname='c1'/>
   <colspec colname='c2'/>
   <thead>
     <row>
-      <entry>Argument</entry>
-      <entry>Value</entry>
+      <entry align='left'>Argument</entry>
+      <entry align='left'>Value</entry>
     </row>
   </thead>
   <tbody>
@@ -1316,13 +1288,13 @@ Some of the symbols mentioned in this section have fixed values, as
 follows:
 </para>
 <informaltable>
-  <tgroup cols='2' align='center'>
+  <tgroup cols='2'>
   <colspec colname='c1'/>
   <colspec colname='c2'/>
   <thead>
     <row>
-      <entry>Symbol</entry>
-      <entry>Value</entry>
+      <entry align='left'>Symbol</entry>
+      <entry align='left'>Value</entry>
     </row>
   </thead>
   <tbody>
diff --git a/libX11/specs/libX11/CH11.xml b/libX11/specs/libX11/CH11.xml
index 99f56ff31..39140bbf6 100644
--- a/libX11/specs/libX11/CH11.xml
+++ b/libX11/specs/libX11/CH11.xml
@@ -43,6 +43,7 @@ and
 <function>XChangeWindowAttributes</function>.
 Another way is to use
 <function>XSelectInput</function>.
+</para>
 <indexterm significance="preferred"><primary>XSelectInput</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xselectinput'>
@@ -87,7 +88,6 @@ Specifies the event mask.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM  -->
@@ -181,6 +181,7 @@ These functions differ in the additional tasks they might perform.
 <!-- .sp -->
 To flush the output buffer, use 
 <function>XFlush</function>.
+</para>
 <indexterm significance="preferred"><primary>XFlush</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xflush'>
@@ -202,7 +203,6 @@ Specifies the connection to the X server.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -227,6 +227,7 @@ Events generated by the server may be enqueued into the library's event queue.
 To flush the output buffer and then wait until all requests have been processed,
 use 
 <function>XSync</function>.
+</para>
 <indexterm significance="preferred"><primary>XSync</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xsync'>
@@ -261,7 +262,6 @@ discards all events on the event queue.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -311,6 +311,7 @@ in its network connection that is not yet read into the event queue.
 <!-- .sp -->
 To check the number of events in the event queue, use
 <function>XEventsQueued</function>.
+</para>
 <indexterm significance="preferred"><primary>XEventsQueued</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xeventsqueued'>
@@ -348,7 +349,6 @@ or
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -397,6 +397,7 @@ function.
 <!-- .sp -->
 To return the number of events that are pending, use 
 <function>XPending</function>.
+</para>
 <indexterm significance="preferred"><primary>XPending</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xpending'>
@@ -418,7 +419,6 @@ Specifies the connection to the X server.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -471,6 +471,7 @@ predicate procedures that you provide
 <!-- .LP -->
 To get the next event and remove it from the queue, use
 <function>XNextEvent</function>.
+</para>
 <indexterm significance="preferred"><primary>XNextEvent</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xnextevent'>
@@ -503,7 +504,6 @@ Returns the next event in the queue.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -521,6 +521,7 @@ flushes the output buffer and blocks until an event is received.
 <!-- .sp -->
 To peek at the event queue, use
 <function>XPeekEvent</function>.
+</para>
 <indexterm significance="preferred"><primary>XPeekEvent</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xpeekevent'>
@@ -553,7 +554,6 @@ Returns a copy of the matched event's associated structure.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -592,6 +592,7 @@ has first called
 <para>
 <!-- .LP -->
 The predicate procedure and its associated arguments are:
+</para>
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
@@ -641,7 +642,6 @@ function.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -658,6 +658,7 @@ If it did not find a match, it must return
 To check the event queue for a matching event
 and, if found, remove the event from the queue, use
 <function>XIfEvent</function>.
+</para>
 <indexterm significance="preferred"><primary>XIfEvent</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xifevent'>
@@ -713,7 +714,6 @@ Specifies the user-supplied argument that will be passed to the predicate proced
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -737,6 +737,7 @@ structure.
 <!-- .sp -->
 To check the event queue for a matching event without blocking, use
 <function>XCheckIfEvent</function>.
+</para>
 <indexterm significance="preferred"><primary>XCheckIfEvent</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xcheckifevent'>
@@ -792,7 +793,6 @@ Specifies the user-supplied argument that will be passed to the predicate proced
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -816,6 +816,7 @@ All earlier events stored in the queue are not discarded.
 To check the event queue for a matching event
 without removing the event from the queue, use
 <function>XPeekIfEvent</function>.
+</para>
 <indexterm significance="preferred"><primary>XPeekIfEvent</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xpeekifevent'>
@@ -871,7 +872,6 @@ Specifies the user-supplied argument that will be passed to the predicate proced
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -905,6 +905,7 @@ or event types, allowing you to process events out of order.
 <!-- .sp -->
 To remove the next event that matches both a window and an event mask, use
 <function>XWindowEvent</function>.
+</para>
 <indexterm significance="preferred"><primary>XWindowEvent</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xwindowevent'>
@@ -960,7 +961,6 @@ Returns the matched event's associated structure.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -990,6 +990,7 @@ This function is similar to
 except that it never blocks and it returns a 
 <type>Bool</type>
 indicating if the event was returned.
+</para>
 <indexterm significance="preferred"><primary>XCheckWindowEvent</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xcheckwindowevent'>
@@ -1045,7 +1046,6 @@ Returns the matched event's associated structure.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1072,6 +1072,7 @@ and the output buffer will have been flushed.
 <!-- .sp -->
 To remove the next event that matches an event mask, use
 <function>XMaskEvent</function>.
+</para>
 <indexterm significance="preferred"><primary>XMaskEvent</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xmaskevent'>
@@ -1115,7 +1116,6 @@ Returns the matched event's associated structure.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1143,6 +1143,7 @@ This function is similar to
 except that it never blocks and it returns a 
 <type>Bool</type>
 indicating if the event was returned.
+</para>
 <indexterm significance="preferred"><primary>XCheckMaskEvent</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xcheckmaskevent'>
@@ -1186,7 +1187,6 @@ Returns the matched event's associated structure.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1212,6 +1212,7 @@ and the output buffer will have been flushed.
 <!-- .sp  -->
 To return and remove the next event in the queue that matches an event type, use
 <function>XCheckTypedEvent</function>.
+</para>
 <indexterm significance="preferred"><primary>XCheckTypedEvent</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xchecktypedevent'>
@@ -1256,7 +1257,6 @@ Returns the matched event's associated structure.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1283,6 +1283,7 @@ and the output buffer will have been flushed.
 To return and remove the next event in the queue that matches an event type 
 and a window, use
 <function>XCheckTypedWindowEvent</function>.
+</para>
 <indexterm significance="preferred"><primary>XCheckTypedWindowEvent</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xchecktypedwindowevent'>
@@ -1338,7 +1339,6 @@ Returns the matched event's associated structure.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1371,6 +1371,7 @@ and the output buffer will have been flushed.
 <!-- .LP -->
 To push an event back into the event queue, use
 <function>XPutBackEvent</function>.
+</para>
 <indexterm significance="preferred"><primary>XPutBackEvent</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xputbackevent'>
@@ -1403,7 +1404,6 @@ Specifies the event.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM  -->
@@ -1434,6 +1434,7 @@ to send a
 <symbol>SelectionNotify</symbol>
 event to a requestor when a selection has been converted 
 and stored as a property.
+</para>
 <indexterm significance="preferred"><primary>XSendEvent</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xsendevent'>
@@ -1502,7 +1503,6 @@ Specifies the event that is to be sent.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1632,6 +1632,7 @@ However, this historical information is highly excessive for most applications.
 To determine the approximate maximum number of elements in the motion buffer, 
 use
 <function>XDisplayMotionBufferSize</function>.
+</para>
 <indexterm significance="preferred"><primary>XDisplayMotionBufferSize</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xdisplaymotionbuffersize'>
@@ -1653,7 +1654,6 @@ Specifies the connection to the X server.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1670,6 +1670,7 @@ function makes this history available.
 <!-- .sp -->
 To get the motion history for a specified window and time, use
 <function>XGetMotionEvents</function>.
+</para>
 <indexterm significance="preferred"><primary>XGetMotionEvents</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xgetmotionevents'>
@@ -1738,7 +1739,6 @@ Returns the number of events from the motion history buffer.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1826,6 +1826,7 @@ all Xlib functions that generate protocol requests call what is known as
 an after function.
 <function>XSetAfterFunction</function>
 sets which function is to be called.
+</para>
 <indexterm significance="preferred"><primary>XSetAfterFunction</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xsetafterfunction'>
@@ -1858,7 +1859,6 @@ Specifies the procedure to be called.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1870,6 +1870,7 @@ returns the previous after function.
 <!-- .LP -->
 To enable or disable synchronization, use 
 <function>XSynchronize</function>.
+</para>
 <indexterm><primary>Debugging</primary><secondary>synchronous mode</secondary></indexterm>
 <indexterm significance="preferred"><primary>XSynchronize</primary></indexterm>
 <!-- .sM -->
@@ -1904,7 +1905,6 @@ or disable synchronization.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1947,6 +1947,7 @@ message and exit.
 <!-- .sp -->
 To set the error handler, use
 <function>XSetErrorHandler</function>.
+</para>
 <indexterm significance="preferred"><primary>XSetErrorHandler</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xseterrorhandler'>
@@ -1968,7 +1969,6 @@ Specifies the program's supplied error handler.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM  -->
@@ -2049,40 +2049,30 @@ chapter:
 <indexterm significance="preferred"><primary>BadFont</primary></indexterm>
 <indexterm significance="preferred"><primary>BadGC</primary></indexterm>
 <indexterm significance="preferred"><primary>BadIDChoice</primary></indexterm>
-<informaltable>
-  <tgroup cols='2' align='center'>
+<informaltable frame='none'>
+  <tgroup cols='2'>
   <colspec colname='c1'/>
   <colspec colname='c2'/>
   <thead>
     <row>
-      <entry>Error Code</entry>
-      <entry>Description</entry>
+      <entry align='left'>Error Code</entry>
+      <entry align='left'>Description</entry>
     </row>
   </thead>
   <tbody>
     <row>
       <entry><errorname id='BadAccess'>BadAccess</errorname></entry>
-      <entry>A client attempts to grab a key/button combination already grabbed
-      by another client.</entry>
-    </row>
-    <row>
-      <entry></entry>
-      <entry>A client attempts to free a colormap entry that it had not already allocated
-      or to free an entry in a colormap that was created with all entries writable.</entry>
-    </row>
-    <row>
-      <entry></entry>
-      <entry>A client attempts to store into a read-only or unallocated colormap entry.</entry>
-    </row>
-    <row>
-      <entry></entry>
-      <entry>A client attempts to modify the access control list from other than the local
-      (or otherwise authorized) host.</entry>
-    </row>
-    <row>
-      <entry></entry>
-      <entry>A client attempts to select an event type that another client
-      has already selected.</entry>
+      <entry>
+      <para>A client attempts to grab a key/button combination already grabbed
+      by another client.</para>
+      <para>A client attempts to free a colormap entry that it had not already allocated
+      or to free an entry in a colormap that was created with all entries writable.</para>
+      <para>A client attempts to store into a read-only or unallocated colormap entry.</para>
+      <para>A client attempts to modify the access control list from other than the local
+      (or otherwise authorized) host.</para>
+      <para>A client attempts to select an event type that another client
+      has already selected.</para>
+      </entry>
     </row>
     <row>
       <entry><errorname id='BadAlloc'>BadAlloc</errorname></entry>
@@ -2144,34 +2134,22 @@ chapter:
     </row>
     <row>
       <entry><errorname id='BadLength'>BadLength</errorname></entry>
-      <entry>The length of a request is shorter or longer than that required to
+      <entry><para>The length of a request is shorter or longer than that required to
       contain the arguments.
-      This is an internal Xlib or server error.</entry>
-    </row>
-    <row>
-      <entry></entry>
-      <entry>
-      The length of a request exceeds the maximum length accepted by the server.</entry>
+      This is an internal Xlib or server error.</para>
+      <para>The length of a request exceeds the maximum length accepted by the server.</para>
+      </entry>
     </row>
     <row>
       <entry><errorname id='BadMatch'>BadMatch</errorname></entry>
-      <entry>In a graphics request,
-      the root and depth of the graphics context do not match those of the drawable.</entry>
-    </row>
-    <row>
-      <entry></entry>
-      <entry>An <symbol>InputOnly</symbol> window is used as a drawable.</entry>
-    </row>
-    <row>
-      <entry></entry>
-      <entry>
-      Some argument or pair of arguments has the correct type and range,
-      but it fails to match in some other way required by the request.</entry>
-    </row>
-    <row>
-      <entry></entry>
-      <entry>An <symbol>InputOnly</symbol>
-      window lacks this attribute.</entry>
+      <entry><para>In a graphics request,
+      the root and depth of the graphics context do not match those of the drawable.</para>
+      <para>An <symbol>InputOnly</symbol> window is used as a drawable.</para>
+      <para>Some argument or pair of arguments has the correct type and range,
+      but it fails to match in some other way required by the request.</para>
+      <para>An <symbol>InputOnly</symbol>
+      window lacks this attribute.</para>
+      </entry>
     </row>
     <row>
       <entry><errorname id='BadName'>BadName</errorname></entry>
@@ -2236,6 +2214,7 @@ fixed alternatives.
 <!-- .LP -->
 To obtain textual descriptions of the specified error code, use 
 <function>XGetErrorText</function>.
+</para>
 <indexterm significance="preferred"><primary>XGetErrorText</primary></indexterm>
 <indexterm><primary>Debugging</primary><secondary>error message strings</secondary></indexterm>
 <!-- .sM -->
@@ -2291,7 +2270,6 @@ Specifies the size of the buffer.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM  -->
@@ -2309,6 +2287,7 @@ and error strings.
 <!-- .sp -->
 To obtain error messages from the error database, use
 <function>XGetErrorDatabaseText</function>.
+</para>
 <indexterm significance="preferred"><primary>XGetErrorDatabaseText</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xgeterrordatabasetext'>
@@ -2384,7 +2363,6 @@ Specifies the size of the buffer.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -2454,6 +2432,7 @@ the default_string is returned to the buffer argument.
 <!-- .sp -->
 To report an error to the user when the requested display does not exist, use
 <function>XDisplayName</function>.
+</para>
 <indexterm significance="preferred"><primary>XDisplayName</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xdisplayname'>
@@ -2475,7 +2454,6 @@ Specifies the character string.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -2497,6 +2475,7 @@ program attempted to open when the initial connection attempt failed.
 <!-- .sp -->
 To handle fatal I/O errors, use
 <function>XSetIOErrorHandler</function>.
+</para>
 <indexterm significance="preferred"><primary>XSetIOErrorHandler</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xsetioerrorhandler'>
@@ -2518,7 +2497,6 @@ Specifies the program's supplied error handler.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
diff --git a/libX11/specs/libX11/CH12.xml b/libX11/specs/libX11/CH12.xml
index 01549f659..687f575cb 100644
--- a/libX11/specs/libX11/CH12.xml
+++ b/libX11/specs/libX11/CH12.xml
@@ -155,6 +155,7 @@ and
 <!-- .sp -->
 To grab the pointer, use
 <function>XGrabPointer</function>.
+</para>
 <indexterm><primary>Grabbing</primary><secondary>pointer</secondary></indexterm>
 <indexterm><primary>Pointer</primary><secondary>grabbing</secondary></indexterm>
 <indexterm significance="preferred"><primary>XGrabPointer</primary></indexterm>
@@ -280,7 +281,6 @@ You can pass either a timestamp or
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -421,6 +421,7 @@ errors.
 <!-- .sp -->
 To ungrab the pointer, use
 <function>XUngrabPointer</function>.
+</para>
 <indexterm><primary>Ungrabbing</primary><secondary>pointer</secondary></indexterm>
 <indexterm><primary>Pointer</primary><secondary>ungrabbing</secondary></indexterm>
 <indexterm significance="preferred"><primary>XUngrabPointer</primary></indexterm>
@@ -457,7 +458,6 @@ You can pass either a timestamp or
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -489,6 +489,7 @@ outside the boundaries of the root window.
 <!-- .sp -->
 To change an active pointer grab, use
 <function>XChangeActivePointerGrab</function>.
+</para>
 <indexterm><primary>Pointer</primary><secondary>grabbing</secondary></indexterm>
 <indexterm ><primary>Changing</primary><secondary>pointer grab</secondary></indexterm>
 <indexterm significance="preferred"><primary>XChangeActivePointerGrab</primary></indexterm>
@@ -549,7 +550,6 @@ You can pass either a timestamp or
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -577,6 +577,7 @@ errors.
 <!-- .sp -->
 To grab a pointer button, use
 <function>XGrabButton</function>.
+</para>
 <indexterm><primary>Grabbing</primary><secondary>buttons</secondary></indexterm>
 <indexterm><primary>Button</primary><secondary>grabbing</secondary></indexterm>
 <indexterm significance="preferred"><primary>XGrabButton</primary></indexterm>
@@ -715,7 +716,6 @@ Specifies the cursor that is to be displayed or
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -821,6 +821,7 @@ errors.
 <!-- .sp -->
 To ungrab a pointer button, use
 <function>XUngrabButton</function>.
+</para>
 <indexterm><primary>Ungrabbing</primary><secondary>buttons</secondary></indexterm>
 <indexterm><primary>Button</primary><secondary>ungrabbing</secondary></indexterm>
 <indexterm significance="preferred"><primary>XUngrabButton</primary></indexterm>
@@ -881,7 +882,6 @@ Specifies the grab window.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -942,6 +942,7 @@ and
 <!-- .sp -->
 To grab the keyboard, use
 <function>XGrabKeyboard</function>.
+</para>
 <indexterm><primary>Keyboard</primary><secondary>grabbing</secondary></indexterm>
 <indexterm><primary>Grabbing</primary><secondary>keyboard</secondary></indexterm>
 <indexterm significance="preferred"><primary>XGrabKeyboard</primary></indexterm>
@@ -1030,7 +1031,6 @@ You can pass either a timestamp or
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1130,6 +1130,7 @@ errors.
 <!-- .sp -->
 To ungrab the keyboard, use
 <function>XUngrabKeyboard</function>.
+</para>
 <indexterm><primary>Keyboard</primary><secondary>ungrabbing</secondary></indexterm>
 <indexterm><primary>Ungrabbing</primary><secondary>keyboard</secondary></indexterm>
 <indexterm significance="preferred"><primary>XUngrabKeyboard</primary></indexterm>
@@ -1166,7 +1167,6 @@ You can pass either a timestamp or
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1197,6 +1197,7 @@ active keyboard grab becomes not viewable.
 <!-- .sp -->
 To passively grab a single key of the keyboard, use
 <function>XGrabKey</function>.
+</para>
 <indexterm><primary>Key</primary><secondary>grabbing</secondary></indexterm>
 <indexterm><primary>Grabbing</primary><secondary>keys</secondary></indexterm>
 <indexterm significance="preferred"><primary>XGrabKey</primary></indexterm>
@@ -1297,7 +1298,6 @@ or
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1401,6 +1401,7 @@ errors.
 <!-- .sp -->
 To ungrab a key, use
 <function>XUngrabKey</function>.
+</para>
 <indexterm><primary>Key</primary><secondary>ungrabbing</secondary></indexterm>
 <indexterm><primary>Ungrabbing</primary><secondary>keys</secondary></indexterm>
 <indexterm significance="preferred"><primary>XUngrabKey</primary></indexterm>
@@ -1460,7 +1461,6 @@ Specifies the grab window.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1504,6 +1504,7 @@ describes the mechanism for resuming event processing.
 <!-- .sp -->
 To allow further events to be processed when the device has been frozen, use
 <function>XAllowEvents</function>.
+</para>
 <indexterm significance="preferred"><primary>XAllowEvents</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xallowevents'>
@@ -1559,7 +1560,6 @@ You can pass either a timestamp or
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1572,8 +1572,8 @@ time of the most recent active grab for the client or if the specified time
 is later than the current X server time.
 Depending on the event_mode argument, the following occurs:
 </para>
-<informaltable>
-  <tgroup cols='2' align='center'>
+<informaltable frame='none'>
+  <tgroup cols='2'>
   <colspec colname='c1'/>
   <colspec colname='c2'/>
   <tbody>
@@ -1759,6 +1759,7 @@ pointer to a new position under program control.
 <!-- .sp -->
 To move the pointer to an arbitrary point in a window, use
 <function>XWarpPointer</function>.
+</para>
 <indexterm significance="preferred"><primary>XWarpPointer</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xwarppointer'>
@@ -1870,7 +1871,6 @@ Specify the x and y coordinates within the destination window.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1933,6 +1933,7 @@ for input focus policy.
 <!-- .sp -->
 To set the input focus, use
 <function>XSetInputFocus</function>.
+</para>
 <indexterm significance="preferred"><primary>XSetInputFocus</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xsetinputfocus'>
@@ -1998,7 +1999,6 @@ You can pass either a timestamp or
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -2107,6 +2107,7 @@ errors.
 <!-- .sp -->
 To obtain the current input focus, use
 <function>XGetInputFocus</function>.
+</para>
 <indexterm significance="preferred"><primary>XGetInputFocus</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xgetinputfocus'>
@@ -2157,7 +2158,6 @@ or
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -2322,6 +2322,7 @@ If an error is generated, a subset of the controls may have been altered.
 <para>
 <!-- .LP -->
 <!-- .sp -->
+</para>
 <indexterm significance="preferred"><primary>XChangeKeyboardControl</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xchangekeyboardcontrol'>
@@ -2366,7 +2367,6 @@ Specifies one value for each bit set to 1 in the mask.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -2391,6 +2391,7 @@ errors.
 <!-- .sp -->
 To obtain the current control values for the keyboard, use
 <function>XGetKeyboardControl</function>.
+</para>
 <indexterm significance="preferred"><primary>XGetKeyboardControl</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xgetkeyboardcontrol'>
@@ -2425,7 +2426,6 @@ structure.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -2475,6 +2475,7 @@ with the least significant bit in the byte representing key 8N.
 <!-- .sp -->
 To turn on keyboard auto-repeat, use
 <function>XAutoRepeatOn</function>.
+</para>
 <indexterm significance="preferred"><primary>XAutoRepeatOn</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xautorepeaton'>
@@ -2496,7 +2497,6 @@ Specifies the connection to the X server.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -2509,6 +2509,7 @@ function turns on auto-repeat for the keyboard on the specified display.
 <!-- .sp -->
 To turn off keyboard auto-repeat, use
 <function>XAutoRepeatOff</function>.
+</para>
 <indexterm significance="preferred"><primary>XAutoRepeatOff</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xautorepeatoff'>
@@ -2530,7 +2531,6 @@ Specifies the connection to the X server.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -2543,6 +2543,7 @@ function turns off auto-repeat for the keyboard on the specified display.
 <!-- .sp -->
 To ring the bell, use
 <function>XBell</function>.
+</para>
 <indexterm significance="preferred"><primary>XBell</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xbell'>
@@ -2576,7 +2577,6 @@ which can range from -100 to 100 inclusive.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -2627,6 +2627,7 @@ error.
 <!-- .sp -->
 To obtain a bit vector that describes the state of the keyboard, use
 <function>XQueryKeymap</function>.
+</para>
 <indexterm significance="preferred"><primary>XQueryKeymap</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xquerykeymap'>
@@ -2660,7 +2661,6 @@ Each bit represents one key of the keyboard.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -2683,6 +2683,7 @@ may lag the physical state if device event processing is frozen.
 <!-- .sp -->
 To set the mapping of the pointer buttons, use
 <function>XSetPointerMapping</function>.
+</para>
 <indexterm significance="preferred"><primary>XSetPointerMapping</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xsetpointermapping'>
@@ -2726,7 +2727,6 @@ Specifies the number of items in the mapping list.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -2771,6 +2771,7 @@ error.
 <!-- .sp -->
 To get the pointer mapping, use
 <function>XGetPointerMapping</function>.
+</para>
 <indexterm significance="preferred"><primary>XGetPointerMapping</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xgetpointermapping'>
@@ -2814,7 +2815,6 @@ Specifies the number of items in the mapping list.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -2834,6 +2834,7 @@ in map_return.
 <!-- .sp -->
 To control the pointer's interactive feel, use
 <function>XChangePointerControl</function>.
+</para>
 <indexterm significance="preferred"><primary>XChangePointerControl</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xchangepointercontrol'>
@@ -2910,7 +2911,6 @@ Specifies the acceleration threshold.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -2947,6 +2947,7 @@ error.
 <!-- .sp -->
 To get the current pointer parameters, use
 <function>XGetPointerControl</function>.
+</para>
 <indexterm significance="preferred"><primary>XGetPointerControl</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xgetpointercontrol'>
@@ -3000,7 +3001,6 @@ Returns the acceleration threshold.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -3222,6 +3222,7 @@ Rather, it merely stores it for reading and writing by clients.
 <!-- .LP -->
 To obtain the legal KeyCodes for a display, use
 <function>XDisplayKeycodes</function>.
+</para>
 <indexterm significance="preferred"><primary>XDisplayKeycodes</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xdisplaykeycodes'>
@@ -3264,7 +3265,6 @@ Returns the maximum number of KeyCodes.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -3281,6 +3281,7 @@ Not all KeyCodes in this range are required to have corresponding keys.
 <!-- .LP -->
 To obtain the symbols for the specified KeyCodes, use
 <function>XGetKeyboardMapping</function>.
+</para>
 <indexterm significance="preferred"><primary>XGetKeyboardMapping</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xgetkeyboardmapping'>
@@ -3336,7 +3337,6 @@ Returns the number of KeySyms per KeyCode.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -3406,6 +3406,7 @@ error.
 <!-- .sp -->
 To change the keyboard mapping, use
 <function>XChangeKeyboardMapping</function>.
+</para>
 <indexterm significance="preferred"><primary>XChangeKeyboardMapping</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xchangekeyboardmapping'>
@@ -3472,7 +3473,6 @@ Specifies the number of KeyCodes that are to be changed.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -3578,6 +3578,7 @@ To create an
 <structname>XModifierKeymap</structname>
 structure, use
 <function>XNewModifiermap</function>.
+</para>
 <indexterm significance="preferred"><primary>XNewModifiermap</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xnewmodifiermap'>
@@ -3600,7 +3601,6 @@ in the map.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -3617,6 +3617,7 @@ To add a new entry to an
 <structname>XModifierKeymap</structname>
 structure, use
 <function>XInsertModifiermapEntry</function>.
+</para>
 <indexterm significance="preferred"><primary>XInsertModifiermapEntry</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xinsertmodifiermapentry'>
@@ -3662,7 +3663,6 @@ Specifies the modifier.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -3680,6 +3680,7 @@ To delete an entry from an
 <structname>XModifierKeymap</structname>
 structure, use
 <function>XDeleteModifiermapEntry</function>.
+</para>
 <indexterm significance="preferred"><primary>XDeleteModifiermapEntry</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xdeletemodifiermapentry'>
@@ -3725,7 +3726,6 @@ Specifies the modifier.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -3743,6 +3743,7 @@ To destroy an
 <structname>XModifierKeymap</structname>
 structure, use
 <function>XFreeModifiermap</function>.
+</para>
 <indexterm significance="preferred"><primary>XFreeModifiermap</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xfreemodifiermap'>
@@ -3766,7 +3767,6 @@ structure.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -3781,6 +3781,7 @@ structure.
 <!-- .sp -->
 To set the KeyCodes to be used as modifiers, use
 <function>XSetModifierMapping</function>.
+</para>
 <indexterm significance="preferred"><primary>XSetModifierMapping</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xsetmodifiermapping'>
@@ -3815,7 +3816,6 @@ structure.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -3895,6 +3895,7 @@ errors.
 <!-- .sp -->
 To obtain the KeyCodes used as modifiers, use
 <function>XGetModifierMapping</function>.
+</para>
 <indexterm significance="preferred"><primary>XGetModifierMapping</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xgetmodifiermapping'>
@@ -3916,7 +3917,6 @@ Specifies the connection to the X server.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
diff --git a/libX11/specs/libX11/CH13.xml b/libX11/specs/libX11/CH13.xml
index 49f359640..4ebe19c57 100644
--- a/libX11/specs/libX11/CH13.xml
+++ b/libX11/specs/libX11/CH13.xml
@@ -143,6 +143,7 @@ is selecting one of several styles of keyboard input method.
 <!-- .sp -->
 To configure Xlib locale modifiers for the current locale, use
 <function>XSetLocaleModifiers</function>.
+</para>
 <indexterm significance="preferred"><primary>XSetLocaleModifiers</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xsetlocalemodifiers'>
@@ -164,7 +165,6 @@ Specifies the modifiers.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -287,63 +287,54 @@ the following table describes the locale (and modifiers) dependency:
 </para>
 
 <informaltable>
-  <tgroup cols='3' align='center'>
+  <tgroup cols='3'>
   <colspec colname='c1'/>
   <colspec colname='c2'/>
   <colspec colname='c3'/>
   <thead>
     <row>
-      <entry>Locale from</entry>
-      <entry>Affects the Function</entry>
-      <entry>In</entry>
+      <entry align='center'>Locale from</entry>
+      <entry align='center'>Affects the Function</entry>
+      <entry align='center'>In</entry>
     </row>
   </thead>
   <tbody>
     <row>
-      <entry></entry>
-      <entry>Locale Query/Configuration:</entry>
+      <entry nameend='c3' namest='c1'>
+      <emphasis role='bold'>Locale Query/Configuration:</emphasis></entry>
     </row>
     <row>
-      <entry><function>setlocale</function></entry>
+      <entry morerows='1'><function>setlocale</function></entry>
       <entry><function>XSupportsLocale</function></entry>
       <entry>Locale queried</entry>
     </row>
     <row>
-      <entry></entry>
       <entry><function>XSetLocaleModifiers</function></entry>
       <entry>Locale modified</entry>
     </row>
     <row>
-      <entry></entry>
-    </row>
-    <row>
-      <entry></entry>
-      <entry>Resources:</entry>
+      <entry nameend='c3' namest='c1'>
+      <emphasis role='bold'>Resources:</emphasis></entry>
     </row>
     <row>
       <entry><function>setlocale</function></entry>
-      <entry><function>XrmGetFileDatabase</function></entry>
+      <entry>
+        <para><function>XrmGetFileDatabase</function></para>
+        <para><function>XrmGetStringDatabase</function></para>
+      </entry>
       <entry>Locale of <type>XrmDatabase</type></entry>
     </row>
     <row>
-      <entry></entry>
-      <entry><function>XrmGetStringDatabase</function></entry>
-    </row>
-    <row>
       <entry><type>XrmDatabase</type></entry>
-      <entry><function>XrmPutFileDatabase</function></entry>
+      <entry>
+        <para><function>XrmPutFileDatabase</function></para>
+        <para><function>XrmLocaleOfDatabase</function></para>
+      </entry>
       <entry>Locale of <type>XrmDatabase</type></entry>
     </row>
     <row>
-      <entry></entry>
-      <entry><function>XrmLocaleOfDatabase</function></entry>
-    </row>
-    <row>
-      <entry></entry>
-    </row>
-    <row>
-      <entry></entry>
-      <entry>Setting Standard Properties:</entry>
+      <entry nameend='c3' namest='c1'>
+      <emphasis role='bold'>Setting Standard Properties:</emphasis></entry>
     </row>
     <row>
       <entry><function>setlocale</function></entry>
@@ -354,129 +345,100 @@ the following table describes the locale (and modifiers) dependency:
     </row>
     <row>
       <entry><function>setlocale</function></entry>
-      <entry><function>XmbTextPropertyToTextList</function></entry>
+      <entry>
+        <para><function>XmbTextPropertyToTextList</function></para>
+        <para><function>XwcTextPropertyToTextList</function></para>
+        <para><function>XmbTextListToTextProperty</function></para>
+        <para><function>XwcTextListToTextProperty</function></para>
+      </entry>
       <entry>Encoding of supplied/returned text</entry>
     </row>
     <row>
-      <entry></entry>
-      <entry><function>XwcTextPropertyToTextList</function></entry>
-    </row>
-    <row>
-      <entry></entry>
-      <entry><function>XmbTextListToTextProperty</function></entry>
-    </row>
-    <row>
-      <entry></entry>
-      <entry><function>XwcTextListToTextProperty</function></entry>
-    </row>
-    <row>
-      <entry></entry>
-    </row>
-    <row>
-      <entry></entry>
-      <entry>Text Input:</entry>
+      <entry nameend='c3' namest='c1'>
+      <emphasis role='bold'>Text Input:</emphasis></entry>
     </row>
     <row>
-      <entry><function>setlocale</function></entry>
+      <entry morerows='2'><function>setlocale</function></entry>
       <entry><function>XOpenIM</function></entry>
       <entry><acronym>XIM</acronym> input method selection</entry>
     </row>
     <row>
-      <entry></entry>
       <entry><function>XRegisterIMInstantiateCallback</function></entry>
       <entry><acronym>XIM</acronym> selection</entry>
     </row>
     <row>
-      <entry></entry>
       <entry><function>XUnregisterIMInstantiateCallback</function></entry>
       <entry><acronym>XIM</acronym> selection</entry>
     </row>
     <row>
-      <entry><type>XIM</type></entry>
+      <entry morerows='1'><type>XIM</type></entry>
       <entry><function>XCreateIC</function></entry>
       <entry><acronym>XIC</acronym> input method configuration</entry>
     </row>
     <row>
-      <entry></entry>
       <entry><function>XLocaleOfIM</function>,  and so on</entry>
       <entry>Queried locale</entry>
     </row>
     <row>
-      <entry><type>XIC</type></entry>
+      <entry morerows='1'><type>XIC</type></entry>
       <entry><function>XmbLookupString</function></entry>
       <entry>Keyboard layout</entry>
     </row>
     <row>
-      <entry></entry>
       <entry><function>XwcLookupString</function></entry>
       <entry>Encoding of returned text</entry>
     </row>
     <row>
-      <entry></entry>
-    </row>
-    <row>
-      <entry></entry>
-      <entry>Text Drawing:</entry>
+      <entry nameend='c3' namest='c1'>
+      <emphasis role='bold'>Text Drawing:</emphasis></entry>
     </row>
     <row>
-      <entry><function>setlocale</function></entry>
+      <entry morerows='1'><function>setlocale</function></entry>
       <entry><function>XOpenOM</function></entry>
       <entry><acronym>XOM</acronym> output method selection</entry>
     </row>
     <row>
-      <entry></entry>
       <entry><function>XCreateFontSet</function></entry>
       <entry>Charsets of fonts in XFontSet</entry>
     </row>
     <row>
-      <entry><type>XOM</type></entry>
+      <entry morerows='1'><type>XOM</type></entry>
       <entry><function>XCreateOC</function></entry>
       <entry><acronym>XOC</acronym> output method configuration</entry>
     </row>
     <row>
-      <entry></entry>
       <entry><function>XLocaleOfOM</function>,  and so on</entry>
       <entry>Queried locale</entry>
     </row>
     <row>
-      <entry><type>XFontSet</type></entry>
+      <entry morerows='2'><type>XFontSet</type></entry>
       <entry><function>XmbDrawText</function>,</entry>
       <entry>Locale of supplied text</entry>
     </row>
     <row>
-      <entry></entry>
       <entry><function>XwcDrawText</function>, and so on</entry>
       <entry>Locale of supplied text</entry>
     </row>
     <row>
-      <entry></entry>
-      <entry><function>XExtentsOfFontSet</function>, and so on</entry>
+      <entry>
+        <para><function>XExtentsOfFontSet</function>,  and so on</para>
+        <para><function>XmbTextExtents</function>,</para>
+        <para><function>XwcTextExtents</function>,  and so on</para>
+      </entry>
       <entry>Locale-dependent metrics</entry>
     </row>
     <row>
-      <entry></entry>
-      <entry><function>XmbTextExtents</function>,</entry>
-    </row>
-    <row>
-      <entry></entry>
-      <entry><function>XwcTextExtents</function>,  and so on</entry>
-    </row>
-    <row>
-      <entry></entry>
-    </row>
-    <row>
-      <entry></entry>
-      <entry>Xlib Errors:</entry>
+      <entry nameend='c3' namest='c1'>
+      <emphasis role='bold'>Xlib Errors:</emphasis></entry>
     </row>
     <row>
       <entry><function>setlocale</function></entry>
-      <entry><function>XGetErrorDatabaseText</function></entry>
+      <entry>
+        <para><function>XGetErrorDatabaseText</function>,</para>
+        <para><function>XGetErrorText</function>,  and so on</para>
+      </entry>
       <entry>Locale of error message</entry>
     </row>
-    <row>
-      <entry></entry>
-      <entry><function>XGetErrorText</function></entry>
-    </row>
   </tbody>
   </tgroup>
 </informaltable>
@@ -542,6 +504,7 @@ A NULL identifies the end of a nested list.
 <!-- .sp -->
 To allocate a nested variable argument list dynamically, use
 <function>XVaCreateNestedList</function>.
+</para>
 <indexterm significance="preferred"><primary>XVaCreateNestedList</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xvacreatenestedlist'>
@@ -574,7 +537,6 @@ Specifies the variable length argument list(Al.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -729,6 +691,7 @@ a broader, more generalized abstraction.
 <!-- .LP -->
 To open an output method, use
 <function>XOpenOM</function>.
+</para>
 <indexterm significance="preferred"><primary>XOpenOM</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xopenom'>
@@ -783,7 +746,6 @@ Specifies the full class name of the application.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -847,6 +809,7 @@ returns NULL if no output method could be opened.
 <!-- .sp -->
 To close an output method, use
 <function>XCloseOM</function>.
+</para>
 <indexterm significance="preferred"><primary>XCloseOM</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xcloseom'>
@@ -868,7 +831,6 @@ Specifies the output method.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -881,6 +843,7 @@ function closes the specified output method.
 <!-- .sp -->
 To set output method attributes, use 
 <function>XSetOMValues</function>.
+</para>
 <indexterm significance="preferred"><primary>XSetOMValues</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xsetomvalues'>
@@ -913,7 +876,6 @@ Specifies the variable-length argument list(Al.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -934,6 +896,7 @@ No standard arguments are currently defined by Xlib.
 <!-- .sp -->
 To query an output method, use 
 <function>XGetOMValues</function>.
+</para>
 <indexterm significance="preferred"><primary>XGetOMValues</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xgetomvalues'>
@@ -966,7 +929,6 @@ Specifies the variable-length argument list(Al.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -982,6 +944,7 @@ it returns the name of the first argument that could not be obtained.
 <!-- .LP -->
 To obtain the display associated with an output method, use
 <function>XDisplayOfOM</function>.
+</para>
 <indexterm significance="preferred"><primary>XDisplayOfOM</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xdisplayofom'>
@@ -1003,7 +966,6 @@ Specifies the output method.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1016,6 +978,7 @@ function returns the display associated with the specified output method.
 <!-- .sp -->
 To get the locale associated with an output method, use
 <function>XLocaleOfOM</function>.
+</para>
 <indexterm significance="preferred"><primary>XLocaleOfOM</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xlocaleofom'>
@@ -1037,7 +1000,6 @@ Specifies the output method.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1067,13 +1029,13 @@ The following key applies to this table.
 </para>
 
 <informaltable>
-  <tgroup cols='2' align='center'>
+  <tgroup cols='2'>
   <colspec colname='c1'/>
   <colspec colname='c2'/>
   <thead>
     <row>
-      <entry>Key</entry>
-      <entry>Explanation</entry>
+      <entry align='left'>Key</entry>
+      <entry align='left'>Explanation</entry>
     </row>
   </thead>
   <tbody>
@@ -1085,14 +1047,16 @@ The following key applies to this table.
   </tgroup>
 </informaltable>
 
+<para></para>
+
 <informaltable>
-  <tgroup cols='2' align='center'>
+  <tgroup cols='2'>
   <colspec colname='c1'/>
   <colspec colname='c2'/>
   <thead>
     <row>
-      <entry><acronym>XOM</acronym> Value</entry>
-      <entry>Key</entry>
+      <entry align='left'><acronym>XOM</acronym> Value</entry>
+      <entry align='left'>Key</entry>
     </row>
   </thead>
   <tbody>
@@ -1352,6 +1316,7 @@ is defined as an upward compatible type of
 <!-- .sp -->
 To create an output context, use
 <function>XCreateOC</function>.
+</para>
 <indexterm significance="preferred"><primary>XCreateOC</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xcreateoc'>
@@ -1384,7 +1349,6 @@ Specifies the variable-length argument list(Al.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1438,6 +1402,7 @@ error.
 <!-- .sp -->
 To destroy an output context, use
 <function>XDestroyOC</function>.
+</para>
 <indexterm significance="preferred"><primary>XDestroyOC</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xdestroyoc'>
@@ -1459,7 +1424,6 @@ Specifies the output context.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1472,6 +1436,7 @@ function destroys the specified output context.
 <!-- .sp -->
 To get the output method associated with an output context, use
 <function>XOMOfOC</function>.
+</para>
 <indexterm significance="preferred"><primary>XOMOfOC</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xomofoc'>
@@ -1493,7 +1458,6 @@ Specifies the output context.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1519,6 +1483,7 @@ with a character string using the X Portable Character Set.
 <!-- .sp -->
 To set <acronym>XOC</acronym> values, use
 <function>XSetOCValues</function>.
+</para>
 <indexterm significance="preferred"><primary>XSetOCValues</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xsetocvalues'>
@@ -1551,7 +1516,6 @@ Specifies the variable-length argument list(Al.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1596,6 +1560,7 @@ error.
 <!-- .sp -->
 To obtain <acronym>XOC</acronym> values, use
 <function>XGetOCValues</function>.
+</para>
 <indexterm significance="preferred"><primary>XGetOCValues</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xgetocvalues'>
@@ -1628,7 +1593,6 @@ Specifies the variable-length argument list(Al.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1676,13 +1640,13 @@ The third column indicates how each of the <acronym>XOC</acronym> values is trea
 The following keys apply to this table.
 </para>
 <informaltable>
-  <tgroup cols='2' align='center'>
+  <tgroup cols='2'>
   <colspec colname='c1'/>
   <colspec colname='c2'/>
   <thead>
     <row>
-      <entry>Key</entry>
-      <entry>Explanation</entry>
+      <entry align='left'>Key</entry>
+      <entry align='left'>Explanation</entry>
     </row>
   </thead>
   <tbody>
@@ -1707,17 +1671,18 @@ The following keys apply to this table.
   </tgroup>
 </informaltable>
 
-<!-- .LP -->
+<para></para>
+
 <informaltable>
-  <tgroup cols='3' align='center'>
+  <tgroup cols='3'>
   <colspec colname='c1'/>
   <colspec colname='c2'/>
   <colspec colname='c3'/>
   <thead>
     <row>
-      <entry><acronym>XOC</acronym> Value</entry>
-      <entry>Alternative Interface</entry>
-      <entry>Key</entry>
+      <entry align='left'><acronym>XOC</acronym> Value</entry>
+      <entry align='left'>Alternative Interface</entry>
+      <entry align='left'>Key</entry>
     </row>
   </thead>
   <tbody>
@@ -2144,6 +2109,7 @@ so that the output context self indicates whether it was created by
 <function>XCreateOC</function>
 or
 <function>XCreateFontSet</function>.
+</para>
 <indexterm significance="preferred"><primary>XCreateFontSet</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xcreatefontset'>
@@ -2209,7 +2175,6 @@ Returns the string drawn for missing charsets.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -2474,6 +2439,7 @@ structures and full font names given an
 <type>XFontSet</type>,
 use
 <function>XFontsOfFontSet</function>.
+</para>
 <indexterm significance="preferred"><primary>XFontsOfFontSet</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xfontsoffontset'>
@@ -2517,7 +2483,6 @@ Returns the list of font names.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -2583,6 +2548,7 @@ To obtain the base font name list and the selected font name list given an
 <type>XFontSet</type>,
 use
 <function>XBaseFontNameListOfFontSet</function>.
+</para>
 <indexterm significance="preferred"><primary>XBaseFontNameListOfFontSet</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xbasefontnamelistoffontset'>
@@ -2604,7 +2570,6 @@ Specifies the font set.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -2645,6 +2610,7 @@ To obtain the locale name given an
 <type>XFontSet</type>,
 use
 <function>XLocaleOfFontSet</function>.
+</para>
 <indexterm significance="preferred"><primary>XLocaleOfFontSet</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xlocaleoffontset'>
@@ -2666,7 +2632,6 @@ Specifies the font set.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -2698,6 +2663,7 @@ also frees its associated
 <type>XOM</type>
 if the output context was created by
 <function>XCreateFontSet</function>.
+</para>
 <indexterm significance="preferred"><primary>XFreeFontSet</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xfreefontset'>
@@ -2730,7 +2696,6 @@ Specifies the font set.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -2802,6 +2767,7 @@ to obtain proper rendering.
 <!-- .sp -->
 To find out about direction-dependent rendering, use
 <function>XDirectionalDependentDrawing</function>.
+</para>
 <indexterm significance="preferred"><primary>XDirectionalDependentDrawing</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xdirectionaldependentdrawing'>
@@ -2823,7 +2789,6 @@ Specifies the font set.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -2840,6 +2805,7 @@ otherwise, it returns
 <!-- .sp -->
 To find out about context-dependent rendering, use
 <function>XContextualDrawing</function>.
+</para>
 <indexterm significance="preferred"><primary>XContextualDrawing</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xcontextualdrawing'>
@@ -2861,7 +2827,6 @@ Specifies the font set.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -2878,6 +2843,7 @@ otherwise, it returns
 <!-- .sp -->
 To find out about context-dependent or direction-dependent rendering, use
 <function>XContextDependentDrawing</function>.
+</para>
 <indexterm significance="preferred"><primary>XContextDependentDrawing</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xcontextdependentdrawing'>
@@ -2899,7 +2865,6 @@ Specifies the font set.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -2992,6 +2957,7 @@ To obtain the maximum extents structure given an
 <type>XFontSet</type>,
 use
 <function>XExtentsOfFontSet</function>.
+</para>
 <indexterm significance="preferred"><primary>XExtentsOfFontSet</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xextentsoffontset'>
@@ -3013,7 +2979,6 @@ Specifies the font set.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -3044,6 +3009,7 @@ use
 <function>XmbTextEscapement</function>
 or 
 <function>XwcTextEscapement</function>.
+</para>
 <indexterm significance="preferred"><primary>XmbTextEscapement</primary></indexterm>
 <indexterm significance="preferred"><primary>XwcTextEscapement</primary></indexterm>
 <!-- .sM -->
@@ -3107,7 +3073,6 @@ Specifies the number of characters in the string argument.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -3136,6 +3101,7 @@ use
 <function>XmbTextExtents</function>
  or
 <function>XwcTextExtents</function>.
+</para>
 <indexterm significance="preferred"><primary>XmbTextExtents</primary></indexterm>
 <indexterm significance="preferred"><primary>XwcTextExtents</primary></indexterm>
 <!-- .sM -->
@@ -3224,7 +3190,6 @@ Returns the overall logical dimensions.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -3296,6 +3261,7 @@ use
 <function>XmbTextPerCharExtents</function>
 or
 <function>XwcTextPerCharExtents</function>.
+</para>
 <indexterm significance="preferred"><primary>XmbTextPerCharExtents</primary></indexterm>
 <indexterm significance="preferred"><primary>XwcTextPerCharExtents</primary></indexterm>
 <!-- .sM -->
@@ -3433,7 +3399,6 @@ Returns the overall logical dimensions.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -3579,6 +3544,7 @@ To draw text using multiple font sets in a given drawable, use
 <function>XmbDrawText</function>
 or
 <function>XwcDrawText</function>.
+</para>
 <indexterm significance="preferred"><primary>XmbDrawText</primary></indexterm>
 <indexterm significance="preferred"><primary>XwcDrawText</primary></indexterm>
 <!-- .sM -->
@@ -3680,7 +3646,6 @@ Specifies the number of text items in the array.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -3730,6 +3695,7 @@ To draw text using a single font set in a given drawable, use
 <function>XmbDrawString</function>
 or
 <function>XwcDrawString</function>.
+</para>
 <indexterm significance="preferred"><primary>XmbDrawString</primary></indexterm>
 <indexterm significance="preferred"><primary>XwcDrawString</primary></indexterm>
 <!-- .sM -->
@@ -3853,7 +3819,6 @@ Specifies the number of characters in the string argument.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -3876,6 +3841,7 @@ To draw image text using a single font set in a given drawable, use
 <function>XmbDrawImageString</function>
 or
 <function>XwcDrawImageString</function>.
+</para>
 <indexterm significance="preferred"><primary>XmbDrawImageString</primary></indexterm>
 <indexterm significance="preferred"><primary>XwcDrawImageString</primary></indexterm>
 <!-- .sM -->
@@ -3999,7 +3965,6 @@ Specifies the number of characters in the string argument.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -5037,7 +5002,7 @@ To support management of input methods in these cases, the following
 functions are provided:
 </para>
 <informaltable>
-  <tgroup cols='2' align='center'>
+  <tgroup cols='2'>
   <colspec colname='c1'/>
   <colspec colname='c2'/>
   <tbody>
@@ -5184,6 +5149,7 @@ IM value.
 <!-- .LP -->
 To open a connection, use
 <function>XOpenIM</function>.
+</para>
 <indexterm significance="preferred"><primary>XOpenIM</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xopenim'>
@@ -5238,7 +5204,6 @@ Specifies the full class name of the application.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -5305,6 +5270,7 @@ returns NULL if no input method could be opened.
 <!-- .sp -->
 To close a connection, use
 <function>XCloseIM</function>.
+</para>
 <indexterm significance="preferred"><primary>XCloseIM</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xcloseim'>
@@ -5326,7 +5292,6 @@ Specifies the input method.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -5339,6 +5304,7 @@ function closes the specified input method.
 <!-- .sp -->
 To set input method attributes, use
 <function>XSetIMValues</function>.
+</para>
 <indexterm significance="preferred"><primary>XSetIMValues</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xsetimvalues'>
@@ -5371,7 +5337,6 @@ Specifies the variable-length argument list(Al.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -5392,6 +5357,7 @@ correctly.
 <!-- .sp -->
 To query an input method, use 
 <function>XGetIMValues</function>.
+</para>
 <indexterm significance="preferred"><primary>XGetIMValues</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xgetimvalues'>
@@ -5424,7 +5390,6 @@ Specifies the variable length argument list(Al.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -5455,6 +5420,7 @@ with the returned pointer.
 <!-- .sp -->
 To obtain the display associated with an input method, use
 <function>XDisplayOfIM</function>.
+</para>
 <indexterm significance="preferred"><primary>XDisplayOfIM</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xdisplayofim'>
@@ -5476,7 +5442,6 @@ Specifies the input method.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -5489,6 +5454,7 @@ function returns the display associated with the specified input method.
 <!-- .sp -->
 To get the locale associated with an input method, use
 <function>XLocaleOfIM</function>.
+</para>
 <indexterm significance="preferred"><primary>XLocaleOfIM</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xlocaleofim'>
@@ -5510,7 +5476,6 @@ Specifies the input method.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -5523,6 +5488,7 @@ function returns the locale associated with the specified input method.
 <!-- .sp -->
 To register an input method instantiate callback, use
 <function>XRegisterIMInstantiateCallback</function>.
+</para>
 <indexterm significance="preferred"><primary>XRegisterIMInstantiateCallback</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xregisteriminstantiatecallback'>
@@ -5599,7 +5565,6 @@ Specifies the additional client data.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -5619,6 +5584,7 @@ The function returns
 <para>
 <!-- .LP -->
 The generic prototype is as follows:
+</para>
 <indexterm significance="preferred"><primary>IMInstantiateCallback</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='iminstantiatecallback'>
@@ -5662,12 +5628,12 @@ Not used for this callback and always passed as NULL.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
 To unregister an input method instantiation callback, use
 <function>XUnregisterIMInstantiateCallback</function>.
+</para>
 <indexterm significance="preferred"><primary>XUnregisterIMInstantiateCallback</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xunregisteriminstantiatecallback'>
@@ -5744,7 +5710,6 @@ Specifies the additional client data.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -5779,13 +5744,13 @@ are treated by that input style.
 The following keys apply to this table.
 </para>
 <informaltable>
-  <tgroup cols='2' align='center'>
+  <tgroup cols='2'>
   <colspec colname='c1'/>
   <colspec colname='c2'/>
   <thead>
     <row>
-      <entry>Key</entry>
-      <entry>Explanation</entry>
+      <entry align='left'>Key</entry>
+      <entry align='left'>Explanation</entry>
     </row>
   </thead>
   <tbody>
@@ -5808,15 +5773,16 @@ The following keys apply to this table.
   </tgroup>
 </informaltable>
 
-<!-- .LP -->
+<para></para>
+
 <informaltable>
-  <tgroup cols='2' align='center'>
+  <tgroup cols='2'>
   <colspec colname='c1'/>
   <colspec colname='c2'/>
   <thead>
     <row>
-      <entry><acronym>XIM</acronym> Value</entry>
-      <entry>Key</entry>
+      <entry align='left'><acronym>XIM</acronym> Value</entry>
+      <entry align='left'>Key</entry>
     </row>
   </thead>
   <tbody>
@@ -5965,7 +5931,7 @@ by the input method for preedit information.
 <indexterm significance="preferred"><primary>XIMPreeditNothing</primary></indexterm>
 <indexterm significance="preferred"><primary>XIMPreeditNone</primary></indexterm>
 <informaltable>
-  <tgroup cols='2' align='center'>
+  <tgroup cols='2'>
   <colspec colname='c1'/>
   <colspec colname='c2'/>
   <tbody>
@@ -6023,7 +5989,7 @@ by the input method for status information.
 <indexterm significance="preferred"><primary>XIMStatusNothing</primary></indexterm>
 <indexterm significance="preferred"><primary>XIMStatusNone</primary></indexterm>
 <informaltable>
-  <tgroup cols='2' align='center'>
+  <tgroup cols='2'>
   <colspec colname='c1'/>
   <colspec colname='c2'/>
   <tbody>
@@ -6109,6 +6075,7 @@ or
 <para>
 <!-- .LP -->
 The generic prototype of this callback function is as follows:
+</para>
 <indexterm significance="preferred"><primary>DestroyCallback</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='destroycallback'>
@@ -6152,7 +6119,6 @@ Not used for this callback and always passed as NULL.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -6345,6 +6311,7 @@ they should be registered with the X Consortium.
 <!-- .sp -->
 To create an input context, use
 <function>XCreateIC</function>.
+</para>
 <indexterm significance="preferred"><primary>XCreateIC</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xcreateic'>
@@ -6377,7 +6344,6 @@ Specifies the variable length argument list(Al.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -6438,6 +6404,7 @@ errors.
 <!-- .sp -->
 To destroy an input context, use
 <function>XDestroyIC</function>.
+</para>
 <indexterm significance="preferred"><primary>XDestroyIC</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xdestroyic'>
@@ -6459,7 +6426,6 @@ Specifies the input context.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -6475,6 +6441,7 @@ use
 <function>XSetICFocus</function>
 and
 <function>XUnsetICFocus</function>.
+</para>
 <indexterm significance="preferred"><primary>XSetICFocus</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xseticfocus'>
@@ -6496,7 +6463,6 @@ Specifies the input context.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -6513,9 +6479,6 @@ Calling
 <function>XSetICFocus</function>
 does not affect the focus window value.
 </para>
-<para>
-<!-- .LP -->
-<!-- .sp -->
 <indexterm significance="preferred"><primary>XUnsetICFocus</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xunseticfocus'>
@@ -6537,7 +6500,6 @@ Specifies the input context.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -6564,6 +6526,7 @@ To reset the state of an input context to its initial state, use
 <function>XmbResetIC</function>
 or
 <function>XwcResetIC</function>.
+</para>
 <indexterm significance="preferred"><primary>XmbResetIC</primary></indexterm>
 <indexterm significance="preferred"><primary>XwcResetIC</primary></indexterm>
 <!-- .sM -->
@@ -6593,7 +6556,6 @@ Specifies the input context.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -6640,6 +6602,7 @@ The client should free the returned string by calling
 <!-- .sp -->
 To get the input method associated with an input context, use
 <function>XIMOfIC</function>.
+</para>
 <indexterm significance="preferred"><primary>XIMOfIC</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='ximofic'>
@@ -6661,7 +6624,6 @@ Specifies the input context.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -6685,6 +6647,7 @@ with a character string using the X Portable Character Set.
 <!-- .sp -->
 To set <acronym>XIC</acronym> values, use
 <function>XSetICValues</function>.
+</para>
 <indexterm significance="preferred"><primary>XSetICValues</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xseticvalues'>
@@ -6717,7 +6680,6 @@ Specifies the variable length argument list(Al.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -6768,6 +6730,7 @@ errors.
 <!-- .sp -->
 To obtain <acronym>XIC</acronym> values, use
 <function>XGetICValues</function>.
+</para>
 <indexterm significance="preferred"><primary>XGetICValues</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xgeticvalues'>
@@ -6800,7 +6763,6 @@ Specifies the variable length argument list(Al.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -6870,13 +6832,13 @@ are treated by that input style.
 The following keys apply to these tables.
 </para>
 <informaltable>
-  <tgroup cols='2' align='center'>
+  <tgroup cols='2'>
   <colspec colname='c1'/>
   <colspec colname='c2'/>
   <thead>
     <row>
-      <entry>Key</entry>
-      <entry>Explanation</entry>
+      <entry align='left'>Key</entry>
+      <entry align='left'>Explanation</entry>
     </row>
   </thead>
   <tbody>
@@ -6930,9 +6892,11 @@ The following keys apply to these tables.
   </tgroup>
 </informaltable>
 
+<para></para>
+
 <!-- .LP -->
 <informaltable>
-  <tgroup cols='7' align='center'>
+  <tgroup cols='7'>
   <colspec colname='c1'/>
   <colspec colname='c2'/>
   <colspec colname='c3'/>
@@ -6940,7 +6904,7 @@ The following keys apply to these tables.
   <colspec colname='c5'/>
   <colspec colname='c6'/>
   <colspec colname='c7'/>
-  <tbody>
+  <thead>
     <row>
       <entry><acronym>XIC</acronym> Value</entry>
       <entry>Geometry Mangement</entry>
@@ -6950,6 +6914,8 @@ The following keys apply to these tables.
       <entry>Preedit Nothing</entry>
       <entry>Preedit None</entry>
     </row>
+    </thead>
+  <tbody>
     <row>
       <entry>Input Style</entry>
       <entry></entry>
@@ -7191,9 +7157,11 @@ The following keys apply to these tables.
   </tgroup>
 </informaltable>
 
+<para></para>
+
 <!-- .LP -->
 <informaltable>
-  <tgroup cols='6' align='center'>
+  <tgroup cols='6'>
   <colspec colname='c1'/>
   <colspec colname='c2'/>
   <colspec colname='c3'/>
@@ -7848,7 +7816,7 @@ is ignored when evaluating whether the key is hot or not.
 </para>
 
 <informaltable>
-  <tgroup cols='3' align='center'>
+  <tgroup cols='3'>
   <colspec colname='c1'/>
   <colspec colname='c2'/>
   <colspec colname='c3'/>
@@ -8322,6 +8290,7 @@ The value of the
 argument is a pointer to a structure of type
 <structname>XIMCallback</structname>.
 The generic prototype is as follows:
+</para>
 <indexterm significance="preferred"><primary>PreeditStateNotifyCallback</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='preeditstatenotifycallback'>
@@ -8365,7 +8334,6 @@ Specifies the current preedit state.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -8415,7 +8383,7 @@ The set of preedit callbacks is as follows:
 <indexterm significance="preferred"><primary>XNPreeditDrawCallback</primary></indexterm>
 <indexterm significance="preferred"><primary>XNPreeditCaretCallback</primary></indexterm>
 <informaltable>
-  <tgroup cols='2' align='center'>
+  <tgroup cols='2'>
   <colspec colname='c1'/>
   <colspec colname='c2'/>
   <tbody>
@@ -8451,7 +8419,7 @@ The set of status callbacks is as follows:
 <indexterm significance="preferred"><primary>XNStatusDoneCallback</primary></indexterm>
 <indexterm significance="preferred"><primary>XNStatusDrawCallback</primary></indexterm>
 <informaltable>
-  <tgroup cols='2' align='center'>
+  <tgroup cols='2'>
   <colspec colname='c1'/>
   <colspec colname='c2'/>
   <tbody>
@@ -8540,6 +8508,7 @@ terminate preedit, or update the status area.
 <para>
 <!-- .LP -->
 All callback procedures follow the generic prototype:
+</para>
 <indexterm significance="preferred"><primary>CallbackPrototype</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis>
@@ -8583,7 +8552,6 @@ Specifies data specific to the callback.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -8612,6 +8580,7 @@ and specific data structure associated with the different reasons.
 The geometry callback is triggered by the input method 
 to indicate that it wants the client to negotiate geometry.
 The generic prototype is as follows:
+</para>
 <indexterm significance="preferred"><primary>GeometryCallback</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis>
@@ -8655,7 +8624,6 @@ Not used for this callback and always passed as NULL.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -8673,6 +8641,7 @@ The destroy callback is triggered by the input method
 when it stops service for any reason.
 After the callback is invoked, the input context will be freed by Xlib.
 The generic prototype is as follows:
+</para>
 <indexterm significance="preferred"><primary>DestroyCallback</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='destroycallback_xic'>
@@ -8716,7 +8685,6 @@ Not used for this callback and always passed as NULL.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -8735,6 +8703,7 @@ to request the client to return the string to be converted.  The
 returned string may be either a multibyte or wide character string,
 with an encoding matching the locale bound to the input context.
 The callback prototype is as follows:
+</para>
 <indexterm significance="preferred"><primary>StringConversionCallback</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='stringconversioncallback'>
@@ -8778,7 +8747,6 @@ Specifies the amount of the string to be converted.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -8897,6 +8865,7 @@ or
 <function><replaceable>PreeditDoneCallback</replaceable></function>
 callback is triggered to let the toolkit do the setup
 or the cleanup for the preedit region.
+</para>
 <indexterm significance="preferred"><primary>PreeditStartCallback</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='preeditstartcallback'>
@@ -8940,7 +8909,6 @@ Not used for this callback and always passed as NULL.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -8951,6 +8919,7 @@ will return the maximum size of the preedit string.
 A positive number indicates the maximum number of bytes allowed
 in the preedit string, 
 and a value of -1 indicates there is no limit.
+</para>
 <indexterm significance="preferred"><primary>PreeditDoneCallback</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='preeditdonecallback'>
@@ -8994,7 +8963,6 @@ Not used for this callback and always passed as NULL.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -9032,6 +9000,7 @@ That string is either a multibyte or wide character string,
 whose encoding matches the locale bound to the input context.
 The callback prototype
 is as follows:
+</para>
 <indexterm significance="preferred"><primary>PreeditDrawCallback</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='preeditdrawcallback'>
@@ -9075,7 +9044,6 @@ Specifies the preedit drawing information.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -9419,6 +9387,7 @@ to move the text insertion point in the preedit area
 Consequently, input method needs to indicate to the client that it
 should move the text insertion point.
 It then calls the PreeditCaretCallback.
+</para>
 <indexterm significance="preferred"><primary>PreeditCaretCallback</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='preeditcaretcallback'>
@@ -9462,7 +9431,6 @@ Specifies the preedit caret information.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -9553,7 +9521,7 @@ These values are defined as follows:
 <indexterm significance="preferred"><primary>XIMCaretUp</primary></indexterm>
 <indexterm significance="preferred"><primary>XIMCaretDown</primary></indexterm>
 <informaltable>
-  <tgroup cols='2' align='center'>
+  <tgroup cols='2'>
   <colspec colname='c1'/>
   <colspec colname='c2'/>
   <tbody>
@@ -9635,6 +9603,7 @@ callbacks:  StatusStartCallback, StatusDoneCallback, and StatusDrawCallback.
 <!-- .sp -->
 When the input context is created or gains focus, 
 the input method calls the StatusStartCallback callback.
+</para>
 <indexterm significance="preferred"><primary>StatusStartCallback</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='statusstartcallback'>
@@ -9678,7 +9647,6 @@ Not used for this callback and always passed as NULL.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -9692,6 +9660,7 @@ it will not be called again before StatusDoneCallback has been called.
 <!-- .sp -->
 When an input context
 is destroyed or when it loses focus, the input method calls StatusDoneCallback.
+</para>
 <indexterm significance="preferred"><primary>StatusDoneCallback</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='statusdonecallback'>
@@ -9735,7 +9704,6 @@ Not used for this callback and always passed as NULL.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -9747,6 +9715,7 @@ The callback may release any data allocated on
 <!-- .sp -->
 When an input context status has to be updated, the input method calls
 StatusDrawCallback.
+</para>
 <indexterm significance="preferred"><primary>StatusDrawCallback</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='statusdrawcallback'>
@@ -9790,7 +9759,6 @@ Specifies the status drawing information.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -9885,6 +9853,7 @@ Clients should discard filtered events.
 <!-- .LP -->
 To filter an event, use
 <function>XFilterEvent</function>.
+</para>
 <indexterm significance="preferred"><primary>XFilterEvent</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xfilterevent'>
@@ -9919,7 +9888,6 @@ Specifies the window (Wi.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -9968,6 +9936,7 @@ use
 <function>XmbLookupString</function>
 or
 <function>XwcLookupString</function>.
+</para>
 <indexterm significance="preferred"><primary>XmbLookupString</primary></indexterm>
 <indexterm significance="preferred"><primary>XwcLookupString</primary></indexterm>
 <!-- .sM -->
@@ -10070,7 +10039,6 @@ Returns a value indicating what kind of data is returned.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -10137,7 +10105,7 @@ The possible values returned are:
 </para>
 
 <informaltable>
-  <tgroup cols='2' align='center'>
+  <tgroup cols='2'>
   <colspec colname='c1'/>
   <colspec colname='c2'/>
   <tbody>
diff --git a/libX11/specs/libX11/CH14.xml b/libX11/specs/libX11/CH14.xml
index cd96413ea..8d6dd2e09 100644
--- a/libX11/specs/libX11/CH14.xml
+++ b/libX11/specs/libX11/CH14.xml
@@ -31,17 +31,17 @@ managers are:
 </para>
 
 <informaltable>
-  <tgroup cols='4' align='center'>
+  <tgroup cols='4'>
   <colspec colname='c1'/>
   <colspec colname='c2'/>
   <colspec colname='c3'/>
   <colspec colname='c4'/>
   <thead>
     <row>
-      <entry>Name</entry>
-      <entry>Type</entry>
-      <entry>Format</entry>
-      <entry>Description</entry>
+      <entry align='center'>Name</entry>
+      <entry align='center'>Type</entry>
+      <entry align='center'>Format</entry>
+      <entry align='center'>Description</entry>
     </row>
   </thead>
   <tbody>
@@ -259,6 +259,7 @@ to manipulate your application's subwindows.
 <!-- .LP -->
 To request that a top-level window be iconified, use
 <function>XIconifyWindow</function>.
+</para>
 <indexterm significance="preferred"><primary>XIconifyWindow</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xiconifywindow'>
@@ -302,7 +303,6 @@ Specifies the appropriate screen number on the host server.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -333,6 +333,7 @@ otherwise, it returns a zero status.
 <!-- .LP -->
 To request that a top-level window be withdrawn, use
 <function>XWithdrawWindow</function>.
+</para>
 <indexterm significance="preferred"><primary>XWithdrawWindow</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xwithdrawwindow'>
@@ -376,7 +377,6 @@ Specifies the appropriate screen number on the host server.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -407,6 +407,7 @@ error.
 <!-- .LP -->
 To request that a top-level window be reconfigured, use
 <function>XReconfigureWMWindow</function>.
+</para>
 <indexterm significance="preferred"><primary>XReconfigureWMWindow</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xreconfigurewmwindow'>
@@ -476,7 +477,6 @@ structure.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -580,6 +580,7 @@ structure, use
 <function>XmbTextListToTextProperty</function>
 or
 <function>XwcTextListToTextProperty</function>.
+</para>
 <indexterm significance="preferred"><primary>XmbTextListToTextProperty</primary></indexterm>
 <indexterm significance="preferred"><primary>XwcTextListToTextProperty</primary></indexterm>
 <!-- .sM -->
@@ -659,7 +660,6 @@ structure.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -742,6 +742,7 @@ structure, use
 <function>XmbTextPropertyToTextList</function>
 or
 <function>XwcTextPropertyToTextList</function>.
+</para>
 <indexterm significance="preferred"><primary>XmbTextPropertyToTextList</primary></indexterm>
 <indexterm significance="preferred"><primary>XwcTextPropertyToTextList</primary></indexterm>
 <!-- .sM -->
@@ -810,7 +811,6 @@ Returns the number of (Cn.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -901,6 +901,7 @@ use
 To free the in-memory data associated with the specified
 wide character string list, use
 <function>XwcFreeStringList</function>.
+</para>
 <indexterm significance="preferred"><primary>XwcFreeStringList</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xwcfreestringlist'>
@@ -922,7 +923,6 @@ Specifies the list of strings to be freed.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -985,6 +985,7 @@ To set the specified list of strings in the STRING encoding to a
 <structname>XTextProperty</structname>
 structure, use
 <function>XStringListToTextProperty</function>.
+</para>
 <indexterm significance="preferred"><primary>XStringListToTextProperty</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xstringlisttotextproperty'>
@@ -1031,7 +1032,6 @@ structure.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1060,6 +1060,7 @@ To obtain a list of strings from a specified
 <structname>XTextProperty</structname>
 structure in the STRING encoding, use
 <function>XTextPropertyToStringList</function>.
+</para>
 <indexterm significance="preferred"><primary>XTextPropertyToStringList</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xtextpropertytostringlist'>
@@ -1106,7 +1107,6 @@ Returns the number of (Cn.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1133,6 +1133,7 @@ To free the storage for the list and its contents, use
 <!-- .LP -->
 To free the in-memory data associated with the specified string list, use
 <function>XFreeStringList</function>.
+</para>
 <indexterm significance="preferred"><primary>XFreeStringList</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xfreestringlist'>
@@ -1154,7 +1155,6 @@ Specifies the list of strings to be freed.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1195,6 +1195,7 @@ respectively.
 <!-- .LP -->
 To set one of a window's text properties, use
 <function>XSetTextProperty</function>.
+</para>
 <indexterm significance="preferred"><primary>XSetTextProperty</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xsettextproperty'>
@@ -1251,7 +1252,6 @@ Specifies the property name.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1283,6 +1283,7 @@ errors.
 <!-- .LP -->
 To read one of a window's text properties, use
 <function>XGetTextProperty</function>.
+</para>
 <indexterm significance="preferred"><primary>XGetTextProperty</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xgettextproperty'>
@@ -1339,7 +1340,6 @@ Specifies the property name.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1399,6 +1399,7 @@ the <property>WM_NAME</property> property for a given window.
 <!-- .LP -->
 To set a window's <property>WM_NAME</property> property with the supplied convenience function, use
 <function>XSetWMName</function>.
+</para>
 <indexterm significance="preferred"><primary>XSetWMName</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xsetwmname'>
@@ -1444,7 +1445,6 @@ structure to be used.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1459,6 +1459,7 @@ to set the <property>WM_NAME</property> property.
 <!-- .LP -->
 To read a window's <property>WM_NAME</property> property with the supplied convenience function, use
 <function>XGetWMName</function>.
+</para>
 <indexterm significance="preferred"><primary>XGetWMName</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xgetwmname'>
@@ -1504,7 +1505,6 @@ structure.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1531,6 +1531,7 @@ for window names that are encoded as STRING properties.
 <!-- .LP -->
 To assign a name to a window, use
 <function>XStoreName</function>.
+</para>
 <indexterm><primary>Window</primary><secondary>name</secondary></indexterm>
 <indexterm significance="preferred"><primary>XStoreName</primary></indexterm>
 <!-- .sM -->
@@ -1576,7 +1577,6 @@ which should be a null-terminated string.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1605,6 +1605,7 @@ errors.
 <!-- .sp -->
 To get the name of a window, use
 <function>XFetchName</function>.
+</para>
 <indexterm significance="preferred"><primary>XFetchName</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xfetchname'>
@@ -1648,7 +1649,6 @@ Returns the window name, which is a null-terminated string.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1693,6 +1693,7 @@ the <property>WM_ICON_NAME</property> property for a given window.
 To set a window's <property>WM_ICON_NAME</property> property,
 use
 <function>XSetWMIconName</function>.
+</para>
 <indexterm significance="preferred"><primary>XSetWMIconName</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xsetwmiconname'>
@@ -1738,7 +1739,6 @@ structure to be used.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1754,6 +1754,7 @@ to set the <property>WM_ICON_NAME</property> property.
 To read a window's <property>WM_ICON_NAME</property> property,
 use
 <function>XGetWMIconName</function>.
+</para>
 <indexterm significance="preferred"><primary>XGetWMIconName</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xgetwmiconname'>
@@ -1799,7 +1800,6 @@ structure.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1827,6 +1827,7 @@ for window names that are encoded as STRING properties.
 <!-- .sp -->
 To set the name to be displayed in a window's icon, use
 <function>XSetIconName</function>.
+</para>
 <indexterm><primary>Window</primary><secondary>icon name</secondary></indexterm>
 <indexterm significance="preferred"><primary>XSetIconName</primary></indexterm>
 <!-- .sM -->
@@ -1872,7 +1873,6 @@ which should be a null-terminated string.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1890,6 +1890,7 @@ errors.
 <!-- .sp -->
 To get the name a window wants displayed in its icon, use
 <function>XGetIconName</function>.
+</para>
 <indexterm significance="preferred"><primary>XGetIconName</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xgeticonname'>
@@ -1934,7 +1935,6 @@ which is a null-terminated string.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -2128,6 +2128,7 @@ or the window to be withdrawn.
 <!-- .sp -->
 To set a window's <property>WM_HINTS</property> property, use
 <function>XSetWMHints</function>.
+</para>
 <indexterm significance="preferred"><primary>XSetWMHints</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xsetwmhints'>
@@ -2173,7 +2174,6 @@ structure to be used.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -2197,6 +2197,7 @@ errors.
 <!-- .sp -->
 To read a window's <property>WM_HINTS</property> property, use
 <function>XGetWMHints</function>.
+</para>
 <indexterm significance="preferred"><primary>XGetWMHints</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xgetwmhints'>
@@ -2229,7 +2230,6 @@ Specifies the window.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -2394,6 +2394,7 @@ macro is highly discouraged.
 <!-- .LP -->
 To set a window's <property>WM_NORMAL_HINTS</property> property, use
 <function>XSetWMNormalHints</function>.
+</para>
 <indexterm significance="preferred"><primary>XSetWMNormalHints</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xsetwmnormalhints'>
@@ -2437,7 +2438,6 @@ Specifies the size hints for the window in its normal state.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -2464,6 +2464,7 @@ errors.
 <!-- .LP -->
 To read a window's <property>WM_NORMAL_HINTS</property> property, use
 <function>XGetWMNormalHints</function>.
+</para>
 <indexterm significance="preferred"><primary>XGetWMNormalHints</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xgetwmnormalhints'>
@@ -2518,7 +2519,6 @@ Returns the hints that were supplied by the user.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -2575,6 +2575,7 @@ error.
 <!-- .LP -->
 To set a window's <property>WM_SIZE_HINTS</property> property, use
 <function>XSetWMSizeHints</function>.
+</para>
 <indexterm significance="preferred"><primary>XSetWMSizeHints</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xsetwmsizehints'>
@@ -2631,7 +2632,6 @@ Specifies the property name.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -2664,6 +2664,7 @@ errors.
 <!-- .LP -->
 To read a window's <property>WM_SIZE_HINTS</property> property, use
 <function>XGetWMSizeHints</function>.
+</para>
 <indexterm significance="preferred"><primary>XGetWMSizeHints</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xgetwmsizehints'>
@@ -2731,7 +2732,6 @@ Specifies the property name.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -2880,6 +2880,7 @@ resource database.
 <!-- .sp -->
 To set a window's <property>WM_CLASS</property> property, use
 <function>XSetClassHint</function>.
+</para>
 <indexterm significance="preferred"><primary>XSetClassHint</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xsetclasshint'>
@@ -2925,7 +2926,6 @@ structure that is to be used.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -2949,6 +2949,7 @@ errors.
 <!-- .sp -->
 To read a window's <property>WM_CLASS</property> property, use
 <function>XGetClassHint</function>.
+</para>
 <indexterm significance="preferred"><primary>XGetClassHint</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xgetclasshint'>
@@ -2994,7 +2995,6 @@ structure.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -3035,6 +3035,7 @@ the <property>WM_TRANSIENT_FOR</property> property for a given window.
 <!-- .sp -->
 To set a window's <property>WM_TRANSIENT_FOR</property> property, use
 <function>XSetTransientForHint</function>.
+</para>
 <indexterm significance="preferred"><primary>XSetTransientForHint</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xsettransientforhint'>
@@ -3078,7 +3079,6 @@ Specifies the window that the <property>WM_TRANSIENT_FOR</property> property is
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -3101,6 +3101,7 @@ errors.
 <!-- .sp -->
 To read a window's <property>WM_TRANSIENT_FOR</property> property, use
 <function>XGetTransientForHint</function>.
+</para>
 <indexterm significance="preferred"><primary>XGetTransientForHint</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xgettransientforhint'>
@@ -3144,7 +3145,6 @@ Returns the <property>WM_TRANSIENT_FOR</property> property of the specified wind
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -3177,6 +3177,7 @@ the <property>WM_PROTOCOLS</property> property for a given window.
 <!-- .sp -->
 To set a window's <property>WM_PROTOCOLS</property> property, use
 <function>XSetWMProtocols</function>.
+</para>
 <indexterm significance="preferred"><primary>XSetWMProtocols</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xsetwmprotocols'>
@@ -3232,7 +3233,6 @@ Specifies the number of (Cn.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -3264,6 +3264,7 @@ errors.
 <!-- .LP -->
 To read a window's <property>WM_PROTOCOLS</property> property, use
 <function>XGetWMProtocols</function>.
+</para>
 <indexterm significance="preferred"><primary>XGetWMProtocols</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xgetwmprotocols'>
@@ -3319,7 +3320,6 @@ Returns the number of (Cn.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -3363,6 +3363,7 @@ the <property>WM_COLORMAP_WINDOWS</property> property for a given window.
 <!-- .LP -->
 To set a window's <property>WM_COLORMAP_WINDOWS</property> property, use
 <function>XSetWMColormapWindows</function>.
+</para>
 <indexterm significance="preferred"><primary>XSetWMColormapWindows</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xsetwmcolormapwindows'>
@@ -3418,7 +3419,6 @@ Specifies the number of (Cn.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -3450,6 +3450,7 @@ errors.
 <!-- .LP -->
 To read a window's <property>WM_COLORMAP_WINDOWS</property> property, use
 <function>XGetWMColormapWindows</function>.
+</para>
 <indexterm significance="preferred"><primary>XGetWMColormapWindows</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xgetwmcolormapwindows'>
@@ -3505,7 +3506,6 @@ Returns the number of (Cn.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -3615,6 +3615,7 @@ sizes (minimum to maximum) that represent the supported icon sizes.
 <!-- .sp -->
 To set a window's <property>WM_ICON_SIZE</property> property, use
 <function>XSetIconSizes</function>.
+</para>
 <indexterm significance="preferred"><primary>XSetIconSizes</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xseticonsizes'>
@@ -3669,7 +3670,6 @@ Specifies the number of items in the size list.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -3691,6 +3691,7 @@ errors.
 <!-- .sp -->
 To read a window's <property>WM_ICON_SIZE</property> property, use
 <function>XGetIconSizes</function>.
+</para>
 <indexterm significance="preferred"><primary>XGetIconSizes</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xgeticonsizes'>
@@ -3745,7 +3746,6 @@ Returns the number of items in the size list.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -3788,6 +3788,7 @@ for internationalized text communication.
 The standard window manager properties for a given window are
 <property>WM_NAME</property>, <property>WM_ICON_NAME</property>, <property>WM_HINTS</property>, <property>WM_NORMAL_HINTS</property>, <property>WM_CLASS</property>,
 <property>WM_COMMAND</property>, <property>WM_CLIENT_MACHINE</property>, and <property>WM_LOCALE_NAME</property>.
+</para>
 <indexterm significance="preferred"><primary>XmbSetWMProperties</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xmbsetwmproperties'>
@@ -3903,7 +3904,6 @@ structure to be used.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -4008,6 +4008,7 @@ with strings in client-specified encodings, use
 The standard window manager properties for a given window are
 <property>WM_NAME</property>, <property>WM_ICON_NAME</property>, <property>WM_HINTS</property>, <property>WM_NORMAL_HINTS</property>, <property>WM_CLASS</property>,
 <property>WM_COMMAND</property>, and <property>WM_CLIENT_MACHINE</property>.
+</para>
 <indexterm significance="preferred"><primary>XSetWMProperties</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xsetwmproperties'>
@@ -4123,7 +4124,6 @@ structure to be used.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -4240,6 +4240,7 @@ the <property>WM_COMMAND</property> property for a given window.
 <!-- .LP -->
 To set a window's <property>WM_COMMAND</property> property, use
 <function>XSetCommand</function>.
+</para>
 <indexterm significance="preferred"><primary>XSetCommand</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xsetcommand'>
@@ -4294,7 +4295,6 @@ Specifies the number of arguments.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -4320,6 +4320,7 @@ errors.
 <!-- .LP -->
 To read a window's <property>WM_COMMAND</property> property, use
 <function>XGetCommand</function>.
+</para>
 <indexterm significance="preferred"><primary>XGetCommand</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xgetcommand'>
@@ -4374,7 +4375,6 @@ Returns the number of arguments returned.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -4411,6 +4411,7 @@ the <property>WM_CLIENT_MACHINE</property> property for a given window.
 <!-- .LP -->
 To set a window's <property>WM_CLIENT_MACHINE</property> property, use
 <function>XSetWMClientMachine</function>.
+</para>
 <indexterm significance="preferred"><primary>XSetWMClientMachine</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xsetwmclientmachine'>
@@ -4456,7 +4457,6 @@ structure to be used.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -4471,6 +4471,7 @@ to set the <property>WM_CLIENT_MACHINE</property> property.
 <!-- .LP -->
 To read a window's <property>WM_CLIENT_MACHINE</property> property, use
 <function>XGetWMClientMachine</function>.
+</para>
 <indexterm significance="preferred"><primary>XGetWMClientMachine</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xgetwmclientmachine'>
@@ -4516,7 +4517,6 @@ structure.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -4933,6 +4933,7 @@ To set an
 <structname>XStandardColormap</structname>
 structure, use
 <function>XSetRGBColormaps</function>.
+</para>
 <indexterm significance="preferred"><primary>XSetRGBColormaps</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xsetrgbcolormaps'>
@@ -5001,7 +5002,6 @@ Specifies the property name.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -5113,6 +5113,7 @@ To obtain the
 <structname>XStandardColormap</structname>
 structure associated with the specified property, use
 <function>XGetRGBColormaps</function>.
+</para>
 <indexterm significance="preferred"><primary>XGetRGBColormaps</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xgetrgbcolormaps'>
@@ -5181,7 +5182,6 @@ Specifies the property name.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
diff --git a/libX11/specs/libX11/CH15.xml b/libX11/specs/libX11/CH15.xml
index 29bd331f0..c012ea7d0 100644
--- a/libX11/specs/libX11/CH15.xml
+++ b/libX11/specs/libX11/CH15.xml
@@ -596,6 +596,7 @@ indicates that an asterisk separates the components.
 To convert a string with one or more components to a binding list
 and a quark list, use
 <function>XrmStringToBindingQuarkList</function>.
+</para>
 <indexterm significance="preferred"><primary>XrmStringToBindingQuarkList</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xrmstringtobindingquarklist'>
@@ -644,7 +645,6 @@ The caller must allocate sufficient space for the quarks list before calling
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -722,6 +722,7 @@ To initialize the resource manager, use
 <!-- .eM -->
 To retrieve a database from disk, use
 <function>XrmGetFileDatabase</function>.
+</para>
 <indexterm significance="preferred"><primary>XrmGetFileDatabase</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xrmgetfiledatabase'>
@@ -743,7 +744,6 @@ Specifies the resource database file name.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -767,6 +767,7 @@ returns NULL.
 <!-- .sp -->
 To store a copy of a database to disk, use
 <function>XrmPutFileDatabase</function>.
+</para>
 <indexterm significance="preferred"><primary>XrmPutFileDatabase</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xrmputfiledatabase'>
@@ -799,7 +800,6 @@ Specifies the file name for the stored database.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -821,6 +821,7 @@ Entries with representation types other than ``String'' are ignored.
 <!-- .sp -->
 To obtain a pointer to the screen-independent resources of a display, use
 <function>XResourceManagerString</function>.
+</para>
 <indexterm significance="preferred"><primary>XResourceManagerString</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xresourcemanagerstring'>
@@ -842,7 +843,6 @@ Specifies the connection to the X server.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -865,6 +865,7 @@ If no property exists, NULL is returned.
 <!-- .sp -->
 To obtain a pointer to the screen-specific resources of a screen, use
 <function>XScreenResourceString</function>.
+</para>
 <indexterm significance="preferred"><primary>XScreenResourceString</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xscreenresourcestring'>
@@ -886,7 +887,6 @@ Specifies the screen.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -909,6 +909,7 @@ The caller is responsible for freeing the returned string by using
 <!-- .sp -->
 To create a database from a string, use
 <function>XrmGetStringDatabase</function>.
+</para>
 <indexterm significance="preferred"><primary>XrmGetStringDatabase</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xrmgetstringdatabase'>
@@ -930,7 +931,6 @@ Specifies the database contents using a string.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -955,6 +955,7 @@ and the database is created in the current locale.
 <!-- .sp -->
 To obtain the locale name of a database, use
 <function>XrmLocaleOfDatabase</function>.
+</para>
 <indexterm significance="preferred"><primary>XrmLocaleOfDatabase</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xrmlocaleofdatabase'>
@@ -976,7 +977,6 @@ Specifies the resource database.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -995,6 +995,7 @@ it will not be modified by Xlib.
 <!-- .sp -->
 To destroy a resource database and free its allocated memory, use
 <function>XrmDestroyDatabase</function>.
+</para>
 <indexterm significance="preferred"><primary>XrmDestroyDatabase</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xrmdestroydatabase'>
@@ -1016,7 +1017,6 @@ Specifies the resource database.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1029,6 +1029,7 @@ returns immediately.
 <!-- .sp -->
 To associate a resource database with a display, use
 <function>XrmSetDatabase</function>.
+</para>
 <indexterm significance="preferred"><primary>XrmSetDatabase</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xrmsetdatabase'>
@@ -1061,7 +1062,6 @@ Specifies the resource database.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1078,6 +1078,7 @@ once it is constructed.
 <!-- .sp -->
 To get the resource database associated with a display, use
 <function>XrmGetDatabase</function>.
+</para>
 <indexterm significance="preferred"><primary>XrmGetDatabase</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xrmgetdatabase'>
@@ -1099,7 +1100,6 @@ Specifies the connection to the X server.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1118,6 +1118,7 @@ It returns NULL if a database has not yet been set.
 <!-- .LP -->
 To merge the contents of a resource file into a database, use
 <function>XrmCombineFileDatabase</function>.
+</para>
 <indexterm significance="preferred"><primary>XrmCombineFileDatabase</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xrmcombinefiledatabase'>
@@ -1162,7 +1163,6 @@ Specifies whether source entries override target ones.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM  -->
@@ -1192,6 +1192,7 @@ The locale of the target database is not modified.
 <!-- .sp -->
 To merge the contents of one database into another database, use
 <function>XrmCombineDatabase</function>.
+</para>
 <indexterm significance="preferred"><primary>XrmCombineDatabase</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xrmcombinedatabase'>
@@ -1235,7 +1236,6 @@ Specifies whether source entries override target ones.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM  -->
@@ -1262,6 +1262,7 @@ The locale of the target database is not modified.
 To merge the contents of one database into another database with override
 semantics, use
 <function>XrmMergeDatabases</function>.
+</para>
 <indexterm significance="preferred"><primary>XrmMergeDatabases</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xrmmergedatabases'>
@@ -1294,7 +1295,6 @@ database is to be merged.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM  -->
@@ -1319,9 +1319,6 @@ To retrieve a resource from a resource database, use
 or
 <function>XrmQGetSearchResource</function>.
 </para>
-<para>
-<!-- .LP -->
-<!-- .sp -->
 <indexterm significance="preferred"><primary>XrmGetResource</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xrmgetresource'>
@@ -1387,11 +1384,6 @@ Returns the value in the database.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
-<para>
-<!-- .LP -->
-<!-- .eM -->
-<!-- .sp -->
 <indexterm significance="preferred"><primary>XrmQGetResource</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xrmqgetresource'>
@@ -1457,7 +1449,6 @@ Returns the value in the database.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1512,6 +1503,7 @@ of database levels that might match the first part of a name/class list.
 <!-- .sp -->
 To obtain a list of database levels, use
 <function>XrmQGetSearchList</function>.
+</para>
 <indexterm significance="preferred"><primary>XrmQGetSearchList</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xrmqgetsearchlist'>
@@ -1579,7 +1571,6 @@ Specifies the number of entries (not the byte size) allocated for list_return.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1621,6 +1612,7 @@ only the common prefix should be specified in the name and class list to
 <!-- .sp -->
 To search resource database levels for a given resource, use
 <function>XrmQGetSearchResource</function>.
+</para>
 <indexterm significance="preferred"><primary>XrmQGetSearchResource</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xrmqgetsearchresource'>
@@ -1687,7 +1679,6 @@ Returns the value in the database.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1732,7 +1723,6 @@ Both functions take a partial resource specification, a
 representation type, and a value.
 This value is copied into the specified database.
 </para>
-<para>
 <!-- .LP -->
 <!-- .sp -->
 <indexterm significance="preferred"><primary>XrmPutResource</primary></indexterm>
@@ -1789,7 +1779,6 @@ Specifies the value of the resource, which is specified as a string.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1810,7 +1799,6 @@ If the specifier and type are not in the Host Portable Character Encoding,
 the result is implementation-dependent.
 The value is stored in the database without modification.
 </para>
-<para>
 <!-- .LP -->
 <!-- .sp -->
 <indexterm significance="preferred"><primary>XrmQPutResource</primary></indexterm>
@@ -1878,7 +1866,6 @@ Specifies the value of the resource, which is specified as a string.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1895,6 +1882,7 @@ The value is stored in the database without modification.
 <!-- .sp -->
 To add a resource that is specified as a string, use
 <function>XrmPutStringResource</function>.
+</para>
 <indexterm significance="preferred"><primary>XrmPutStringResource</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xrmputstringresource'>
@@ -1938,7 +1926,6 @@ Specifies the value of the resource, which is specified as a string.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1962,6 +1949,7 @@ The value is stored in the database without modification.
 <!-- .sp -->
 To add a string resource using quarks as a specification, use
 <function>XrmQPutStringResource</function>.
+</para>
 <indexterm significance="preferred"><primary>XrmQPutStringResource</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xrmqputstringresource'>
@@ -2016,7 +2004,6 @@ Specifies the value of the resource, which is specified as a string.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -2040,6 +2027,7 @@ The value is stored in the database without modification.
 To add a single resource entry that is specified as a string that contains
 both a name and a value, use
 <function>XrmPutLineResource</function>.
+</para>
 <indexterm significance="preferred"><primary>XrmPutLineResource</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xrmputlineresource'>
@@ -2072,7 +2060,6 @@ Specifies the resource name and value pair as a single string.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -2314,6 +2301,7 @@ typedef struct {
 <!-- .sp -->
 To load a resource database from a C command line, use
 <function>XrmParseCommand</function>.
+</para>
 <indexterm significance="preferred"><primary>XrmParseCommand</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xrmparsecommand'>
@@ -2391,7 +2379,6 @@ and returns the remaining arguments.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
diff --git a/libX11/specs/libX11/CH16.xml b/libX11/specs/libX11/CH16.xml
index f8663a006..602668faf 100644
--- a/libX11/specs/libX11/CH16.xml
+++ b/libX11/specs/libX11/CH16.xml
@@ -98,6 +98,7 @@ use the functions described in section 12.7.
 <!-- .sp -->
 To obtain a KeySym for the KeyCode of an event, use
 <function>XLookupKeysym</function>.
+</para>
 <indexterm significance="preferred"><primary>XLookupKeysym</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xlookupkeysym'>
@@ -134,7 +135,6 @@ Specifies the index into the KeySyms list for the event's KeyCode.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -156,6 +156,7 @@ returns
 <!-- .sp -->
 To obtain a KeySym for a specific KeyCode, use
 <function>XKeycodeToKeysym</function>.
+</para>
 <indexterm significance="preferred"><primary>XKeycodeToKeysym</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xkeycodetokeysym'>
@@ -199,7 +200,6 @@ Specifies the element of KeyCode vector.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -218,6 +218,7 @@ returns
 <!-- .sp -->
 To obtain a KeyCode for a key having a specific KeySym, use
 <function>XKeysymToKeycode</function>.
+</para>
 <indexterm significance="preferred"><primary>XKeysymToKeycode</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xkeysymtokeycode'>
@@ -250,7 +251,6 @@ Specifies the KeySym that is to be searched for.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -266,6 +266,7 @@ When this information is changed at the server, an Xlib function must
 be called to refresh the cache.
 To refresh the stored modifier and keymap information, use
 <function>XRefreshKeyboardMapping</function>.
+</para>
 <indexterm significance="preferred"><primary>XRefreshKeyboardMapping</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xrefreshkeyboardmapping'>
@@ -287,7 +288,6 @@ Specifies the mapping event that is to be used.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -308,6 +308,7 @@ The result is to update Xlib's knowledge of the keyboard.
 <!-- .sp -->
 To obtain the uppercase and lowercase forms of a KeySym, use
 <function>XConvertCase</function>.
+</para>
 <indexterm significance="preferred"><primary>XConvertCase</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xconvertcase'>
@@ -352,7 +353,6 @@ Returns the uppercase form of keysym, or keysym.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -371,6 +371,7 @@ implementation-dependent.
 KeySyms have string names as well as numeric codes.
 To convert the name of the KeySym to the KeySym code, use
 <function>XStringToKeysym</function>.
+</para>
 <indexterm significance="preferred"><primary>XStringToKeysym</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xstringtokeysym'>
@@ -392,7 +393,6 @@ Specifies the name of the KeySym that is to be converted.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -421,6 +421,7 @@ returns
 <!-- .sp -->
 To convert a KeySym code to the name of the KeySym, use
 <function>XKeysymToString</function>.
+</para>
 <indexterm significance="preferred"><primary>XKeysymToString</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xkeysymtostring'>
@@ -443,7 +444,6 @@ Specifies the KeySym that is to be (Fn.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -670,6 +670,7 @@ described in chapter 13 and does not depend on the current locale.
 <!-- .sp -->
 To map a key event to an ISO Latin-1 string, use
 <function>XLookupString</function>.
+</para>
 <indexterm significance="preferred"><primary>XLookupString</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xlookupstring'>
@@ -742,7 +743,6 @@ structure or NULL.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -792,6 +792,7 @@ To rebind the meaning of a KeySym for
 <function>XLookupString</function>,
 use
 <function>XRebindKeysym</function>.
+</para>
 <indexterm significance="preferred"><primary>XRebindKeysym</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xrebindkeysym'>
@@ -870,7 +871,6 @@ Specifies the number of bytes in the string argument.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -930,7 +930,6 @@ To parse standard window geometry strings, use
 <indexterm><primary>Window</primary><secondary>determining location</secondary></indexterm>
 <indexterm significance="preferred"><primary>XParseGeometry</primary></indexterm>
 </para>
-<para>
 <!-- .LP -->
 <!-- .sM -->
 <funcsynopsis id='xparsegeometry'>
@@ -996,7 +995,6 @@ Return the width and height determined.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1065,6 +1063,7 @@ you should place the window at the requested position.
 <!-- .LP -->
 To construct a window's geometry information, use
 <function>XWMGeometry</function>.
+</para>
 <indexterm significance="preferred"><primary>XWMGeometry</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xwmgeometry'>
@@ -1197,7 +1196,6 @@ Returns the window gravity.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1367,6 +1365,7 @@ see
 <!-- .sp -->
 To set the clip-mask of a GC to a region, use
 <function>XSetRegion</function>.
+</para>
 <indexterm significance="preferred"><primary>XSetRegion</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xsetregion'>
@@ -1410,7 +1409,6 @@ Specifies the region.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1427,6 +1425,7 @@ the region can be destroyed.
 <!-- .sp -->
 To deallocate the storage associated with a specified region, use
 <function>XDestroyRegion</function>.
+</para>
 <indexterm significance="preferred"><primary>XDestroyRegion</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xdestroyregion'>
@@ -1448,7 +1447,6 @@ Specifies the region.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1463,6 +1461,7 @@ Specifies the region.
 <!-- .LP -->
 To move a region by a specified amount, use 
 <function>XOffsetRegion</function>.
+</para>
 <indexterm significance="preferred"><primary>XOffsetRegion</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xoffsetregion'>
@@ -1508,13 +1507,13 @@ which define the amount you want to (Dy the specified region.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM  -->
 <!-- .sp -->
 To reduce a region by a specified amount, use
 <function>XShrinkRegion</function>.
+</para>
 <indexterm significance="preferred"><primary>XShrinkRegion</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xshrinkregion'>
@@ -1560,7 +1559,6 @@ which define the amount you want to (Dy the specified region.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1578,6 +1576,7 @@ and negative values expand the region.
 <!-- .sp -->
 To generate the smallest rectangle enclosing a region, use
 <function>XClipBox</function>.
+</para>
 <indexterm significance="preferred"><primary>XClipBox</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xclipbox'>
@@ -1610,7 +1609,6 @@ Returns the smallest enclosing rectangle.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1623,6 +1621,7 @@ function returns the smallest rectangle enclosing the specified region.
 <!-- .LP -->
 To compute the intersection of two regions, use
 <function>XIntersectRegion</function>.
+</para>
 <indexterm significance="preferred"><primary>XIntersectRegion</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xintersectregion'>
@@ -1665,13 +1664,13 @@ Returns the result of the computation.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
 <!-- .sp -->
 To compute the union of two regions, use
 <function>XUnionRegion</function>.
+</para>
 <indexterm significance="preferred"><primary>XUnionRegion</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xunionregion'>
@@ -1714,13 +1713,13 @@ Returns the result of the computation.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
 <!-- .sp -->
 To create a union of a source region and a rectangle, use
 <function>XUnionRectWithRegion</function>.
+</para>
 <indexterm significance="preferred"><primary>XUnionRectWithRegion</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xunionrectwithregion'>
@@ -1764,7 +1763,6 @@ Returns the destination region.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1778,6 +1776,7 @@ and the specified source region.
 <!-- .sp -->
 To subtract two regions, use
 <function>XSubtractRegion</function>.
+</para>
 <indexterm significance="preferred"><primary>XSubtractRegion</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xsubtractregion'>
@@ -1820,7 +1819,6 @@ Returns the result of the computation.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1834,6 +1832,7 @@ function subtracts srb from sra and stores the results in dr_return.
 To calculate the difference between the union and intersection 
 of two regions, use
 <function>XXorRegion</function>.
+</para>
 <indexterm significance="preferred"><primary>XXorRegion</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xxorregion'>
@@ -1876,7 +1875,6 @@ Returns the result of the computation.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1891,6 +1889,7 @@ Returns the result of the computation.
 <!-- .LP -->
 To determine if the specified region is empty, use
 <function>XEmptyRegion</function>.
+</para>
 <indexterm significance="preferred"><primary>XEmptyRegion</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xemptyregion'>
@@ -1912,7 +1911,6 @@ Specifies the region.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM  -->
@@ -1927,6 +1925,7 @@ if the region is empty.
 <!-- .sp -->
 To determine if two regions have the same offset, size, and shape, use
 <function>XEqualRegion</function>.
+</para>
 <indexterm significance="preferred"><primary>XEqualRegion</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xequalregion'>
@@ -1959,7 +1958,6 @@ Specify the two regions.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -1979,6 +1977,7 @@ if the two regions have the same offset, size, and shape.
 <!-- .LP -->
 To determine if a specified point resides in a specified region, use
 <function>XPointInRegion</function>.
+</para>
 <indexterm significance="preferred"><primary>XPointInRegion</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xpointinregion'>
@@ -2023,7 +2022,6 @@ Specify the x and y coordinates(Xy.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -2038,6 +2036,7 @@ if the point (x, y) is contained in the region r.
 <!-- .sp -->
 To determine if a specified rectangle is inside a region, use
 <function>XRectInRegion</function>.
+</para>
 <indexterm significance="preferred"><primary>XRectInRegion</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xrectinregion'>
@@ -2105,7 +2104,6 @@ Specify the width and height(Wh.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM  -->
@@ -2151,6 +2149,7 @@ and can be accessed as a ring or as explicit buffers (numbered 0 through 7).
 <!-- .sp -->
 To store data in cut buffer 0, use 
 <function>XStoreBytes</function>.
+</para>
 <indexterm significance="preferred"><primary>XStoreBytes</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xstorebytes'>
@@ -2194,7 +2193,6 @@ Specifies the number of bytes to be stored.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -2216,6 +2214,7 @@ error.
 <!-- .sp -->
 To store data in a specified cut buffer, use
 <function>XStoreBuffer</function>.
+</para>
 <indexterm significance="preferred"><primary>XStoreBuffer</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xstorebuffer'>
@@ -2271,7 +2270,6 @@ Specifies the buffer (Fn.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -2291,6 +2289,7 @@ error.
 <!-- .sp -->
 To return data from cut buffer 0, use 
 <function>XFetchBytes</function>.
+</para>
 <indexterm significance="preferred"><primary>XFetchBytes</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xfetchbytes'>
@@ -2323,7 +2322,6 @@ Returns the number of bytes in the buffer.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -2343,6 +2341,7 @@ The client must free this storage when finished with it by calling
 <!-- .sp -->
 To return data from a specified cut buffer, use 
 <function>XFetchBuffer</function>.
+</para>
 <indexterm significance="preferred"><primary>XFetchBuffer</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xfetchbuffer'>
@@ -2387,7 +2386,6 @@ Specifies the buffer (Fn.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -2402,6 +2400,7 @@ buffer is specified.
 <!-- .sp -->
 To rotate the cut buffers, use 
 <function>XRotateBuffers</function>.
+</para>
 <indexterm significance="preferred"><primary>XRotateBuffers</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xrotatebuffers'>
@@ -2434,7 +2433,6 @@ Specifies how much to rotate the cut buffers.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM  -->
@@ -2522,6 +2520,7 @@ typedef struct {
 To obtain a list of visual information structures that match a specified
 template, use
 <function>XGetVisualInfo</function>.
+</para>
 <indexterm significance="preferred"><primary>XGetVisualInfo</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xgetvisualinfo'>
@@ -2577,7 +2576,6 @@ Returns the number of matching visual structures.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -2597,6 +2595,7 @@ To free the data returned by this function, use
 To obtain the visual information that matches the specified depth and
 class of the screen, use
 <function>XMatchVisualInfo</function>.
+</para>
 <indexterm significance="preferred"><primary>XMatchVisualInfo</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xmatchvisualinfo'>
@@ -2662,7 +2661,6 @@ Returns the matched visual information.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -2747,6 +2745,7 @@ To allocate an
 <structname>XImage</structname>
 structure and initialize it with image format values from a display, use
 <function>XCreateImage</function>.
+</para>
 <indexterm significance="preferred"><primary>XCreateImage</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xcreateimage'>
@@ -2877,7 +2876,6 @@ the start of one scanline and the start of the next.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -2930,6 +2928,7 @@ in the image object and are defined in
 <!-- .sp -->
 To obtain a pixel value in an image, use
 <function>XGetPixel</function>.
+</para>
 <indexterm significance="preferred"><primary>XGetPixel</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xgetpixel'>
@@ -2974,7 +2973,6 @@ Specify the x and y coordinates.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -2991,6 +2989,7 @@ The image must contain the x and y coordinates.
 <!-- .sp -->
 To set a pixel value in an image, use
 <function>XPutPixel</function>.
+</para>
 <indexterm significance="preferred"><primary>XPutPixel</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xputpixel'>
@@ -3046,7 +3045,6 @@ Specifies the new pixel value.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -3063,6 +3061,7 @@ The image must contain the x and y coordinates.
 <!-- .sp -->
 To create a subimage, use
 <function>XSubImage</function>.
+</para>
 <indexterm significance="preferred"><primary>XSubImage</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xsubimage'>
@@ -3129,7 +3128,6 @@ Specifies the height of the new subimage, in pixels.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -3149,6 +3147,7 @@ and subimage_height.
 <!-- .sp -->
 To increment each pixel in an image by a constant value, use
 <function>XAddPixel</function>.
+</para>
 <indexterm significance="preferred"><primary>XAddPixel</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xaddpixel'>
@@ -3181,7 +3180,6 @@ Specifies the constant value that is to be added.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -3198,6 +3196,7 @@ To deallocate the memory allocated in a previous call to
 <function>XCreateImage</function>,
 use
 <function>XDestroyImage</function>.
+</para>
 <indexterm significance="preferred"><primary>XDestroyImage</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xdestroyimage'>
@@ -3219,7 +3218,6 @@ Specifies the image.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -3285,6 +3283,7 @@ The bitmap unit is 8.
 <!-- .sp -->
 To read a bitmap from a file and store it in a pixmap, use
 <function>XReadBitmapFile</function>.
+</para>
 <indexterm significance="preferred"><primary>XReadBitmapFile</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xreadbitmapfile'>
@@ -3385,7 +3384,6 @@ Return the hotspot coordinates.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -3440,6 +3438,7 @@ errors.
 <!-- .sp -->
 To read a bitmap from a file and return it as data, use
 <function>XReadBitmapFileData</function>.
+</para>
 <indexterm significance="preferred"><primary>XReadBitmapFileData</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xreadbitmapfiledata'>
@@ -3517,7 +3516,6 @@ Return the hotspot coordinates.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -3537,6 +3535,7 @@ The status and other return values are the same as for
 <!-- .sp -->
 To write out a bitmap from a pixmap to a file, use
 <function>XWriteBitmapFile</function>.
+</para>
 <indexterm significance="preferred"><primary>XWriteBitmapFile</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xwritebitmapfile'>
@@ -3626,7 +3625,6 @@ in the file.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -3664,6 +3662,7 @@ errors.
 <!-- .sp -->
 To create a pixmap and then store bitmap-format data into it, use
 <function>XCreatePixmapFromBitmapData</function>.
+</para>
 <indexterm significance="preferred"><primary>XCreatePixmapFromBitmapData</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xcreatepixmapfrombitmapdata'>
@@ -3763,7 +3762,6 @@ Specifies the depth of the pixmap.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -3796,6 +3794,7 @@ To include a bitmap written out by
 <indexterm><primary>XWriteBitmapFile</primary></indexterm>
 in a program directly, as opposed to reading it in every time at run time, use
 <function>XCreateBitmapFromData</function>.
+</para>
 <indexterm significance="preferred"><primary>XCreateBitmapFromData</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xcreatebitmapfromdata'>
@@ -3862,7 +3861,6 @@ Specify the width and height.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -3942,6 +3940,7 @@ The symbols used are in
 <!-- .sp -->
 To save a data value that corresponds to a resource ID and context type, use
 <function>XSaveContext</function>.
+</para>
 <indexterm significance="preferred"><primary>XSaveContext</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xsavecontext'>
@@ -3996,7 +3995,6 @@ Specifies the data to be associated with the window and type.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -4016,6 +4014,7 @@ Possible errors are
 <!-- .sp -->
 To get the data associated with a resource ID and type, use
 <function>XFindContext</function>.
+</para>
 <indexterm significance="preferred"><primary>XFindContext</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xfindcontext'>
@@ -4070,7 +4069,6 @@ Returns the data.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
@@ -4089,6 +4087,7 @@ Possible errors are
 <!-- .sp -->
 To delete an entry for a given resource ID and type, use
 <function>XDeleteContext</function>.
+</para>
 <indexterm significance="preferred"><primary>XDeleteContext</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis id='xdeletecontext'>
@@ -4132,7 +4131,6 @@ Specifies the context type to which the data belongs.
   </listitem>
   </varlistentry>
 </variablelist>
-</para>
 <para>
 <!-- .LP -->
 <!-- .eM -->
diff --git a/libX11/specs/libX11/credits.xml b/libX11/specs/libX11/credits.xml
index 13c8c055e..753a6cce2 100644
--- a/libX11/specs/libX11/credits.xml
+++ b/libX11/specs/libX11/credits.xml
@@ -1,235 +1,235 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE preface PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-	  "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
-<preface id="acknowledgments">
-<title>Acknowledgments</title>
-<para>
-The design and implementation of the first 10 versions of X
-were primarily the work of three individuals: Robert Scheifler of the
-MIT Laboratory for Computer Science and Jim Gettys of Digital
-Equipment Corporation and Ron Newman of MIT, both at MIT
-Project Athena. 
-X version 11, however, is the result of the efforts of 
-dozens of individuals at almost as many locations and organizations.
-At the risk of offending some of the players by exclusion, 
-we would like to acknowledge some of the people who deserve special credit 
-and recognition for their work on Xlib.
-Our apologies to anyone inadvertently overlooked.
-</para>
-<sect1 id="release1">
-<title>
-Release 1
-</title>
-<para>
-Our thanks does to Ron Newman (MIT Project Athena),
-who contributed substantially to the
-design and implementation of the Version 11 Xlib interface.
-</para>
-<para>
-Our thanks also goes to Ralph Swick (Project Athena and Digital) who kept 
-it all together for us during the early releases.
-He handled literally thousands of requests from people everywhere
-and saved the sanity of at least one of us.
-His calm good cheer was a foundation on which we could build.
-</para>
-<para>
-Our thanks also goes to Todd Brunhoff (Tektronix) who was ``loaned'' 
-to Project Athena at exactly the right moment to provide very capable 
-and much-needed assistance during the alpha and beta releases.
-He was responsible for the successful integration of sources
-from multiple sites;
-we would not have had a release without him.
-</para>
-<para>
-Our thanks also goes to Al Mento and Al Wojtas of Digital's ULTRIX 
-Documentation Group.
-With good humor and cheer,
-they took a rough draft and made it an infinitely better and more useful 
-document.
-The work they have done will help many everywhere.
-We also would like to thank Hal Murray (Digital SRC) and
-Peter George (Digital VMS) who contributed much
-by proofreading the early drafts of this document.
-</para>
-<para>
-Our thanks also goes to Jeff Dike (Digital UEG), Tom Benson, 
-Jackie Granfield, and Vince Orgovan (Digital VMS) who helped with the 
-library utilities implementation;
-to Hania Gajewska (Digital UEG-WSL) who,
-along with Ellis Cohen (CMU and Siemens),
-was instrumental in the semantic design of the window manager properties;
-and to Dave Rosenthal (Sun Microsystems) who also contributed to the protocol 
-and provided the sample generic color frame buffer device-dependent code.
-</para>
-<para>
-The alpha and beta test participants deserve special recognition and thanks
-as well.
-It is significant
-that the bug reports (and many fixes) during alpha and beta test came almost
-exclusively from just a few of the alpha testers, mostly hardware vendors
-working on product implementations of X.  
-The continued public
-contribution of vendors and universities is certainly to the benefit 
-of the entire X community.
-</para>
-<para>
-Our special thanks must go to Sam Fuller, Vice-President of Corporate
-Research at Digital, who has remained committed to the widest public 
-availability of X and who made it possible to greatly supplement MIT's
-resources with the Digital staff in order to make version 11 a reality.
-Many of the people mentioned here are part of the Western
-Software Laboratory (Digital UEG-WSL) of the ULTRIX Engineering group
-and work for Smokey Wallace, who has been vital to the project's success. 
-Others not mentioned here worked on the toolkit and are acknowledged 
-in the X Toolkit documentation.
-</para>
-<para>
-Of course, 
-we must particularly thank Paul Asente, formerly of Stanford University
-and now of Digital UEG-WSL, who wrote W, the predecessor to X,
-and Brian Reid, formerly of Stanford University and now of Digital WRL,
-who had much to do with W's design.
-</para>
-<para>
-Finally, our thanks goes to MIT,  Digital Equipment Corporation,
-and IBM for providing the environment where it could happen.
-</para>
-</sect1>
-<sect1 id="release4">
-<title>
-Release 4
-</title>
-<para>
-Our thanks go to Jim Fulton (MIT X Consortium) for designing and
-specifying the new Xlib functions for Inter-Client Communication
-Conventions (<acronym>ICCCM</acronym>) support.
-</para>
-<para>
-We also thank Al Mento of Digital for his continued effort in
-maintaining this document and Jim Fulton and Donna Converse (MIT X Consortium)
-for their much-appreciated efforts in reviewing the changes.
-</para>
-</sect1>
-<sect1 id="release5">
-<title>
-Release 5
-</title>
-<para>
-The principal authors of the Input Method facilities are
-Vania Joloboff (Open Software Foundation) and Bill McMahon (Hewlett-Packard).
-The principal author of the rest of the internationalization facilities
-is Glenn Widener (Tektronix).  Our thanks to them for keeping their
-sense of humor through a long and sometimes difficult design process.
-Although the words and much of the design are due to them, many others
-have contributed substantially to the design and implementation.
-Tom McFarland (HP) and Frank Rojas (IBM) deserve particular recognition
-for their contributions.   Other contributors were:
-Tim Anderson (Motorola), Alka Badshah (OSF), Gabe Beged-Dov (HP),
-Chih-Chung Ko (III), Vera Cheng (III), Michael Collins (Digital),
-Walt Daniels (IBM), Noritoshi Demizu (OMRON), Keisuke Fukui (Fujitsu),
-Hitoshoi Fukumoto (Nihon Sun), Tim Greenwood (Digital), John Harvey (IBM),
-Hideki Hiura (Sun), Fred Horman (AT&amp;T), Norikazu Kaiya (Fujitsu),
-Yuji Kamata (IBM),
-Yutaka Kataoka (Waseda University), Ranee Khubchandani (Sun), Akira Kon (NEC),
-Hiroshi Kuribayashi (OMRON), Teruhiko Kurosaka (Sun), Seiji Kuwari (OMRON),
-Sandra Martin (OSF), Narita Masahiko (Fujitsu), Masato Morisaki (NTT),
-Nelson Ng (Sun),
-Takashi Nishimura (NTT America), Makato Nishino (IBM),
-Akira Ohsone (Nihon Sun), Chris Peterson (MIT), Sam Shteingart (AT&amp;T),
-Manish Sheth (AT&amp;T), Muneiyoshi Suzuki (NTT), Cori Mehring (Digital),
-Shoji Sugiyama (IBM), and Eiji Tosa (IBM).
-</para>
-<para>
-We are deeply indebted to Tatsuya Kato (NTT),
-Hiroshi Kuribayashi (OMRON), Seiji Kuwari (OMRON), Muneiyoshi Suzuki (NTT),
-and Li Yuhong (OMRON) for producing one of the first complete
-sample implementation of the internationalization facilities, and 
-Hiromu Inukai (Nihon Sun), Takashi Fujiwara (Fujitsu), Hideki Hiura (Sun), 
-Yasuhiro Kawai (Oki Technosystems Laboratory), Kazunori Nishihara (Fuji Xerox),
-Masaki Takeuchi (Sony), Katsuhisa Yano (Toshiba),
-Makoto Wakamatsu (Sony Corporation) for producing the another complete
-sample implementation of the internationalization facilities.
-</para>
-<para>
-The principal authors (design and implementation) of the Xcms color
-management facilities are Al Tabayoyon (Tektronix)
-and Chuck Adams (Tektronix).  
-Joann Taylor (Tektronix), Bob Toole (Tektronix),
-and Keith Packard (MIT X Consortium) also
-contributed significantly to the design.  Others who contributed are:
-Harold Boll (Kodak), Ken Bronstein (HP), Nancy Cam (SGI),
-Donna Converse (MIT X Consortium), Elias Israel (ISC), Deron Johnson (Sun),
-Jim King (Adobe), Ricardo Motta (HP), Chuck Peek (IBM),
-Wil Plouffe (IBM), Dave Sternlicht (MIT X Consortium), Kumar Talluri (AT&amp;T),
-and Richard Verberg (IBM).
-</para>
-<para>
-We also once again thank Al Mento of Digital for his work in formatting
-and reformatting text for this manual, and for producing man pages.
-Thanks also to Clive Feather (IXI) for proof-reading and finding a
-number of small errors.
-</para>
-</sect1>
-<sect1 id="release6">
-<title>
-Release 6
-</title>
-<para>
-Stephen Gildea (X Consortium) authored the threads support.
-Ovais Ashraf (Sun) and Greg Olsen (Sun) contributed substantially
-by testing the facilities and reporting bugs in a timely fashion.
-</para>
-<para>
-The principal authors of the internationalization facilities, including
-Input and Output Methods, are Hideki Hiura (SunSoft) and
-Shigeru Yamada (Fujitsu OSSI).
-Although the words and much of the design are due to them, many others
-have contributed substantially to the design and implementation.
-They are: Takashi Fujiwara (Fujitsu), Yoshio Horiuchi (IBM),
-Makoto Inada (Digital), Hiromu Inukai (Nihon SunSoft),
-Song JaeKyung (KAIST), Franky Ling (Digital), Tom McFarland (HP),
-Hiroyuki Miyamoto (Digital), Masahiko Narita (Fujitsu),
-Frank Rojas (IBM), Hidetoshi Tajima (HP), Masaki Takeuchi (Sony),
-Makoto Wakamatsu (Sony), Masaki Wakao (IBM), Katsuhisa Yano(Toshiba) and
-Jinsoo Yoon (KAIST).
-</para>
-<para>
-The principal producers of the sample implementation of the 
-internationalization facilities are: 
-Jeffrey Bloomfield (Fujitsu OSSI), Takashi Fujiwara (Fujitsu),
-Hideki Hiura (SunSoft), Yoshio Horiuchi (IBM), 
-Makoto Inada (Digital), Hiromu Inukai (Nihon SunSoft), 
-Song JaeKyung (KAIST), Riki Kawaguchi (Fujitsu), 
-Franky Ling (Digital), Hiroyuki Miyamoto (Digital), 
-Hidetoshi Tajima (HP), Toshimitsu Terazono (Fujitsu), 
-Makoto Wakamatsu (Sony), Masaki Wakao (IBM), 
-Shigeru Yamada (Fujitsu OSSI) and Katsuhisa Yano (Toshiba).
-</para>
-<para>
-The coordinators of the integration, testing, and release of this 
-implementation of the internationalization facilities are
-Nobuyuki Tanaka (Sony) and Makoto Wakamatsu (Sony).
-</para>
-<para>
-Others who have contributed to the architectural design or
-testing of the sample implementation of the
-internationalization facilities are:
-Hector Chan (Digital), Michael Kung (IBM), Joseph Kwok (Digital),
-Hiroyuki Machida (Sony), Nelson Ng (SunSoft), Frank Rojas (IBM), 
-Yoshiyuki Segawa (Fujitsu OSSI), Makiko Shimamura (Fujitsu), 
-Shoji Sugiyama (IBM), Lining Sun (SGI), Masaki Takeuchi (Sony),
-Jinsoo Yoon (KAIST) and Akiyasu Zen (HP).
-</para>
-<para>
-<literallayout>
-Jim Gettys
-Cambridge Research Laboratory
-Digital Equipment Corporation
-
-Robert W. Scheifler
-Laboratory for Computer Science
-Massachusetts Institute of Technology
-</literallayout>
-</para>
-</sect1>
-</preface>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE preface PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+	  "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
+<preface id="acknowledgments">
+<title>Acknowledgments</title>
+<para>
+The design and implementation of the first 10 versions of X
+were primarily the work of three individuals: Robert Scheifler of the
+MIT Laboratory for Computer Science and Jim Gettys of Digital
+Equipment Corporation and Ron Newman of MIT, both at MIT
+Project Athena. 
+X version 11, however, is the result of the efforts of 
+dozens of individuals at almost as many locations and organizations.
+At the risk of offending some of the players by exclusion, 
+we would like to acknowledge some of the people who deserve special credit 
+and recognition for their work on Xlib.
+Our apologies to anyone inadvertently overlooked.
+</para>
+<simplesect>
+<title>
+Release 1
+</title>
+<para>
+Our thanks does to Ron Newman (MIT Project Athena),
+who contributed substantially to the
+design and implementation of the Version 11 Xlib interface.
+</para>
+<para>
+Our thanks also goes to Ralph Swick (Project Athena and Digital) who kept 
+it all together for us during the early releases.
+He handled literally thousands of requests from people everywhere
+and saved the sanity of at least one of us.
+His calm good cheer was a foundation on which we could build.
+</para>
+<para>
+Our thanks also goes to Todd Brunhoff (Tektronix) who was ``loaned'' 
+to Project Athena at exactly the right moment to provide very capable 
+and much-needed assistance during the alpha and beta releases.
+He was responsible for the successful integration of sources
+from multiple sites;
+we would not have had a release without him.
+</para>
+<para>
+Our thanks also goes to Al Mento and Al Wojtas of Digital's ULTRIX 
+Documentation Group.
+With good humor and cheer,
+they took a rough draft and made it an infinitely better and more useful 
+document.
+The work they have done will help many everywhere.
+We also would like to thank Hal Murray (Digital SRC) and
+Peter George (Digital VMS) who contributed much
+by proofreading the early drafts of this document.
+</para>
+<para>
+Our thanks also goes to Jeff Dike (Digital UEG), Tom Benson, 
+Jackie Granfield, and Vince Orgovan (Digital VMS) who helped with the 
+library utilities implementation;
+to Hania Gajewska (Digital UEG-WSL) who,
+along with Ellis Cohen (CMU and Siemens),
+was instrumental in the semantic design of the window manager properties;
+and to Dave Rosenthal (Sun Microsystems) who also contributed to the protocol 
+and provided the sample generic color frame buffer device-dependent code.
+</para>
+<para>
+The alpha and beta test participants deserve special recognition and thanks
+as well.
+It is significant
+that the bug reports (and many fixes) during alpha and beta test came almost
+exclusively from just a few of the alpha testers, mostly hardware vendors
+working on product implementations of X.  
+The continued public
+contribution of vendors and universities is certainly to the benefit 
+of the entire X community.
+</para>
+<para>
+Our special thanks must go to Sam Fuller, Vice-President of Corporate
+Research at Digital, who has remained committed to the widest public 
+availability of X and who made it possible to greatly supplement MIT's
+resources with the Digital staff in order to make version 11 a reality.
+Many of the people mentioned here are part of the Western
+Software Laboratory (Digital UEG-WSL) of the ULTRIX Engineering group
+and work for Smokey Wallace, who has been vital to the project's success. 
+Others not mentioned here worked on the toolkit and are acknowledged 
+in the X Toolkit documentation.
+</para>
+<para>
+Of course, 
+we must particularly thank Paul Asente, formerly of Stanford University
+and now of Digital UEG-WSL, who wrote W, the predecessor to X,
+and Brian Reid, formerly of Stanford University and now of Digital WRL,
+who had much to do with W's design.
+</para>
+<para>
+Finally, our thanks goes to MIT,  Digital Equipment Corporation,
+and IBM for providing the environment where it could happen.
+</para>
+</simplesect>
+<simplesect>
+<title>
+Release 4
+</title>
+<para>
+Our thanks go to Jim Fulton (MIT X Consortium) for designing and
+specifying the new Xlib functions for Inter-Client Communication
+Conventions (<acronym>ICCCM</acronym>) support.
+</para>
+<para>
+We also thank Al Mento of Digital for his continued effort in
+maintaining this document and Jim Fulton and Donna Converse (MIT X Consortium)
+for their much-appreciated efforts in reviewing the changes.
+</para>
+</simplesect>
+<simplesect>
+<title>
+Release 5
+</title>
+<para>
+The principal authors of the Input Method facilities are
+Vania Joloboff (Open Software Foundation) and Bill McMahon (Hewlett-Packard).
+The principal author of the rest of the internationalization facilities
+is Glenn Widener (Tektronix).  Our thanks to them for keeping their
+sense of humor through a long and sometimes difficult design process.
+Although the words and much of the design are due to them, many others
+have contributed substantially to the design and implementation.
+Tom McFarland (HP) and Frank Rojas (IBM) deserve particular recognition
+for their contributions.   Other contributors were:
+Tim Anderson (Motorola), Alka Badshah (OSF), Gabe Beged-Dov (HP),
+Chih-Chung Ko (III), Vera Cheng (III), Michael Collins (Digital),
+Walt Daniels (IBM), Noritoshi Demizu (OMRON), Keisuke Fukui (Fujitsu),
+Hitoshoi Fukumoto (Nihon Sun), Tim Greenwood (Digital), John Harvey (IBM),
+Hideki Hiura (Sun), Fred Horman (AT&amp;T), Norikazu Kaiya (Fujitsu),
+Yuji Kamata (IBM),
+Yutaka Kataoka (Waseda University), Ranee Khubchandani (Sun), Akira Kon (NEC),
+Hiroshi Kuribayashi (OMRON), Teruhiko Kurosaka (Sun), Seiji Kuwari (OMRON),
+Sandra Martin (OSF), Narita Masahiko (Fujitsu), Masato Morisaki (NTT),
+Nelson Ng (Sun),
+Takashi Nishimura (NTT America), Makato Nishino (IBM),
+Akira Ohsone (Nihon Sun), Chris Peterson (MIT), Sam Shteingart (AT&amp;T),
+Manish Sheth (AT&amp;T), Muneiyoshi Suzuki (NTT), Cori Mehring (Digital),
+Shoji Sugiyama (IBM), and Eiji Tosa (IBM).
+</para>
+<para>
+We are deeply indebted to Tatsuya Kato (NTT),
+Hiroshi Kuribayashi (OMRON), Seiji Kuwari (OMRON), Muneiyoshi Suzuki (NTT),
+and Li Yuhong (OMRON) for producing one of the first complete
+sample implementation of the internationalization facilities, and 
+Hiromu Inukai (Nihon Sun), Takashi Fujiwara (Fujitsu), Hideki Hiura (Sun), 
+Yasuhiro Kawai (Oki Technosystems Laboratory), Kazunori Nishihara (Fuji Xerox),
+Masaki Takeuchi (Sony), Katsuhisa Yano (Toshiba),
+Makoto Wakamatsu (Sony Corporation) for producing the another complete
+sample implementation of the internationalization facilities.
+</para>
+<para>
+The principal authors (design and implementation) of the Xcms color
+management facilities are Al Tabayoyon (Tektronix)
+and Chuck Adams (Tektronix).  
+Joann Taylor (Tektronix), Bob Toole (Tektronix),
+and Keith Packard (MIT X Consortium) also
+contributed significantly to the design.  Others who contributed are:
+Harold Boll (Kodak), Ken Bronstein (HP), Nancy Cam (SGI),
+Donna Converse (MIT X Consortium), Elias Israel (ISC), Deron Johnson (Sun),
+Jim King (Adobe), Ricardo Motta (HP), Chuck Peek (IBM),
+Wil Plouffe (IBM), Dave Sternlicht (MIT X Consortium), Kumar Talluri (AT&amp;T),
+and Richard Verberg (IBM).
+</para>
+<para>
+We also once again thank Al Mento of Digital for his work in formatting
+and reformatting text for this manual, and for producing man pages.
+Thanks also to Clive Feather (IXI) for proof-reading and finding a
+number of small errors.
+</para>
+</simplesect>
+<simplesect>
+<title>
+Release 6
+</title>
+<para>
+Stephen Gildea (X Consortium) authored the threads support.
+Ovais Ashraf (Sun) and Greg Olsen (Sun) contributed substantially
+by testing the facilities and reporting bugs in a timely fashion.
+</para>
+<para>
+The principal authors of the internationalization facilities, including
+Input and Output Methods, are Hideki Hiura (SunSoft) and
+Shigeru Yamada (Fujitsu OSSI).
+Although the words and much of the design are due to them, many others
+have contributed substantially to the design and implementation.
+They are: Takashi Fujiwara (Fujitsu), Yoshio Horiuchi (IBM),
+Makoto Inada (Digital), Hiromu Inukai (Nihon SunSoft),
+Song JaeKyung (KAIST), Franky Ling (Digital), Tom McFarland (HP),
+Hiroyuki Miyamoto (Digital), Masahiko Narita (Fujitsu),
+Frank Rojas (IBM), Hidetoshi Tajima (HP), Masaki Takeuchi (Sony),
+Makoto Wakamatsu (Sony), Masaki Wakao (IBM), Katsuhisa Yano(Toshiba) and
+Jinsoo Yoon (KAIST).
+</para>
+<para>
+The principal producers of the sample implementation of the 
+internationalization facilities are: 
+Jeffrey Bloomfield (Fujitsu OSSI), Takashi Fujiwara (Fujitsu),
+Hideki Hiura (SunSoft), Yoshio Horiuchi (IBM), 
+Makoto Inada (Digital), Hiromu Inukai (Nihon SunSoft), 
+Song JaeKyung (KAIST), Riki Kawaguchi (Fujitsu), 
+Franky Ling (Digital), Hiroyuki Miyamoto (Digital), 
+Hidetoshi Tajima (HP), Toshimitsu Terazono (Fujitsu), 
+Makoto Wakamatsu (Sony), Masaki Wakao (IBM), 
+Shigeru Yamada (Fujitsu OSSI) and Katsuhisa Yano (Toshiba).
+</para>
+<para>
+The coordinators of the integration, testing, and release of this 
+implementation of the internationalization facilities are
+Nobuyuki Tanaka (Sony) and Makoto Wakamatsu (Sony).
+</para>
+<para>
+Others who have contributed to the architectural design or
+testing of the sample implementation of the
+internationalization facilities are:
+Hector Chan (Digital), Michael Kung (IBM), Joseph Kwok (Digital),
+Hiroyuki Machida (Sony), Nelson Ng (SunSoft), Frank Rojas (IBM), 
+Yoshiyuki Segawa (Fujitsu OSSI), Makiko Shimamura (Fujitsu), 
+Shoji Sugiyama (IBM), Lining Sun (SGI), Masaki Takeuchi (Sony),
+Jinsoo Yoon (KAIST) and Akiyasu Zen (HP).
+</para>
+<para>
+<literallayout>
+Jim Gettys
+Cambridge Research Laboratory
+Digital Equipment Corporation
+
+Robert W. Scheifler
+Laboratory for Computer Science
+Massachusetts Institute of Technology
+</literallayout>
+</para>
+</simplesect>
+</preface>