Update to libXext 1.3.1

7 files changed, 303 insertions, 259 deletions

diff --git a/lib/libXext/specs/Makefile.am b/lib/libXext/specs/Makefile.am
index 659b5d217..80fb18f81 100644
--- a/lib/libXext/specs/Makefile.am
+++ b/lib/libXext/specs/Makefile.am
@@ -1,6 +1,5 @@
 
 if ENABLE_SPECS
-if HAVE_XMLTO
 
 # Main DocBook/XML files (DOCTYPE book)
 docbook = dbelib.xml dpmslib.xml shapelib.xml synclib.xml xtest1.xml
@@ -11,5 +10,4 @@ shelfdir = $(docdir)
 # Generate DocBook/XML output formats with or without stylesheets
 include $(top_srcdir)/docbook.am
 
-endif HAVE_XMLTO
 endif ENABLE_SPECS
diff --git a/lib/libXext/specs/Makefile.in b/lib/libXext/specs/Makefile.in
index b1d657517..eaaca2566 100644
--- a/lib/libXext/specs/Makefile.in
+++ b/lib/libXext/specs/Makefile.in
@@ -39,9 +39,9 @@ pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
+install_sh_DATA = ${SHELL} $(install_sh) -c -m 644
+install_sh_PROGRAM = ${SHELL} $(install_sh) -c
+install_sh_SCRIPT = ${SHELL} $(install_sh) -c
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = $(program_transform_name)
 NORMAL_INSTALL = :
@@ -54,8 +54,12 @@ build_triplet = @build@
 host_triplet = @host@
 DIST_COMMON = $(am__dist_shelf_DATA_DIST) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(top_srcdir)/docbook.am
-@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@am__append_1 = $(docbook:.xml=.pdf) $(docbook:.xml=.ps)
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@am__append_2 = $(docbook:.xml=.txt)
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@am__append_1 = $(docbook:.xml=.html)
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@am__append_2 = $(docbook:.xml=.txt)
+@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@am__append_3 = $(docbook:.xml=.pdf) \
+@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	$(docbook:.xml=.ps)
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@am__append_4 = $(docbook:.xml=.html.db) \
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	$(docbook:.xml=.pdf.db)
 subdir = specs
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -74,12 +78,10 @@ am__vpath_adj = case $$p in \
     *) f=$$p;; \
   esac;
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(sgmldbsdir)" \
-	"$(DESTDIR)$(shelfdir)"
+am__installdirs = "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(shelfdir)"
 dist_shelfDATA_INSTALL = $(INSTALL_DATA)
-sgmldbsDATA_INSTALL = $(INSTALL_DATA)
 shelfDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(dist_shelf_DATA) $(sgmldbs_DATA) $(shelf_DATA)
+DATA = $(dist_shelf_DATA) $(shelf_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
@@ -95,6 +97,7 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BASE_CFLAGS = @BASE_CFLAGS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -102,17 +105,14 @@ CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -120,8 +120,7 @@ EGREP = @EGREP@
 ENABLE_SPECS_FALSE = @ENABLE_SPECS_FALSE@
 ENABLE_SPECS_TRUE = @ENABLE_SPECS_TRUE@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 FOP = @FOP@
@@ -141,6 +140,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -152,6 +152,7 @@ LINTLIB = @LINTLIB@
 LINT_FALSE = @LINT_FALSE@
 LINT_FLAGS = @LINT_FLAGS@
 LINT_TRUE = @LINT_TRUE@
+LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
@@ -161,11 +162,16 @@ MAKEINFO = @MAKEINFO@
 MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
 MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
 MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MAN_SUBSTS = @MAN_SUBSTS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -178,6 +184,7 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+STRICT_CFLAGS = @STRICT_CFLAGS@
 STRIP = @STRIP@
 STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@
 VERSION = @VERSION@
@@ -191,13 +198,11 @@ XORG_SGML_PATH = @XORG_SGML_PATH@
 XSLTPROC = @XSLTPROC@
 XSL_STYLESHEET = @XSL_STYLESHEET@
 XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -240,61 +245,67 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 
 # Main DocBook/XML files (DOCTYPE book)
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@docbook = dbelib.xml dpmslib.xml shapelib.xml synclib.xml xtest1.xml
+@ENABLE_SPECS_TRUE@docbook = dbelib.xml dpmslib.xml shapelib.xml synclib.xml xtest1.xml
 
 # The location where the DocBook/XML files and their generated formats are installed
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@shelfdir = $(docdir)
+@ENABLE_SPECS_TRUE@shelfdir = $(docdir)
 
 # DocBook/XML generated output formats to be installed
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@shelf_DATA =  \
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	$(docbook:.xml=.html) \
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	$(am__append_1) \
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	$(am__append_2)
+@ENABLE_SPECS_TRUE@shelf_DATA = $(am__append_1) $(am__append_2) \
+@ENABLE_SPECS_TRUE@	$(am__append_3) $(am__append_4)
 
 # DocBook/XML file with chapters, appendix and images it includes
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@dist_shelf_DATA = $(docbook) $(chapters)
+@ENABLE_SPECS_TRUE@dist_shelf_DATA = $(docbook) $(chapters)
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_SEARCHPATH_FLAGS = \
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	--searchpath "$(XORG_SGML_PATH)/X11" 		\
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	--searchpath "$(abs_top_builddir)"
+
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_HTML_OLINK_FLAGS = \
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	--stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.html.xml \
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	--stringparam current.docid="$(<:.xml=)"
+
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_HTML_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_HTML_FLAGS = \
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	$(XMLTO_SEARCHPATH_FLAGS)			\
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	$(XMLTO_HTML_STYLESHEET_FLAGS)			\
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	$(XMLTO_HTML_OLINK_FLAGS)
+
+@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_IMAGEPATH_FLAGS = --stringparam img.src.path=$(abs_builddir)/
+@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_PDF_OLINK_FLAGS = \
+@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	--stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.pdf.xml \
+@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	--stringparam current.docid="$(<:.xml=)"
+
+@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-fo.xsl
+@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_FLAGS = \
+@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	$(XMLTO_SEARCHPATH_FLAGS)			\
+@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	$(XMLTO_FO_STYLESHEET_FLAGS)			\
+@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	$(XMLTO_FO_IMAGEPATH_FLAGS)			\
+@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	$(XMLTO_PDF_OLINK_FLAGS)
 
-#
-# Generate DocBook/XML output formats with or without stylesheets
-#
-
-# Stylesheets are available if the package xorg-sgml-doctools is installed
-
-# The location where all cross reference databases are installed
-@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@sgmldbsdir = $(XORG_SGML_PATH)/X11/dbs
-@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@masterdb = "$(sgmldbsdir)/masterdb$(suffix $@).xml"
-@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FLAGS = \
-@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	--searchpath "$(XORG_SGML_PATH)/X11"			\
-@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	--stringparam target.database.document=$(masterdb)	\
-@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	--stringparam current.docid="$(<:.xml=)"		\
-@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	--stringparam collect.xref.targets="no"
-
-@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_XHTML_FLAGS = \
-@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	-x $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl \
-@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	--stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css
 
-@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_FLAGS = \
-@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	-x $(STYLESHEET_SRCDIR)/xorg-fo.xsl
-
-
-#
 # Generate documents cross-reference target databases
-#
-
-# This is only possible if the xorg-sgml-doctools package is installed
-
-# DocBook/XML generated document cross-reference database
-@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@sgmldbs_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
-@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLTPROC_FLAGS = \
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_SEARCHPATH_FLAGS = \
 @ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	--path "$(XORG_SGML_PATH)/X11"			\
-@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	--stringparam targets.filename "$@"		\
-@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	--stringparam collect.xref.targets "only"	\
-@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	--nonet --xinclude
-
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@CLEANFILES = $(shelf_DATA) $(sgmldbs_DATA)
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	--path "$(abs_top_builddir)"
+
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_OLINK_FLAGS = \
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	--stringparam targets.filename "$@" 		\
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	--stringparam collect.xref.targets "only" 	\
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	--stringparam olink.base.uri "$(@:.db=)"
+
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_HTML_FLAGS = \
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	$(XSLT_SEARCHPATH_FLAGS) 			\
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	$(XSLT_OLINK_FLAGS)				\
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	--nonet --xinclude				\
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	$(STYLESHEET_SRCDIR)/xorg-xhtml.xsl
+
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_PDF_FLAGS = \
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	$(XSLT_SEARCHPATH_FLAGS) 			\
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	$(XSLT_OLINK_FLAGS)				\
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	--nonet --xinclude				\
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	$(STYLESHEET_SRCDIR)/xorg-fo.xsl
+
+@ENABLE_SPECS_TRUE@CLEANFILES = $(shelf_DATA)
 all: all-am
 
 .SUFFIXES:
@@ -354,23 +365,6 @@ uninstall-dist_shelfDATA:
 	  echo " rm -f '$(DESTDIR)$(shelfdir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(shelfdir)/$$f"; \
 	done
-install-sgmldbsDATA: $(sgmldbs_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(sgmldbsdir)" || $(mkdir_p) "$(DESTDIR)$(sgmldbsdir)"
-	@list='$(sgmldbs_DATA)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(sgmldbsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sgmldbsdir)/$$f'"; \
-	  $(sgmldbsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sgmldbsdir)/$$f"; \
-	done
-
-uninstall-sgmldbsDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(sgmldbs_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(sgmldbsdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(sgmldbsdir)/$$f"; \
-	done
 install-shelfDATA: $(shelf_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(shelfdir)" || $(mkdir_p) "$(DESTDIR)$(shelfdir)"
@@ -427,7 +421,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(DATA)
 installdirs:
-	for dir in "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(sgmldbsdir)" "$(DESTDIR)$(shelfdir)"; do \
+	for dir in "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(shelfdir)"; do \
 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-am
@@ -473,8 +467,7 @@ info: info-am
 
 info-am:
 
-install-data-am: install-dist_shelfDATA install-sgmldbsDATA \
-	install-shelfDATA
+install-data-am: install-dist_shelfDATA install-shelfDATA
 
 install-exec-am:
 
@@ -501,36 +494,31 @@ ps: ps-am
 ps-am:
 
 uninstall-am: uninstall-dist_shelfDATA uninstall-info-am \
-	uninstall-sgmldbsDATA uninstall-shelfDATA
+	uninstall-shelfDATA
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	distclean distclean-generic distclean-libtool distdir dvi \
 	dvi-am html html-am info info-am install install-am \
 	install-data install-data-am install-dist_shelfDATA \
 	install-exec install-exec-am install-info install-info-am \
-	install-man install-sgmldbsDATA install-shelfDATA \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am uninstall-dist_shelfDATA \
-	uninstall-info-am uninstall-sgmldbsDATA uninstall-shelfDATA
-
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@%.html: %.xml  $(chapters)
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_XHTML_FLAGS) xhtml-nochunks $<
-@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@%.pdf: %.xml $(chapters)
-@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_FO_FLAGS) --with-fop pdf $<
-@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@%.ps: %.xml $(chapters)
-@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_FO_FLAGS) --with-fop ps $<
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@%.txt: %.xml $(chapters)
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_XHTML_FLAGS) txt $<
-
+	install-man install-shelfDATA install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-dist_shelfDATA uninstall-info-am uninstall-shelfDATA
+
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.html: %.xml $(chapters)
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) xhtml-nochunks $<
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@%.txt: %.xml $(chapters)
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) txt $<
+@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.pdf: %.xml $(chapters)
+@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop pdf $<
+@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.ps: %.xml $(chapters)
+@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop ps $<
 @ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@%.html.db: %.xml  $(chapters)
-@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	$(AM_V_GEN)$(XSLTPROC) $(XSLTPROC_FLAGS) \
-@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl $<
-
-@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@%.fo.db: %.xml $(chapters)
-@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	$(AM_V_GEN)$(XSLTPROC) $(XSLTPROC_FLAGS) \
-@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl $<
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	$(AM_V_GEN)$(XSLTPROC) $(XSLT_HTML_FLAGS) $<
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@%.pdf.db: %.xml $(chapters)
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	$(AM_V_GEN)$(XSLTPROC) $(XSLT_PDF_FLAGS) $<
 
 # Generate DocBook/XML output formats with or without stylesheets
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/lib/libXext/specs/dbelib.xml b/lib/libXext/specs/dbelib.xml
index a1010c89d..f1692d03c 100644
--- a/lib/libXext/specs/dbelib.xml
+++ b/lib/libXext/specs/dbelib.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-                   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
+                   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
+[
+<!ENTITY % defs SYSTEM "defs.ent"> %defs;
+]>
 
 
 <!-- lifted from troff+ms+XMan by doclifter -->
@@ -9,24 +12,34 @@
 <bookinfo>
    <title>Double Buffer Extension Library</title>
    <subtitle>X Consortium Standard</subtitle>
-   <!-- <releaseinfo>X Version 11, Release 6.4</releaseinfo> -->
+   <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo>
+   <releaseinfo>Version 1.0</releaseinfo>
    <authorgroup>
       <author>
          <firstname>Ian</firstname><surname>Elliot</surname>
+         <affiliation><orgname>Hewlett-Packard Company</orgname></affiliation>
       </author>
+      <othercredit>
+         <firstname>David</firstname><othername>P.</othername><surname>Wiggins</surname>
+         <affiliation><orgname>X Consortium, Inc</orgname></affiliation>
+      </othercredit>
    </authorgroup>
-   <othercredit>
-      <firstname>Davide</firstname><surname>Wiggins</surname>
-   </othercredit>
-   <corpname>Hewlett-Packard Company</corpname>
-   <copyright><year>1989</year><holder>X Consortium, Inc and Digital Equipment Corporation</holder></copyright>
-   <copyright><year>1992</year><holder>X Consortium, Inc and Intergraph Corporation</holder></copyright>
-   <copyright><year>1993</year><holder>X Consortium, Inc and Silicon Graphics, Inc.</holder></copyright>
-   <copyright><year>1994</year><holder>X Consortium, Inc and Hewlett-Packard Company</holder></copyright>
-   <copyright><year>1995</year><holder>X Consortium, Inc and Hewlett-Packard Company</holder></copyright>
-   <releaseinfo>Version 1.0</releaseinfo>
-   <affiliation><orgname>X Consortium</orgname></affiliation>
-   <productnumber>X Version 11, Release 7</productnumber>
+   <copyright><year>1989</year>
+     <holder>X Consortium Inc</holder>
+     <holder>Digital Equipment Corporation</holder>
+   </copyright>
+   <copyright><year>1992</year>
+     <holder>X Consortium Inc</holder>
+     <holder>Intergraph Corporation</holder>
+   </copyright>
+   <copyright><year>1993</year>
+     <holder>X Consortium Inc</holder>
+     <holder>Silicon Graphics, Inc.</holder>
+   </copyright>
+   <copyright><year>1994</year><year>1995</year>
+     <holder>X Consortium Inc</holder>
+     <holder>Hewlett-Packard Company</holder>
+   </copyright>
 
 <legalnotice>
 <para>
@@ -43,7 +56,7 @@ purpose of the information in this document. This documentation is provided
 
 </bookinfo>
 
-<chapter id="introduction">
+<chapter id='Introduction'>
 <title>Introduction</title>
 <para>
 The Double Buffer Extension (DBE) provides a standard way to utilize
@@ -61,7 +74,7 @@ frame. The result is a flicker-free animation.
 
 </chapter>
 
-<chapter id="goals">
+<chapter id='Goals'>
 <title>Goals</title>
 
 <para>
@@ -129,7 +142,7 @@ hardware access (DGHA) architectures.
 
 </chapter>
 
-<chapter id="concepts">
+<chapter id='Concepts'>
 <title>Concepts</title>
 <para>
 Normal windows are created using the core CreateWindow request, which
@@ -280,7 +293,7 @@ that need such facilities (for example, to maintain a constant frame rate)
 should investigate the Synchronization Extension, an X Consortium standard.
 </para>
 
-<sect1 id="window_management_operations">
+<sect1 id='Window_Management_Operations'>
 <title>Window Management Operations</title>
 
 <para>
@@ -331,7 +344,7 @@ events are generated for D.
 
 </sect1>
 
-<sect1 id="complex_swap_actions">
+<sect1 id='Complex_Swap_Actions'>
 <title>Complex Swap Actions</title>
 <para>
 DBE has no explicit knowledge of ancillary buffers (for example, depth buffers
@@ -438,14 +451,14 @@ variety of implementations.
 </sect1>
 </chapter>
 
-<chapter id="c_language_bindings">
+<chapter id='C_Language_Binding'>
 <title>C Language Binding</title>
 <para>
 All identifier The header for this extension is &lt;X11/extensions/Xdbe.h&gt;.
 names provided by this header begin with Xdbe.
 </para>
 
-<sect1 id="types">
+<sect1 id='Types'>
 <title>Types</title>
 
 <para>
@@ -462,7 +475,7 @@ The type <function>XdbeSwapAction</function> can be one of the constants
 
 </sect1>
 
-<sect1 id="c_functions">
+<sect1 id='C_Functions'>
 <title>C Functions</title>
 <para>
 The C functions provide direct access to the protocol and add no additional
@@ -473,7 +486,7 @@ start of the function name with DBE. All functions that have return type
 zero for failure.
 </para>
 
-<funcsynopsis>
+<funcsynopsis id='XdbeQueryExtension'>
 <funcprototype>
   <funcdef>Status <function>XdbeQueryExtension</function></funcdef>
     <paramdef>Display <parameter> *dpy</parameter></paramdef>
@@ -483,7 +496,7 @@ zero for failure.
 </funcsynopsis>
 
 <para>
-<function>XdbeQueryExtension</function> sets major version return and minor
+<olink targetdoc='dbelib' targetptr='XdbeQueryExtension'><function>XdbeQueryExtension</function></olink> sets major version return and minor
 version return to the major and minor DBE protocol version supported by
 the server. If the DBE library is compatible with the version returned by
 the server, it returns nonzero. If dpy does not support the DBE extension,
@@ -494,7 +507,7 @@ violates this rule, the effects of all subsequent Xdbe calls that it makes
 are undefined.
 </para>
 
-<funcsynopsis>
+<funcsynopsis id='XdbeGetVisualInfo'>
 <funcprototype>
   <funcdef>XdbeScreenVisualInfo *<function>XdbeGetVisualInfo</function></funcdef>
     <paramdef>Display <parameter> *dpy</parameter></paramdef>
@@ -505,7 +518,7 @@ are undefined.
 
 <para>
 
-<function>XdbeGetVisualInfo</function> returns information about which
+<olink targetdoc='dbelib' targetptr='XdbeGetVisualInfo'><function>XdbeGetVisualInfo</function></olink> returns information about which
 visuals support double buffering. The argument num_screens specifies how
 many elements there are in the screen_specifiers list. Each drawable in
 screen_specifiers designates a screen for which the supported visuals are
@@ -551,11 +564,11 @@ int              perflevel  performance level of visual
 <para>
 <function>XdbeFreeVisualInfo</function> frees the list of
 <function>XdbeScreenVisualInfo</function> returned by
-<function>XdbeGetVisualInfo</function>.
+<olink targetdoc='dbelib' targetptr='XdbeGetVisualInfo'><function>XdbeGetVisualInfo</function></olink>.
 </para>
 
 
-<funcsynopsis>
+<funcsynopsis id='XdbeAllocateBackBufferName'>
 <funcprototype>
   <funcdef>XdbeBackBuffer <function>XdbeAllocateBackBufferName</function></funcdef>
     <paramdef>Display <parameter> *dpy</parameter></paramdef>
@@ -566,16 +579,16 @@ int              perflevel  performance level of visual
 
 
 <para>
-<function>XdbeAllocateBackBufferName</function> returns a drawable ID used
+<olink targetdoc='dbelib' targetptr='XdbeAllocateBackBufferName'><function>XdbeAllocateBackBufferName</function></olink> returns a drawable ID used
 to refer to the back buffer of the specified window. The swap_action is a
 hint to indicate the swap_action that will likely be used in subsequent
-calls to <function>XdbeSwapBuffers</function>.  The actual swap_action
-used in calls to <function>XdbeSwapBuffers</function> does not have to be
+calls to <olink targetdoc='dbelib' targetptr='XdbeSwapBuffers'><function>XdbeSwapBuffers</function></olink>.  The actual swap_action
+used in calls to <olink targetdoc='dbelib' targetptr='XdbeSwapBuffers'><function>XdbeSwapBuffers</function></olink> does not have to be
 the same as the swap_action passed to this function, though clients are
 encouraged to provide accurate information whenever possible.
 </para>
 
-<funcsynopsis>
+<funcsynopsis id='XdbeDeallocateBackBufferName'>
 <funcprototype>
   <funcdef>Status <function>XdbeDeallocateBackBufferName</function></funcdef>
     <paramdef>Display <parameter> *dpy</parameter></paramdef>
@@ -584,14 +597,14 @@ encouraged to provide accurate information whenever possible.
 </funcsynopsis>
 
 <para>
-<function>XdbeDeallocateBackBufferName</function> frees the specified
+<olink targetdoc='dbelib' targetptr='XdbeDeallocateBackBufferName'><function>XdbeDeallocateBackBufferName</function></olink> frees the specified
 drawable ID, buffer, that was obtained via
-<function>XdbeAllocateBackBufferName</function>. The buffer must be a valid
+<olink targetdoc='dbelib' targetptr='XdbeAllocateBackBufferName'><function>XdbeAllocateBackBufferName</function></olink>. The buffer must be a valid
 name for the back buffer of a window, or an
 <function>XdbeBadBuffer</function> error results.
 </para>
 
-<funcsynopsis>
+<funcsynopsis id='XdbeSwapBuffers'>
 <funcprototype>
   <funcdef>Status <function>XdbeSwapBuffers</function></funcdef>
     <paramdef>Display <parameter> *dpy</parameter></paramdef>
@@ -601,7 +614,7 @@ name for the back buffer of a window, or an
 </funcsynopsis>
 
 <para>
-<function>XdbeSwapBuffers</function> swaps the front and back buffers
+<olink targetdoc='dbelib' targetptr='XdbeSwapBuffers'><function>XdbeSwapBuffers</function></olink> swaps the front and back buffers
 for a list of windows. The argument num_windows specifies how many windows
 are to have their buffers swapped; it is the number of elements in the
 swap_info array. The argument swap_info specifies the information needed
@@ -616,7 +629,7 @@ Window              swap_window    window for which to swap buffers
 XdbeSwapAction      swap_action    swap action to use for this swap window
 </literallayout>
 
-<funcsynopsis>
+<funcsynopsis id='XdbeBeginIdiom'>
 <funcprototype>
   <funcdef>Status <function>XdbeBeginIdiom</function></funcdef>
     <paramdef>Display <parameter> *dpy</parameter></paramdef>
@@ -624,14 +637,14 @@ XdbeSwapAction      swap_action    swap action to use for this swap window
 </funcsynopsis>
 
 <para>
-<function>XdbeBeginIdiom</function> marks the beginning of an idiom
+<olink targetdoc='dbelib' targetptr='XdbeBeginIdiom'><function>XdbeBeginIdiom</function></olink> marks the beginning of an idiom
 sequence. See
-<link linkend="complex_swap_actions">
-<xref linkend="complex_swap_actions"></xref></link>
+<link linkend='Complex_Swap_Actions'>
+<xref linkend='Complex_Swap_Actions'></xref></link>
 for a complete discussion of idioms.
 </para>
 
-<funcsynopsis>
+<funcsynopsis id='XdbeEndIdiom'>
 <funcprototype>
   <funcdef>Status <function>XdbeEndIdiom</function></funcdef>
     <paramdef>Display <parameter> *dpy</parameter></paramdef>
@@ -639,10 +652,10 @@ for a complete discussion of idioms.
 </funcsynopsis>
 
 <para>
-<function>XdbeEndIdiom</function> marks the end of an idiom sequence.
+<olink targetdoc='dbelib' targetptr='XdbeEndIdiom'><function>XdbeEndIdiom</function></olink> marks the end of an idiom sequence.
 </para>
 
-<funcsynopsis>
+<funcsynopsis id='XdbeGetBackBufferAttributes'>
 <funcprototype>
   <funcdef>XdbeBackBufferAttributes *<function>XdbeGetBackBufferAttributes</function></funcdef>
     <paramdef>Display <parameter> *dpy</parameter></paramdef>
@@ -651,7 +664,7 @@ for a complete discussion of idioms.
 </funcsynopsis>
 
 <para>
-<function>XdbeGetBackBufferAttributes</function> returns the attributes associated with
+<olink targetdoc='dbelib' targetptr='XdbeGetBackBufferAttributes'><function>XdbeGetBackBufferAttributes</function></olink> returns the attributes associated with
 the specified buffer.
 </para>
 <para>
@@ -668,11 +681,11 @@ set to None.
 </para>
 <para>
 The returned <function>XdbeBackBufferAttributes</function> structure
-can be freed with the Xlib function <function>XFree</function>.
+can be freed with the Xlib function <olink targetdoc='libX11' targetptr='XFree'><function>XFree</function></olink>.
 </para>
 </sect1>
 
-<sect1 id="errors">
+<sect1 id='Errors'>
 <title>Errors</title>
 <para>
 The <function>XdbeBufferError</function> structure has the following fields:
@@ -689,7 +702,7 @@ unsigned char       minor code    Minor op-code of failed request
 </sect1>
 </chapter>
 
-<chapter id="acknowledgements">
+<chapter id='Acknowledgements'>
 <title>Acknowledgements</title>
 
 <para>
@@ -714,7 +727,7 @@ of the specification. David served as architect.
 </para>
 
 </chapter>
-<chapter id="references">
+<chapter id='References'>
 <title>References</title>
 <para>
 Jeffrey Friedberg, Larry Seiler, and Jeff Vroom, "Multi-buffering Extension
diff --git a/lib/libXext/specs/dpmslib.xml b/lib/libXext/specs/dpmslib.xml
index 15f54e849..ba5682eb8 100644
--- a/lib/libXext/specs/dpmslib.xml
+++ b/lib/libXext/specs/dpmslib.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-                   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
+                   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
+[
+<!ENTITY % defs SYSTEM "defs.ent"> %defs;
+]>
 
 <!-- lifted from troff+ms+XMan by doclifter -->
 <book id="dpmslib">
@@ -8,17 +11,16 @@
 <bookinfo>
    <title>X Display Power Management Signaling (DPMS) Extension</title>
    <subtitle>X Consortium Standard</subtitle>
-   <releaseinfo>X Version 11, Release 6.8</releaseinfo>
+   <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo>
+   <releaseinfo>Version 1.0</releaseinfo>
    <authorgroup>
       <author>
          <firstname>Rob</firstname><surname>Lembree</surname>
+         <affiliation><orgname>Digital Equipment Corporation</orgname></affiliation>
+         <email>lembree@zk3.dec.com</email>
       </author>
    </authorgroup>
-   <corpname>Digital Equipment Corporation</corpname>
-   <copyright><year>1996</year><holder>X Consortium</holder></copyright>
-   <releaseinfo>Version 1.0</releaseinfo>
-   <affiliation><orgname>X Consortium</orgname></affiliation>
-   <productnumber>X Version 11, Release 6.8</productnumber>
+   <copyright><year>1996</year><holder>Digital Equipment Corporation</holder></copyright>
 
 <legalnotice>
 <para>
@@ -31,9 +33,7 @@ of the information in this document.  This documentation is
 provided "as is" without express or implied warranty.
 </para>
 
-<para>
-<emphasis remap='I'>X Window System</emphasis> is a trademark of The Open Group.
-</para>
+<para>X Window System is a trademark of The Open Group.</para>
 </legalnotice>
 
 </bookinfo>
@@ -85,7 +85,7 @@ These are mapped onto the X DPMS Extension like this:
 <title>DPMS Functions</title>
 
 
-<funcsynopsis>
+<funcsynopsis id='DPMSQueryExtention'>
 <funcprototype>
   <funcdef>Bool <function>DPMSQueryExtention</function></funcdef>
     <paramdef>Display <parameter>*display</parameter></paramdef>
@@ -120,7 +120,7 @@ return value is FALSE, and the values of
 <emphasis remap='I'>error_base</emphasis> are undefined.
 </para>
 
-<funcsynopsis>
+<funcsynopsis id='DPMSGetVersion'>
 <funcprototype>
   <funcdef>Status <function>DPMSGetVersion</function></funcdef>
     <paramdef>Display <parameter>*display</parameter></paramdef>
@@ -156,7 +156,7 @@ incompatible changes, and the minor version will be incremented for small,
 upwardly compatible changes.
 </para>
 
-<funcsynopsis>
+<funcsynopsis id='DPMSCapable'>
 <funcprototype>
   <funcdef>Bool <function>DPMSCapable</function></funcdef>
     <paramdef>Display <parameter>*display</parameter></paramdef>
@@ -179,7 +179,7 @@ is capable of DPMS on one head, and incapable on another, the truth value of
 this function is defined by the X server implementation.
 </para>
 
-<funcsynopsis>
+<funcsynopsis id='DPMSSetTimeouts'>
 <funcprototype>
   <funcdef>Status <function>DPMSSetTimeouts</function></funcdef>
     <paramdef>Display <parameter>*display</parameter></paramdef>
@@ -255,7 +255,7 @@ or equal to the timeout values of earlier modes.  If inconsistent values
 are supplied, a BadValue error will result.
 </para>
 
-<funcsynopsis>
+<funcsynopsis id='DPMSGetTimeouts'>
 <funcprototype>
   <funcdef>Status <function>DPMSGetTimeouts</function></funcdef>
     <paramdef>Display <parameter>*display</parameter></paramdef>
@@ -307,7 +307,7 @@ inactivity in seconds before the third and final level of power savings is
 invoked. A value of zero indicates that this mode has been disabled.
 </para>
 
-<funcsynopsis>
+<funcsynopsis id='DPMSEnable'>
 <funcprototype>
   <funcdef>Status <function>DPMSEnable</function></funcdef>
     <paramdef>Display <parameter>*display</parameter></paramdef>
@@ -331,7 +331,7 @@ error is returned.  If DPMSEnable is invoked on a display without
 support for DPMS, no change is made and no error is returned.
 </para>
 
-<funcsynopsis>
+<funcsynopsis id='DPMSDisable'>
 <funcprototype>
   <funcdef>Status <function>DPMSDisable</function></funcdef>
     <paramdef>Display <parameter>*display</parameter></paramdef>
@@ -353,7 +353,7 @@ and no error is returned.  If DPMSDisable is invoked on a display
 without support for DPMS, no change is made and no error is returned.
 </para>
 
-<funcsynopsis>
+<funcsynopsis id='DPMSForceLevel'>
 <funcprototype>
   <funcdef>Status <function>DPMSForceLevel</function></funcdef>
     <paramdef>Display <parameter>*display</parameter></paramdef>
@@ -382,7 +382,7 @@ is disabled on the display, a BadMatch protocol error will result.
 
 <para>Status DPMSInfo(<emphasis remap='I'>display, power_level, state</emphasis>)</para>
 
-<funcsynopsis>
+<funcsynopsis id='DPMSInfo'>
 <funcprototype>
   <funcdef>Status <function>DPMSInfo</function></funcdef>
     <paramdef>Display <parameter>*display</parameter></paramdef>
diff --git a/lib/libXext/specs/shapelib.xml b/lib/libXext/specs/shapelib.xml
index a06cd2303..525cbbe6e 100644
--- a/lib/libXext/specs/shapelib.xml
+++ b/lib/libXext/specs/shapelib.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-                   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
+                   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
+[
+<!ENTITY % defs SYSTEM "defs.ent"> %defs;
+]>
 
 <!-- lifted from troff+ms+XMan by doclifter -->
 <book id="shapelib">
@@ -8,17 +11,15 @@
 <bookinfo>
    <title>X Nonrectangular Window Shape Extension Library</title>
    <subtitle>X Consortium Standard</subtitle>
-   <releaseinfo>X Version 11, Release 6.4</releaseinfo>
+   <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo>
+   <releaseinfo>Version 1.0</releaseinfo>
    <authorgroup>
       <author>
          <firstname>Keith</firstname><surname>Packard</surname>
+         <affiliation><orgname>MIT X Consortium</orgname></affiliation>
       </author>
    </authorgroup>
-   <corpname>MIT X Consortium</corpname>
    <copyright><year>1989</year><holder>X Consortium</holder></copyright>
-   <releaseinfo>Version 1.0</releaseinfo>
-   <affiliation><orgname>MIT X Consortium</orgname></affiliation>
-   <productnumber>X Version 11, Release 6.4</productnumber>
 
 <legalnotice>
 
@@ -52,6 +53,7 @@ Except as contained in this notice, the name of the X Consortium shall not be
 used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from the X Consortium.
 </para>
+<para>X Window System is a trademark of The OpenGroup.</para>
 </legalnotice>
 </bookinfo>
 
@@ -94,8 +96,10 @@ window manager.
 
 <para>
 Each window (even with no shapes specified) is defined by two regions:  the
-<emphasis remap='I'>bounding region</emphasis> and the
-<emphasis remap='I'>clip region</emphasis>.  The bounding region is the
+<olink targetdoc='shapelib' targetptr='bounding_region'>bounding region</olink>
+and the
+<olink targetdoc='shapelib' targetptr='clip_region'>clip region</olink>.
+The bounding region is the
 area of the parent window that the window will occupy (including border).
 The clip region is the subset of the bounding region that is available for
 subwindows and graphics.  The area between the bounding region and the
@@ -107,8 +111,10 @@ A nonshaped window will have a bounding region that is a rectangle spanning
 the window, including its border; the clip region will be a rectangle
 filling the inside dimensions (not including the border).  In this document,
 these areas are referred to as the
-<emphasis remap='I'>default bounding region</emphasis> and the
-<emphasis remap='I'>default clip region</emphasis>.  For a window with
+<olink targetdoc='shapelib' targetptr='default_bounding_region'>
+default bounding region</olink> and the
+<olink targetdoc='shapelib' targetptr='default_clip_region'>
+default clip region</olink>.  For a window with
 inside size of <emphasis remap='I'>width</emphasis> by
 <emphasis remap='I'>height</emphasis> and border width
 <emphasis remap='I'>bwidth</emphasis>, the default bounding and clip
@@ -131,8 +137,10 @@ clip.height = <emphasis remap='I'>height</emphasis>
 This extension allows a client to modify either or both of the bounding or
 clip regions by specifying new regions that combine with the default
 regions.  These new regions are called the
-<emphasis remap='I'>client bounding region</emphasis> and the
-<emphasis remap='I'>client clip region</emphasis>.  They are specified
+<olink targetdoc='shapelib' targetptr='client_bounding_region'>
+client bounding region</olink> and the
+<olink targetdoc='shapelib' targetptr='client_clip_region'>
+client clip region</olink>.  They are specified
 relative to the origin of the window and are always defined by offsets
 relative to the window origin (that is, region adjustments are not
 required when the window is moved).  Three mechanisms for specifying
@@ -149,7 +157,8 @@ default region is used instead.
 </para>
 
 <para>
-The <emphasis remap='I'>effective bounding region</emphasis> of a window is
+The <olink targetdoc='shapelib' targetptr='effective_bounding_region'>
+effective bounding region</olink> of a window is
 defined to be the intersection of the client bounding region with the default
 bounding region.  Any portion of the client bounding region that is not
 included in the default bounding region will not be included in the
@@ -167,7 +176,8 @@ be enlarged to include more of the client bounding region.
 </para>
 
 <para>
-The <emphasis remap='I'>effective clip region</emphasis> of a window is
+The <olink targetdoc='shapelib' targetptr='effective_clip_region'>
+effective clip region</olink> of a window is
 defined to be the intersection of the client clip region with both the
 default clip region and the client bounding region.  Any portion of the
 client clip region that is not included in both the default clip region
@@ -214,11 +224,12 @@ as for events that occur in a normal rectangular border.
 </para>
 
 <para>An
-<function>InputOnly</function>
+<olink targetdoc='libX11' targetptr='glossary:InputOnly_window'>
+InputOnly</olink>
 window can have its bounding region set, but it is a
-<function>Match</function>
+<olink targetdoc='libX11' targetptr='BadMatch'>Match</olink>
 error to attempt to set a clip region on an
-<function>InputOnly</function>
+<olink targetdoc='libX11' targetptr='glossary:InputOnly_window'>InputOnly</olink>
 window or to specify its clip region as a source to a request
 in this extension.
 </para>
@@ -253,7 +264,7 @@ The defined region operations are
 and
 <function>ShapeInvert</function>.</para>
 
-<funcsynopsis>
+<funcsynopsis id='xshapequeryextension'>
 <funcprototype>
 <funcdef>Bool<function> XShapeQueryExtension</function></funcdef>
 <paramdef>Display <parameter>*display</parameter></paramdef>
@@ -275,7 +286,7 @@ this extension.  Because no errors are defined for this version of
 the extension, the value returned here is not defined (nor useful).
 </para>
 
-<funcsynopsis>
+<funcsynopsis id='xshapequeryversion'>
 <funcprototype>
 <funcdef>Status<function> XShapeQueryVersion</function></funcdef>
 <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -292,7 +303,7 @@ extension supported by the display and returns a nonzero value.
 Otherwise, the arguments are not set and zero is returned.
 </para>
 
-<funcsynopsis>
+<funcsynopsis id='xshapecombineregion'>
 <funcprototype>
 <funcdef><function>XShapeCombineRegion</function></funcdef>
 <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -312,7 +323,7 @@ converts the specified region into a list of rectangles and calls
 <function>XShapeCombineRectangles</function>
 </para>
 
-<funcsynopsis>
+<funcsynopsis id='xshapecombinerectangles'>
 <funcprototype>
 <funcdef><function>XShapeCombineRectangles</function></funcdef>
 <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -335,7 +346,7 @@ performs a
 operation; otherwise, the request is ignored.
 </para>
 
-<funcsynopsis>
+<funcsynopsis id='xshapecombinemask'>
 <funcprototype>
 <funcdef><function>XShapeCombineMask</function></funcdef>
 <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -356,7 +367,7 @@ performs a
 operation; otherwise, the request is ignored.
 </para>
 
-<funcsynopsis>
+<funcsynopsis id='xshapecombineshape'>
 <funcprototype>
 <funcdef><function>XShapeCombineShape</function></funcdef>
 <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -378,7 +389,7 @@ performs a
 operation; otherwise, the request is ignored.
 </para>
 
-<funcsynopsis>
+<funcsynopsis id='xshapeoffsetshape'>
 <funcprototype>
 <funcdef><function>XShapeOffsetShape</function></funcdef>
 <paramdef><parameter>display</parameter></paramdef>
@@ -397,7 +408,7 @@ performs a
 operation; otherwise, the request is ignored.
 </para>
 
-<funcsynopsis>
+<funcsynopsis id='xshapequeryextents'>
 <funcprototype>
 <funcdef>Status <function>XShapeQueryExtents</function></funcdef>
 <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -429,7 +440,7 @@ If the extension is supported, a nonzero value is returned; otherwise,
 zero is returned.
 </para>
 
-<funcsynopsis>
+<funcsynopsis id='xshapeselectinput'>
 <funcprototype>
 <funcdef><function>XShapeSelectInput</function></funcdef>
 <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -464,7 +475,7 @@ typedef struct {
 } XShapeEvent;
 </literallayout>
 
-<funcsynopsis>
+<funcsynopsis id='xshapeinputselected'>
 <funcprototype>
 <funcdef>unsigned long <function>XShapeInputSelected</function></funcdef>
 <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -483,7 +494,7 @@ otherwise, it returns zero.
 If the extension is not supported, it returns zero.
 </para>
 
-<funcsynopsis>
+<funcsynopsis id='xshapegetrectangles'>
 <funcprototype>
 <funcdef>XRectangle<function> *XShapeGetRectangles</function></funcdef>
 <paramdef>Display<parameter> *display</parameter></paramdef>
diff --git a/lib/libXext/specs/synclib.xml b/lib/libXext/specs/synclib.xml
index 36b77d884..12145eb2d 100644
--- a/lib/libXext/specs/synclib.xml
+++ b/lib/libXext/specs/synclib.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-                   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
+                   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
+[
+<!ENTITY % defs SYSTEM "defs.ent"> %defs;
+]>
 
 
 <!-- lifted from troff+ms+XMan by doclifter -->
@@ -9,37 +12,45 @@
 <bookinfo>
    <title>X Synchronization Extension Library</title>
    <subtitle>X Consortium Standard</subtitle>
-   <releaseinfo>X Version 11, Release 6.4</releaseinfo>
+   <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo>
+   <releaseinfo>Version 3.0</releaseinfo>
    <authorgroup>
       <author>
         <firstname>Tim</firstname><surname>Glauert</surname>
-        <affiliation><orgname>Olivetti Research/MultiWorks</orgname></affiliation>
+        <affiliation>
+          <orgname>Olivetti Research</orgname>
+          <orgdiv>MultiWorks</orgdiv>
+        </affiliation>
       </author>
       <author>
           <firstname>Dave</firstname>
           <surname>Carver</surname>
-          <affiliation><orgname>Digital Equipment Corporation, MIT/Project Athena</orgname></affiliation>
+          <affiliation>
+            <orgname>Digital Equipment Corporation</orgname>
+            <orgdiv>MIT/Project Athena</orgdiv>
+          </affiliation>
       </author>
       <author>
         <firstname>Jim</firstname>
         <surname>Gettys</surname>
-        <affiliation><orgname>Digital Equipment Corporation, Cambridge Research Laboratory</orgname></affiliation>
+        <affiliation>
+          <orgname>Digital Equipment Corporation</orgname>
+          <orgdiv>Cambridge Research Laboratory</orgdiv>
+        </affiliation>
       </author>
       <author>
         <firstname>David</firstname>
+        <othername>P.</othername>
         <surname>Wiggins</surname>
         <affiliation><orgname>X Consortium, Inc.</orgname></affiliation>
       </author>
    </authorgroup>
-   <releaseinfo>Version 3.0</releaseinfo>
-   <affiliation><orgname>X Consortium</orgname></affiliation>
-   <productnumber>X Version 11, Release 6.4</productnumber>
-<legalnotice>
-
-<para>
-Copyright 1991 by Olivetti Research Limited, Cambridge England and Digital Equipment Corporation, Maynard, Massachusetts
-</para>
+   <copyright><year>1991</year>
+     <holder>Olivetti Research Limited, Cambridge England</holder>
+     <holder>Digital Equipment Corporation, Maynard, Massachusetts</holder>
+   </copyright>
 
+<legalnotice>
 <para>
 Permission to use, copy, modify, and distribute this documentation for any
 purpose and without fee is hereby granted, provided that the above
@@ -51,11 +62,7 @@ is without express or implied warranty.
 </legalnotice>
 
 <legalnotice>
-
-<para>
-Copyright &copy; 1991 X Consortium, Inc.
-</para>
-
+<para role="multiLicensing">Copyright &copy; 1991 X Consortium, Inc.</para>
 <para>
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files
@@ -71,7 +78,7 @@ The above copyright notice and this permission notice shall be included in
 all copies or substantial portions of the Software.
 </para>
 
-<para>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+<para>THE SOFTWARE IS PROVIDED &ldquo;AS IS&rdquo;, 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 X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR
@@ -86,6 +93,7 @@ not be used in advertising or otherwise to promote the sale, use or other
 dealings in this Software without prior written authorization from the
 X Consortium.
 </para>
+<para>X Window System is a trademark of The OpenGroup.</para>
 
 </legalnotice>
 </bookinfo>
@@ -188,7 +196,7 @@ capitalization.
 Most of the following functions generate SYNC protocol requests.
 </para>
 
-<funcsynopsis>
+<funcsynopsis id='xsyncqueryextension'>
 <funcprototype>
   <funcdef>Status <function>XSyncQueryExtension</function></funcdef>
     <paramdef>Display <parameter> *dpy</parameter></paramdef>
@@ -205,7 +213,7 @@ sets *error_base_return to the error number for the first SYNC error. If dpy
 does not support the SYNC extension, it returns False.
 </para>
 
-<funcsynopsis>
+<funcsynopsis id='xsyncinitialize'>
 <funcprototype>
   <funcdef>Status <function>XSyncInitialize</function></funcdef>
     <paramdef>Display <parameter> *dpy</parameter></paramdef>
@@ -227,7 +235,7 @@ XSyncQueryExtension. If a client violates this rule, the effects of all XSync
 calls that it makes are undefined.
 </para>
 
-<funcsynopsis>
+<funcsynopsis id='xsynclistsystemcounters'>
 <funcprototype>
   <funcdef>XSyncSystemCounter *<function>XSyncListSystemCounters</function></funcdef>
     <paramdef>Display <parameter> *dpy</parameter></paramdef>
@@ -255,7 +263,7 @@ XSyncCounter        counter;     /* counter id of this system counter */
 XSyncValue          resolution;  /* resolution of this system counter */
 </literallayout>
 
-<funcsynopsis>
+<funcsynopsis id='xsyncfreesystemcounterlist'>
 <funcprototype>
   <funcdef>void <function>XSyncFreeSystemCounterList</function></funcdef>
     <paramdef>XSyncSystemCounter <parameter> *list</parameter></paramdef>
@@ -268,7 +276,7 @@ associated with the system counter list returned by
 <function>XSyncListSystemCounters</function>.
 </para>
 
-<funcsynopsis>
+<funcsynopsis id='xsynccreatecounter'>
 <funcprototype>
   <funcdef>XSyncCounter <function>XSyncCreateCounter</function></funcdef>
     <paramdef>Display<parameter> *dpy</parameter></paramdef>
@@ -282,7 +290,7 @@ with the given initial value and returns the counter ID. It returns
 <function>None</function> if dpy does not support the SYNC extension.
 </para>
 
-<funcsynopsis>
+<funcsynopsis id='xsyncsetcounter'>
 <funcprototype>
   <funcdef>Status <function>XSyncSetCounter</function></funcdef>
     <paramdef>Display<parameter> *dpy</parameter></paramdef>
@@ -298,7 +306,7 @@ with the given initial value and returns the counter ID. It returns
 support the SYNC extension; otherwise, it returns <function>True</function>.
 </para>
 
-<funcsynopsis>
+<funcsynopsis id='xsyncchangecounter'>
 <funcprototype>
   <funcdef>Status <function>XSyncChangeCounter</function></funcdef>
     <paramdef>Display<parameter> *dpy</parameter></paramdef>
@@ -313,7 +321,7 @@ support the SYNC extension; otherwise, it returns <function>True</function>.
 otherwise, it returns
 <function>True</function>.
 </para>
-<funcsynopsis>
+<funcsynopsis id='xsyncdestroycounter'>
 <funcprototype>
   <funcdef>Status <function>XSyncDestroyCounter</function></funcdef>
     <paramdef>Display<parameter> *dpy</parameter></paramdef>
@@ -327,7 +335,7 @@ otherwise, it returns
 otherwise, it returns <function>True</function>.
 </para>
 
-<funcsynopsis>
+<funcsynopsis id='xsyncquerycounter'>
 <funcprototype>
   <funcdef>Status <function>XSyncQueryCounter</function></funcdef>
     <paramdef>Display<parameter> *dpy</parameter></paramdef>
@@ -343,7 +351,7 @@ error during communication with the server or if dpy does not support the
 SYNC extension; otherwise, it returns <function>True</function>.
 </para>
 
-<funcsynopsis>
+<funcsynopsis id='xsyncawait'>
 <funcprototype>
   <funcdef>Status <function>XSyncAwait</function></funcdef>
     <paramdef>Display<parameter> *dpy</parameter></paramdef>
@@ -385,7 +393,7 @@ XSyncValue       event_threshold;    /*send event if past threshold */
 <function>XSyncNegativeComparison</function>.
 </para>
 
-<funcsynopsis>
+<funcsynopsis id='xsynccreatealarm'>
 <funcprototype>
   <funcdef>XSyncAlarm <function>XSyncCreateAlarm</function></funcdef>
     <paramdef>Display<parameter> *dpy</parameter></paramdef>
@@ -421,7 +429,7 @@ Bool               events;              XSyncCAEvents
 XSyncAlarmState    state;               client cannot set this
 </literallayout>
 
-<funcsynopsis>
+<funcsynopsis id='xsyncdestroyalarm'>
 <funcprototype>
   <funcdef>Status <function>XSyncDestroyAlarm</function></funcdef>
     <paramdef>Display<parameter> *dpy</parameter></paramdef>
@@ -435,7 +443,7 @@ XSyncAlarmState    state;               client cannot set this
 the SYNC extension; otherwise, it returns <function>True</function>.
 </para>
 
-<funcsynopsis>
+<funcsynopsis id='xsyncqueryalarm'>
 <funcprototype>
   <funcdef>Status <function>XSyncQueryAlarm</function></funcdef>
     <paramdef>Display<parameter> *dpy</parameter></paramdef>
@@ -452,7 +460,7 @@ during communication with the server or if dpy does not support the
 SYNC extension; otherwise, it returns <function>True</function>.
 </para>
 
-<funcsynopsis>
+<funcsynopsis id='xsyncchangealarm'>
 <funcprototype>
   <funcdef>Status <function>XSyncChangeAlarm</function></funcdef>
     <paramdef>Display<parameter> *dpy</parameter></paramdef>
@@ -470,7 +478,7 @@ attributes to change are specified as in
 the SYNC extension; otherwise, it returns <function>True</function>.
 </para>
 
-<funcsynopsis>
+<funcsynopsis id='xsyncsetpriority'>
 <funcprototype>
   <funcdef>Status <function>XSyncSetPriority</function></funcdef>
     <paramdef>Display<parameter> *dpy</parameter></paramdef>
@@ -487,7 +495,7 @@ sets the caller’s priority. It returns
 otherwise, it returns <function>True</function>.
 </para>
 
-<funcsynopsis>
+<funcsynopsis id='xsyncgetpriority'>
 <funcprototype>
   <funcdef>Status <function>XSyncGetPriority</function></funcdef>
     <paramdef>Display<parameter> *dpy</parameter></paramdef>
@@ -516,7 +524,7 @@ macros and as functions. By default, the macro form is used. To use the
 function form, #undef the macro name to uncover the function.
 </para>
 
-<funcsynopsis>
+<funcsynopsis id='xsyncinttovalue'>
 <funcprototype>
   <funcdef>void <function>XSyncIntToValue</function></funcdef>
     <paramdef>XSyncValue<parameter> *pv</parameter></paramdef>
@@ -529,7 +537,7 @@ Converts i to an <function>XSyncValue</function> and stores it in *pv.
 Performs sign extension (*pv will have the same sign as i.)
 </para>
 
-<funcsynopsis>
+<funcsynopsis id='xsyncintstovalue'>
 <funcprototype>
   <funcdef>void <function>XSyncIntsToValue</function></funcdef>
     <paramdef>XSyncValue<parameter> *pv</parameter></paramdef>
@@ -543,7 +551,7 @@ Stores low in the low 32 bits of *pv and high in the high 32 bits of *pv.
 </para>
 
 
-<funcsynopsis>
+<funcsynopsis id='xsyncvaluegreaterthan'>
 <funcprototype>
   <funcdef>Bool <function>XSyncValueGreaterThan</function></funcdef>
     <paramdef>XSyncValue<parameter> a</parameter></paramdef>
@@ -556,7 +564,7 @@ Returns <function>True</function> if a is greater than b, else returns
 <function>False</function>.
 </para>
 
-<funcsynopsis>
+<funcsynopsis id='xsyncvaluelessthan'>
 <funcprototype>
   <funcdef>Bool <function>XSyncValueLessThan</function></funcdef>
     <paramdef>XSyncValue<parameter> a</parameter></paramdef>
@@ -570,7 +578,7 @@ Returns <function>True</function> if a is less than b, else returns
 </para>
 
 
-<funcsynopsis>
+<funcsynopsis id='xsyncvaluegreaterorequal'>
 <funcprototype>
   <funcdef>Bool <function>XSyncValueGreaterOrEqual</function></funcdef>
     <paramdef>XSyncValue<parameter> a</parameter></paramdef>
@@ -583,7 +591,7 @@ Returns <function>True</function> if a is greater than or equal to b,
 else returns <function>False</function>.
 </para>
 
-<funcsynopsis>
+<funcsynopsis id='xsyncvaluelessorequal'>
 <funcprototype>
   <funcdef>Bool <function>XSyncValueLessOrEqual</function></funcdef>
     <paramdef>XSyncValue<parameter> a</parameter></paramdef>
@@ -596,7 +604,7 @@ Returns <function>True</function> if a is less than or equal to b,
 else returns <function>False</function>.
 </para>
 
-<funcsynopsis>
+<funcsynopsis id='xsyncvalueequal'>
 <funcprototype>
   <funcdef>Bool <function>XSyncValueEqual</function></funcdef>
     <paramdef>XSyncValue<parameter> a</parameter></paramdef>
@@ -609,7 +617,7 @@ Returns <function>True</function> if a is equal to b,
 else returns <function>False</function>.
 </para>
 
-<funcsynopsis>
+<funcsynopsis id='xsyncvalueisnegative'>
 <funcprototype>
   <funcdef>Bool <function>XSyncValueIsNegative</function></funcdef>
     <paramdef>XSyncValue<parameter> v</parameter></paramdef>
@@ -621,7 +629,7 @@ Returns <function>True</function> if v is negative,
 else returns <function>False</function>.
 </para>
 
-<funcsynopsis>
+<funcsynopsis id='xsyncvalueiszero'>
 <funcprototype>
   <funcdef>Bool <function>XSyncValueIsZero</function></funcdef>
     <paramdef>XSyncValue<parameter> v</parameter></paramdef>
@@ -633,7 +641,7 @@ Returns <function>True</function> if v is zero,
 else returns <function>False</function>.
 </para>
 
-<funcsynopsis>
+<funcsynopsis id='xsyncvalueispositive'>
 <funcprototype>
   <funcdef>Bool <function>XSyncValueIsPositive</function></funcdef>
     <paramdef>XSyncValue<parameter> v</parameter></paramdef>
@@ -645,7 +653,7 @@ Returns <function>True</function> if v is positive,
 else returns <function>False</function>.
 </para>
 
-<funcsynopsis>
+<funcsynopsis id='xsyncvaluelow32'>
 <funcprototype>
   <funcdef>unsigned int <function>XSyncValueLow32</function></funcdef>
     <paramdef>XSyncValue<parameter> v</parameter></paramdef>
@@ -656,7 +664,7 @@ else returns <function>False</function>.
 Returns the low 32 bits of v.
 </para>
 
-<funcsynopsis>
+<funcsynopsis id='xsyncvaluehigh32'>
 <funcprototype>
   <funcdef>unsigned int <function>XSyncValueHigh32</function></funcdef>
     <paramdef>XSyncValue<parameter> v</parameter></paramdef>
@@ -667,7 +675,7 @@ Returns the low 32 bits of v.
 Returns the high 32 bits of v.
 </para>
 
-<funcsynopsis>
+<funcsynopsis id='xsyncvalueadd'>
 <funcprototype>
   <funcdef>void <function>XSyncValueAdd</function></funcdef>
     <paramdef>XSyncValue<parameter> *presult</parameter></paramdef>
@@ -683,7 +691,7 @@ fit in 64 bits, *poverflow is set to <function>True</function>, else it is
 set to <function>False</function>.
 </para>
 
-<funcsynopsis>
+<funcsynopsis id='xsyncvaluesubtract'>
 <funcprototype>
   <funcdef>void <function>XSyncValueSubtract</function></funcdef>
     <paramdef>XSyncValue<parameter> *presult</parameter></paramdef>
@@ -699,7 +707,7 @@ fit in 64 bits, *poverflow is set to <function>True</function>, else it is
 set to <function>False</function>.
 </para>
 
-<funcsynopsis>
+<funcsynopsis id='xsyncmaxvalue'>
 <funcprototype>
   <funcdef>void <function>XSyncMaxValue</function></funcdef>
     <paramdef>XSyncValue<parameter> *pv</parameter></paramdef>
@@ -710,7 +718,7 @@ set to <function>False</function>.
 Sets *pv to the maximum value expressible in 64 bits.
 </para>
 
-<funcsynopsis>
+<funcsynopsis id='xsyncminvalue'>
 <funcprototype>
   <funcdef>void <function>XSyncMinValue</function></funcdef>
     <paramdef>XSyncValue<parameter> *pv</parameter></paramdef>
diff --git a/lib/libXext/specs/xtest1.xml b/lib/libXext/specs/xtest1.xml
index 431035977..df05881ce 100644
--- a/lib/libXext/specs/xtest1.xml
+++ b/lib/libXext/specs/xtest1.xml
@@ -16,10 +16,36 @@
 	   <orgname>Hewlett Packard</orgname></affiliation>
       </author>
    </authorgroup>
-   <corpname>X Consortium Standard</corpname>
    <copyright><year>1993</year><holder>X Consortium</holder></copyright>
-   <affiliation><orgname>X Consortium</orgname></affiliation>
-   <productnumber>X Version 11, Release 7</productnumber>
+
+<legalnotice>
+<para>
+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:
+</para>
+<para>
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+</para>
+<para>
+THE SOFTWARE IS PROVIDED &ldquo;AS IS&rdquo;, 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 X
+CONSORTIUM 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.
+</para>
+<para>
+Except as contained in this notice, the name of the X Consortium shall not be
+used in advertising or otherwise to promote the sale, use or other dealings in
+this Software without prior written authorization from the X Consortium.
+</para>
+<para>X Window System is a trademark of The Open Group.</para>
+</legalnotice>
 
 <abstract>
 <para>